vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Oct 21 21:28:48 2010 +0300| [4d63bf16fdae29237ac3100ea040573f7edcbac3] | committer: Rémi Denis-Courmont
Remove aout_FindAndRestart() This was only used to change the OSS or ALSA device on the fly. However, this really should be done with a variable callback, not from the configuration. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4d63bf16fdae29237ac3100ea040573f7edcbac3 --- include/vlc_aout.h | 1 - modules/audio_output/alsa.c | 2 +- modules/audio_output/oss.c | 2 +- src/audio_output/intf.c | 24 ------------------------ src/libvlccore.sym | 1 - 5 files changed, 2 insertions(+), 28 deletions(-) diff --git a/include/vlc_aout.h b/include/vlc_aout.h index 83e3478..25c7e22 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -324,7 +324,6 @@ VLC_EXPORT( int, aout_ToggleMute, ( vlc_object_t *, audio_volume_t * ) ); #define aout_ToggleMute(a, b) aout_ToggleMute(VLC_OBJECT(a), b) VLC_EXPORT( int, aout_SetMute, ( vlc_object_t *, audio_volume_t *, bool ) ); VLC_EXPORT( bool, aout_IsMuted, ( vlc_object_t * ) ); -VLC_EXPORT( int, aout_FindAndRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) ); VLC_EXPORT( int, aout_ChannelsRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) ); VLC_EXPORT( void, aout_EnableFilter, (vlc_object_t *, const char *, bool )); diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c index 69190c7..6592cb6 100644 --- a/modules/audio_output/alsa.c +++ b/modules/audio_output/alsa.c @@ -110,7 +110,7 @@ vlc_module_begin () set_description( N_("ALSA audio output") ) set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AOUT ) - add_string( "alsa-audio-device", DEFAULT_ALSA_DEVICE, aout_FindAndRestart, + add_string( "alsa-audio-device", DEFAULT_ALSA_DEVICE, NULL, N_("ALSA Device Name"), NULL, false ) add_deprecated_alias( "alsadev" ) /* deprecated since 0.9.3 */ change_string_list( ppsz_devices, ppsz_devices_text, FindDevicesCallback ) diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index bc4c97d..93cd37c 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -106,7 +106,7 @@ vlc_module_begin () set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AOUT ) - add_loadfile( "oss-audio-device", "/dev/dsp", aout_FindAndRestart, + add_loadfile( "oss-audio-device", "/dev/dsp", NULL, N_("OSS DSP device"), NULL, false ) add_deprecated_alias( "dspdev" ) /* deprecated since 0.9.3 */ add_bool( "oss-buggy", false, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, true ) diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c index 017ece2..b8b520c 100644 --- a/src/audio_output/intf.c +++ b/src/audio_output/intf.c @@ -458,30 +458,6 @@ static int aout_Restart( aout_instance_t * p_aout ) } /***************************************************************************** - * aout_FindAndRestart : find the audio output instance and restart - ***************************************************************************** - * This is used for callbacks of the configuration variables, and we believe - * that when those are changed, it is a significant change which implies - * rebuilding the audio-device and audio-channels variables. - *****************************************************************************/ -int aout_FindAndRestart( vlc_object_t * p_this, const char *psz_name, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - aout_instance_t * p_aout = findAout( pl_Get(p_this) ); - - (void)psz_name; (void)oldval; (void)newval; (void)p_data; - if ( p_aout == NULL ) return VLC_SUCCESS; - - var_Destroy( p_aout, "audio-device" ); - var_Destroy( p_aout, "audio-channels" ); - - aout_Restart( p_aout ); - vlc_object_release( p_aout ); - - return VLC_SUCCESS; -} - -/***************************************************************************** * aout_ChannelsRestart : change the audio device or channels and restart *****************************************************************************/ int aout_ChannelsRestart( vlc_object_t * p_this, const char * psz_variable, diff --git a/src/libvlccore.sym b/src/libvlccore.sym index b5c05f8..e238adb 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -16,7 +16,6 @@ aout_EnableFilter aout_FifoFirstDate aout_FifoPop aout_filter_RequestVout -aout_FindAndRestart aout_FormatNbChannels aout_FormatPrepare aout_FormatPrint _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
