set_capability( "audio output", 100 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AOUT )
- add_shortcut( "directx" )
- add_shortcut( "directsound" )
+ add_shortcut( "directx", "directsound" )
add_string( "directx-audio-device-name", "default", NULL,
DEVICE_TEXT, DEVICE_LONGTEXT, false )
text.psz_string = _("A/52 over S/PDIF");
var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text );
- if( config_GetInt( p_aout, "spdif" ) )
+ if( var_InheritBool( p_aout, "spdif" ) )
var_Set( p_aout, "audio-device", val );
}
}
/* kill the position notification thread, if any */
if( p_sys->p_notif )
{
- vlc_object_detach( p_sys->p_notif );
vlc_object_kill( p_sys->p_notif );
/* wake up the audio thread if needed */
if( !p_sys->b_playing ) SetEvent( p_sys->p_notif->event );
"DirectSoundEnumerateW" );
if( OurDirectSoundEnumerate )
{
- p_aout->output.p_sys->psz_device = config_GetPsz(p_aout, "directx-audio-device-name");
+ p_aout->output.p_sys->psz_device = var_InheritString(p_aout, "directx-audio-device-name");
/* Attempt enumeration */
if( FAILED( OurDirectSoundEnumerate( CallBackDirectSoundEnum,
p_aout ) ) )
p_notif->i_frame_size, /* Number of bytes */
&p_write_position, /* Address of lock start */
&l_bytes1, /* Count of bytes locked before wrap around */
- &p_wrap_around, /* Buffer adress (if wrap around) */
+ &p_wrap_around, /* Buffer address (if wrap around) */
&l_bytes2, /* Count of bytes after wrap around */
0 ); /* Flags */
if( dsresult == DSERR_BUFFERLOST )