From c6adecf5346037600a5f332f2c14d56b43abb354 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sun, 27 Jul 2008 20:31:54 -0700 Subject: [PATCH] Remove Equalizer from the menu (as for the mac version) Since the aout is destroyed when equalizer is activated, the callback registration doesn't work and only HACKs can solve that (msleep). Close #1740 --- modules/gui/qt4/components/extended_panels.cpp | 12 ------------ modules/gui/qt4/menus.cpp | 2 -- 2 files changed, 14 deletions(-) diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index 6cc7a34fc7..ca7d471a5e 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -917,18 +917,6 @@ void Equalizer::enable( bool en ) { bands[i]->setEnabled( en ); band_texts[i]->setEnabled( en ); } - -#if 0 - msleep( 10000 ); - - aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf, - VLC_OBJECT_AOUT, FIND_ANYWHERE ); - if( en ) - addCallbacks( p_aout ); - else - delCallbacks( p_aout ); -#endif - } /* Function called when the set2Pass button is activated */ diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 4b5d39acda..d8254b76c8 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -217,7 +217,6 @@ static int AudioAutoMenuBuilder( vlc_object_t *p_object, PUSH_INPUTVAR( "audio-es" ); PUSH_VAR( "audio-device" ); PUSH_VAR( "audio-channels" ); - PUSH_VAR( "equalizer" ); PUSH_VAR( "visual" ); return VLC_SUCCESS; } @@ -457,7 +456,6 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current ) ACT_ADD( current, "audio-es", qtr( "Audio &Track" ) ); ACT_ADD( current, "audio-device", qtr( "Audio &Device" ) ); ACT_ADD( current, "audio-channels", qtr( "Audio &Channels" ) ); - ACT_ADD( current, "equalizer", qtr( "&Equalizer" ) ); current->addSeparator(); ACT_ADD( current, "visual", qtr( "&Visualizations" ) ); } -- 2.39.5