OSC: fix c++98 mistake

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 38b89bb8a5a06df2ebe427f4f3edb2afe65a408a..fb87b1b5de32503694b88b24ddeae08f7f463118 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -49,6 +49,7 @@
 
 namespace ARDOUR {
        class IO;
+       class GainControl;
        class Session;
        class Route;
        class RouteGroup;
@@ -63,6 +64,12 @@ namespace Gtk {
        class Menu;
 }
 
+enum MeterPointChangeTarget {
+       MeterPointChangeAll,
+       MeterPointChangeGroup,
+       MeterPointChangeSingle
+};
+
 class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 {
   public:
@@ -71,11 +78,14 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 
        virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
                                   boost::shared_ptr<ARDOUR::PeakMeter> meter,
-                                  boost::shared_ptr<ARDOUR::Amp> amp);
+                                  boost::shared_ptr<ARDOUR::Amp> amp,
+                                  boost::shared_ptr<ARDOUR::GainControl> control);
 
        void update_gain_sensitive ();
        void update_meters ();
 
+       const ARDOUR::ChanCount meter_channels () const;
+
        void effective_gain_display ();
        void set_width (Width, int len=0);
        void set_meter_strip_name (const char * name);
@@ -94,6 +104,14 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
         */
        PBD::Signal1<bool, GdkEventButton *> LevelMeterButtonPress;
 
+       static std::string astate_string (ARDOUR::AutoState);
+       static std::string short_astate_string (ARDOUR::AutoState);
+       static std::string _astate_string (ARDOUR::AutoState, bool);
+
+       static std::string astyle_string (ARDOUR::AutoStyle);
+       static std::string short_astyle_string (ARDOUR::AutoStyle);
+       static std::string _astyle_string (ARDOUR::AutoStyle, bool);
+
   protected:
 
        friend class MixerStrip;
@@ -102,6 +120,7 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        boost::shared_ptr<ARDOUR::Route> _route;
        boost::shared_ptr<ARDOUR::PeakMeter> _meter;
        boost::shared_ptr<ARDOUR::Amp> _amp;
+       boost::shared_ptr<ARDOUR::GainControl> _control;
        std::vector<sigc::connection> connections;
        PBD::ScopedConnectionList model_connections;
 
@@ -126,6 +145,14 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        Gtk::Menu gain_astate_menu;
        Gtk::Menu gain_astyle_menu;
 
+       ArdourButton meter_point_button;
+
+       Gtk::Menu meter_point_menu;
+
+       void set_gain_astate (ARDOUR::AutoState);
+       bool gain_astate_propagate;
+       static sigc::signal<void, ARDOUR::AutoState> ChangeGainAutomationState;
+
        gint gain_automation_style_button_event (GdkEventButton *);
        gint gain_automation_state_button_event (GdkEventButton *);
        gint pan_automation_style_button_event (GdkEventButton *);
@@ -135,15 +162,6 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
        void gain_automation_style_changed();
 
        void setup_gain_adjustment ();
-
-       std::string astate_string (ARDOUR::AutoState);
-       std::string short_astate_string (ARDOUR::AutoState);
-       std::string _astate_string (ARDOUR::AutoState, bool);
-
-       std::string astyle_string (ARDOUR::AutoStyle);
-       std::string short_astyle_string (ARDOUR::AutoStyle);
-       std::string _astyle_string (ARDOUR::AutoStyle, bool);
-
        Width _width;
 
        void show_gain ();
@@ -152,32 +170,33 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 
        float max_peak;
 
-       void gain_adjusted ();
+       void fader_moved ();
        void gain_changed ();
 
-       void meter_point_clicked ();
+       void meter_point_clicked (ARDOUR::MeterPoint);
        void gain_unit_changed ();
 
        virtual void hide_all_meters ();
 
        gint meter_button_press (GdkEventButton*, uint32_t);
 
+       bool peak_button_press (GdkEventButton*);
        bool peak_button_release (GdkEventButton*);
        bool gain_key_press (GdkEventKey*);
 
        Gtk::Menu* meter_menu;
        void popup_meter_menu (GdkEventButton*);
 
-       bool gain_slider_button_press (GdkEventButton *);
-       bool gain_slider_button_release (GdkEventButton *);
+       void amp_stop_touch ();
+       void amp_start_touch ();
 
        void set_route_group_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint);
        void set_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint);
-       gint meter_release (GdkEventButton*);
        gint meter_press (GdkEventButton*);
-       bool wait_for_release;
        ARDOUR::MeterPoint old_meter_point;
 
+       MeterPointChangeTarget meter_point_change_target;
+
        void parameter_changed (const char*);
 
        void reset_peak_display ();
@@ -204,7 +223,8 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
 
        virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
                                   boost::shared_ptr<ARDOUR::PeakMeter> meter,
-                                  boost::shared_ptr<ARDOUR::Amp> amp);
+                                  boost::shared_ptr<ARDOUR::Amp> amp,
+                                  boost::shared_ptr<ARDOUR::GainControl> control);
 
        int get_gm_width ();
        void setup_meters (int len=0);
@@ -226,7 +246,7 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
 
        Gtk::HBox  gain_display_box;
        Gtk::HBox  fader_box;
-       Gtk::VBox* fader_vbox;
+       Gtk::VBox  fader_vbox;
        Gtk::HBox  hbox;
        Gtk::HBox  meter_hbox;
        Gtk::Alignment fader_alignment;