vlc | branch: master | Francois Cartegnie <[email protected]> | Mon Dec 31 15:40:55 2012 +0100| [6e9c9a93bc9b7c4ebda7e2cec23781b7caca0e48] | committer: Francois Cartegnie
Qt: Compressor: namespace initial values > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e9c9a93bc9b7c4ebda7e2cec23781b7caca0e48 --- modules/gui/qt4/components/extended_panels.cpp | 13 +------------ modules/gui/qt4/components/extended_panels.hpp | 12 ++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index 96cf821..f18d218 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -1230,18 +1230,7 @@ void Equalizer::addCallbacks( vlc_object_t *p_aout ) * Dynamic range compressor **********************************************************************/ -typedef struct -{ - const char *psz_name; - const char *psz_descs; - const char *psz_units; - const float f_min; // min - const float f_max; // max - const float f_value; // value - const float f_resolution; // resolution -} comp_controls_t; - -static const comp_controls_t comp_controls[] = +const Compressor::comp_controls_t Compressor::comp_controls[] = { { "compressor-rms-peak", _("RMS/peak"), "", 0.0f, 1.0f, 0.00f, 0.001f }, { "compressor-attack", _("Attack"), _(" ms"), 1.5f, 400.0f, 25.00f, 0.100f }, diff --git a/modules/gui/qt4/components/extended_panels.hpp b/modules/gui/qt4/components/extended_panels.hpp index e766154..09fab73 100644 --- a/modules/gui/qt4/components/extended_panels.hpp +++ b/modules/gui/qt4/components/extended_panels.hpp @@ -117,10 +117,22 @@ private slots: class Compressor: public QWidget { Q_OBJECT + public: Compressor( intf_thread_t *, QWidget * ); private: + typedef struct + { + const char *psz_name; + const char *psz_descs; + const char *psz_units; + const float f_min; // min + const float f_max; // max + const float f_value; // value + const float f_resolution; // resolution + } comp_controls_t; + static const comp_controls_t comp_controls[NUM_CP_CTRL]; QSlider *compCtrl[NUM_CP_CTRL]; QLabel *ctrl_texts[NUM_CP_CTRL]; QLabel *ctrl_readout[NUM_CP_CTRL]; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
