Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
2864a4c1
Commit
2864a4c1
authored
Feb 10, 2014
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mmdevice: unbreak window store build
parent
130a8081
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
modules/audio_output/mmdevice.c
modules/audio_output/mmdevice.c
+11
-1
No files found.
modules/audio_output/mmdevice.c
View file @
2864a4c1
...
...
@@ -76,6 +76,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, LPVOID reserved)
DEFINE_GUID
(
GUID_VLC_AUD_OUT
,
0x4533f59d
,
0x59ee
,
0x00c6
,
0xad
,
0xb2
,
0xc6
,
0x8b
,
0x50
,
0x1a
,
0x66
,
0x55
);
#if !VLC_WINSTORE_APP
static
int
TryEnterMTA
(
vlc_object_t
*
obj
)
{
HRESULT
hr
=
CoInitializeEx
(
NULL
,
COINIT_MULTITHREADED
);
...
...
@@ -87,6 +88,7 @@ static int TryEnterMTA(vlc_object_t *obj)
return
0
;
}
#define TryEnterMTA(o) TryEnterMTA(VLC_OBJECT(o))
#endif
static
void
EnterMTA
(
void
)
{
...
...
@@ -100,7 +102,9 @@ static void LeaveMTA(void)
CoUninitialize
();
}
#if !VLC_WINSTORE_APP
static
wchar_t
default_device
[
1
]
=
L""
;
#endif
struct
aout_sys_t
{
...
...
@@ -926,8 +930,10 @@ static void aout_stream_Stop(void *func, va_list ap)
static
int
Start
(
audio_output_t
*
aout
,
audio_sample_format_t
*
restrict
fmt
)
{
aout_sys_t
*
sys
=
aout
->
sys
;
#if !VLC_WINSTORE_APP
if
(
sys
->
dev
==
NULL
)
return
-
1
;
#endif
aout_stream_t
*
s
=
vlc_object_create
(
aout
,
sizeof
(
*
s
));
if
(
unlikely
(
s
==
NULL
))
...
...
@@ -947,7 +953,11 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
sys
->
module
=
vlc_module_load
(
s
,
"aout stream"
,
NULL
,
false
,
aout_stream_Start
,
s
,
fmt
,
&
hr
);
if
(
hr
!=
AUDCLNT_E_DEVICE_INVALIDATED
||
DeviceSelect
(
aout
,
NULL
))
if
(
hr
!=
AUDCLNT_E_DEVICE_INVALIDATED
#if !VLC_WINSTORE_APP
||
DeviceSelect
(
aout
,
NULL
)
#endif
)
break
;
}
LeaveMTA
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment