vlc | branch: master | Francois Cartegnie <fcvlc...@free.fr> | Mon Dec 31 15:44:52 2012 +0100| [69cdf17232984c40f56bfc6e8d0830d808760fb6] | committer: Francois Cartegnie
Qt: Equalizer: namespace initial values > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=69cdf17232984c40f56bfc6e8d0830d808760fb6 --- modules/gui/qt4/components/extended_panels.cpp | 8 +------- modules/gui/qt4/components/extended_panels.hpp | 11 +++++++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index f18d218..e7be82b 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -1364,13 +1364,7 @@ void Compressor::setValues() /********************************************************************** * Spatializer **********************************************************************/ -typedef struct -{ - const char *psz_name; - const char *psz_desc; -} spat_controls_t; - -static const spat_controls_t spat_controls[] = +const Spatializer::spat_controls_t Spatializer::spat_controls[] = { { "spatializer-roomsize", _("Size") }, { "spatializer-width", _("Width") }, diff --git a/modules/gui/qt4/components/extended_panels.hpp b/modules/gui/qt4/components/extended_panels.hpp index 09fab73..2c78a45 100644 --- a/modules/gui/qt4/components/extended_panels.hpp +++ b/modules/gui/qt4/components/extended_panels.hpp @@ -156,15 +156,22 @@ private slots: class Spatializer: public QWidget { Q_OBJECT + public: Spatializer( intf_thread_t *, QWidget * ); private: + typedef struct + { + const char *psz_name; + const char *psz_desc; + } spat_controls_t; + static const spat_controls_t spat_controls[NUM_SP_CTRL]; QSlider *spatCtrl[NUM_SP_CTRL]; QLabel *ctrl_texts[NUM_SP_CTRL]; QLabel *ctrl_readout[NUM_SP_CTRL]; - float controlVars[5]; - float oldControlVars[5]; + float controlVars[NUM_SP_CTRL]; + float oldControlVars[NUM_SP_CTRL]; QGroupBox *spatializerBox; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits