Skip to content

V
vlc-2-2
Commit 66cdfd6b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

DirectSound: use DirectSoundEnumerateW iso DirectSoundEnumerateA 

And other alignment changes
parent 9375bd72
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 10 deletions
modules/audio_output/directx.c
View file @ 66cdfd6b
...@@ -191,8 +191,7 @@ static int OpenAudio( vlc_object_t *p_this ) ...@@ -191,8 +191,7 @@ static int OpenAudio( vlc_object_t *p_this )
if ( *ppsz_compare == NULL ) if ( *ppsz_compare == NULL )
{ {
msg_Err( p_aout, "(%s) isn't valid speaker setup option", msg_Err( p_aout, "(%s) isn't valid speaker setup option", psz_speaker );
psz_speaker );
msg_Err( p_aout, "Defaulting to Windows default speaker config"); msg_Err( p_aout, "Defaulting to Windows default speaker config");
i = 0; i = 0;
} }
...@@ -693,7 +692,7 @@ static int InitDirectSound( aout_instance_t *p_aout ) ...@@ -693,7 +692,7 @@ static int InitDirectSound( aout_instance_t *p_aout )
/* Get DirectSoundEnumerate */ /* Get DirectSoundEnumerate */
OurDirectSoundEnumerate = (void *) OurDirectSoundEnumerate = (void *)
GetProcAddress( p_aout->output.p_sys->hdsound_dll, GetProcAddress( p_aout->output.p_sys->hdsound_dll,
"DirectSoundEnumerateA" ); "DirectSoundEnumerateW" );
if( OurDirectSoundEnumerate ) if( OurDirectSoundEnumerate )
{ {
p_aout->output.p_sys->psz_device = config_GetPsz(p_aout, "directx-audio-device-name"); p_aout->output.p_sys->psz_device = config_GetPsz(p_aout, "directx-audio-device-name");
...@@ -1179,7 +1178,7 @@ static int ReloadDirectXDevices( vlc_object_t *p_this, char const *psz_name, ...@@ -1179,7 +1178,7 @@ static int ReloadDirectXDevices( vlc_object_t *p_this, char const *psz_name,
/* Get DirectSoundEnumerate */ /* Get DirectSoundEnumerate */
OurDirectSoundEnumerate = (void *) OurDirectSoundEnumerate = (void *)
GetProcAddress( hdsound_dll, GetProcAddress( hdsound_dll,
"DirectSoundEnumerateA" ); "DirectSoundEnumerateW" );
int nb_devices = 0; int nb_devices = 0;
OurDirectSoundEnumerate(CallBackConfigNBEnum, &nb_devices); OurDirectSoundEnumerate(CallBackConfigNBEnum, &nb_devices);
msg_Dbg(p_this,"found %d devices", nb_devices); msg_Dbg(p_this,"found %d devices", nb_devices);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment