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

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 6cc7a34fc79d5eb0c0d3f6db87549f3290c37471..ca7d471a5e5615b2404d4f9a8f18b3ed2524c544 100644 (file)
--- 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 4b5d39acdaa7f32f0673794da837855923465850..d8254b76c85768454983bc6262e9cca61dcbc91c 100644 (file)
--- 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" ) );
     }