[vlc-commits] Revert "qt: enable audio filters with their name/shortcut"

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Nov  8 09:50:52 2017 +0100| [31ecffa32f48fab42fcd7fe36ddace1dbf6fd33a] | committer: Thomas Guillem

Revert "qt: enable audio filters with their name/shortcut"

This reverts commit 2adbdef3dff50986bd1dca2986212b9d2eb45e00.

We should not load a specific audio filter submodule. If this is needed, this
means that a submodule can be loaded randomly in place of the main module.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=31ecffa32f48fab42fcd7fe36ddace1dbf6fd33a
---

 modules/gui/qt/components/extended_panels.cpp | 15 ++++++---------
 modules/gui/qt/components/extended_panels.hpp |  4 +---
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/modules/gui/qt/components/extended_panels.cpp b/modules/gui/qt/components/extended_panels.cpp
index ec37fccb18..331e2f3cac 100644
--- a/modules/gui/qt/components/extended_panels.cpp
+++ b/modules/gui/qt/components/extended_panels.cpp
@@ -901,12 +901,9 @@ void FilterSliderData::writeToConfig()
 }
 
 AudioFilterControlWidget::AudioFilterControlWidget
-( intf_thread_t *_p_intf, QWidget *parent, const char *_shortcut,
-  const char *_name = NULL ) :
-    QWidget( parent ), p_intf( _p_intf ), shortcut( _shortcut ),
-    name( _name ? _name : _shortcut ), i_smallfont(0)
-{
-}
+( intf_thread_t *_p_intf, QWidget *parent, const char *_name ) :
+    QWidget( parent ), p_intf( _p_intf ), name( _name ), i_smallfont(0)
+{}
 
 void AudioFilterControlWidget::connectConfigChanged( FilterSliderData *slider )
 {
@@ -949,7 +946,7 @@ void AudioFilterControlWidget::build()
 
     char *psz_af = var_InheritString( THEPL, "audio-filter" );
 
-    if( psz_af && filterIsPresent( qfu(psz_af), shortcut ) )
+    if( psz_af && filterIsPresent( qfu(psz_af), name ) )
         slidersBox->setChecked( true );
     else
         slidersBox->setChecked( false );
@@ -967,10 +964,10 @@ void AudioFilterControlWidget::enable( bool b_enable )
         return;
     }
 
-    QString result = ChangeFiltersString( p_intf, "audio-filter", qtu(shortcut),
+    QString result = ChangeFiltersString( p_intf, "audio-filter", qtu(name),
                                           b_enable );
     emit configChanged( qfu("audio-filter"), result );
-    playlist_EnableAudioFilter( THEPL, qtu(shortcut), b_enable );
+    playlist_EnableAudioFilter( THEPL, qtu(name), b_enable );
 }
 
 /**********************************************************************
diff --git a/modules/gui/qt/components/extended_panels.hpp b/modules/gui/qt/components/extended_panels.hpp
index f303f1e978..6c75679669 100644
--- a/modules/gui/qt/components/extended_panels.hpp
+++ b/modules/gui/qt/components/extended_panels.hpp
@@ -132,8 +132,7 @@ class AudioFilterControlWidget : public QWidget
     Q_OBJECT
 
 public:
-    AudioFilterControlWidget( intf_thread_t *, QWidget *, const char *shortcut,
-                              const char *name /* = NULL */ );
+    AudioFilterControlWidget( intf_thread_t *, QWidget *, const char *name );
 
 protected:
     virtual void build();
@@ -142,7 +141,6 @@ protected:
     QVector<FilterSliderData *> sliderDatas;
     QGroupBox *slidersBox;
     intf_thread_t *p_intf;
-    QString shortcut; // filter's module shorcut name
     QString name; // filter's module name
     int i_smallfont;