X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fportaudio.c;h=795d5e325eee7bdfbc83335e8fd828e8964cbe43;hb=55bd6c18babd47583ba4a1a3d64834c5d1f38565;hp=74afad6048485257111dafe8cd9c3bb7733267e9;hpb=5b63839284565821b5aff349378eddbb9d7f1ee0;p=vlc diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c index 74afad6048..795d5e325e 100644 --- a/modules/audio_output/portaudio.c +++ b/modules/audio_output/portaudio.c @@ -105,16 +105,17 @@ static int PAOpenStream( aout_instance_t * ); #define DEVICE_TEXT N_("Output device") #define DEVICE_LONGTEXT N_("Portaudio identifier for the output device") -vlc_module_begin(); - set_shortname( "PortAudio" ); - set_description( N_("PORTAUDIO audio output") ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - add_integer( "portaudio-device", 0, NULL, - DEVICE_TEXT, DEVICE_LONGTEXT, false ); - set_capability( "audio output", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "PortAudio" ) + set_description( N_("PORTAUDIO audio output") ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + add_integer( "portaudio-audio-device", 0, NULL, + DEVICE_TEXT, DEVICE_LONGTEXT, false ) + add_deprecated_alias( "portaudio-device" ) /* deprecated since 0.9.3 */ + set_capability( "audio output", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /* This routine will be called by the PortAudio engine when audio is needed. * It may called at interrupt level on some machines so don't do anything @@ -183,8 +184,8 @@ static int Open( vlc_object_t * p_this ) p_aout->output.pf_play = Play; /* Retrieve output device id from config */ - var_Create( p_aout, "portaudio-device", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT); - var_Get( p_aout, "portaudio-device", &val ); + var_Create( p_aout, "portaudio-audio-device", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT); + var_Get( p_aout, "portaudio-audio-device", &val ); p_sys->i_device_id = val.i_int; #ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN @@ -219,7 +220,7 @@ static int Open( vlc_object_t * p_this ) /* Create PORTAUDIOThread */ if( vlc_thread_create( pa_thread, "aout", PORTAUDIOThread, - VLC_THREAD_PRIORITY_OUTPUT, false ) ) + VLC_THREAD_PRIORITY_OUTPUT ) ) { msg_Err( p_aout, "cannot create PORTAUDIO thread" ); return VLC_EGENERIC;