VKeybd: Pass on primary (Ctrl/Cmd) shortcuts

[ardour.git] / gtk2_ardour / gain_meter.h

diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index b7cf2829c463249f1651854ca1d5bc974f715c75..2ae9a2ee44f0686ff37a387e4b9e1461eec156e7 100644 (file)
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -1,21 +1,27 @@
 /*
-    Copyright (C) 2002 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2005-2016 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2005 Taybin Rutkin <taybin@taybin.com>
+ * Copyright (C) 2006 Nick Mainsbridge <mainsbridge@gmail.com>
+ * Copyright (C) 2007-2011 David Robillard <d@drobilla.net>
+ * Copyright (C) 2007 Doug McLain <doug@nostar.net>
+ * Copyright (C) 2009-2012 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2013-2019 Robin Gareus <robin@gareus.org>
+ * Copyright (C) 2014 Ben Loftis <ben@harrisonconsoles.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef __ardour_gtk_gain_meter_h__
 #define __ardour_gtk_gain_meter_h__
@@ -90,7 +96,6 @@ public:
        void set_fader_name (const char * name);
 
        virtual void setup_meters (int len=0);
-       virtual void set_type (ARDOUR::MeterType);
 
        boost::shared_ptr<PBD::Controllable> get_controllable();
 
@@ -102,6 +107,7 @@ public:
         */
        PBD::Signal1<bool, GdkEventButton *> LevelMeterButtonPress;
 
+       static std::string meterpt_string (ARDOUR::MeterPoint);
        static std::string astate_string (ARDOUR::AutoState);
        static std::string short_astate_string (ARDOUR::AutoState);
        static std::string _astate_string (ARDOUR::AutoState, bool);
@@ -111,6 +117,7 @@ protected:
        friend class MixerStrip;
        friend class MeterStrip;
        friend class RouteTimeAxisView;
+       friend class VCAMasterStrip;
        boost::shared_ptr<ARDOUR::Route> _route;
        boost::shared_ptr<ARDOUR::PeakMeter> _meter;
        boost::shared_ptr<ARDOUR::Amp> _amp;
@@ -216,7 +223,6 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
 
        int get_gm_width ();
        void setup_meters (int len=0);
-       void set_type (ARDOUR::MeterType);
        void route_active_changed ();
 
   protected:
@@ -226,11 +232,11 @@ class GainMeter : public GainMeterBase, public Gtk::VBox
        gint meter_ticks1_expose (GdkEventExpose *);
        gint meter_ticks2_expose (GdkEventExpose *);
        void on_style_changed (const Glib::RefPtr<Gtk::Style>&);
+       void redraw_metrics ();
 
   private:
 
        void meter_configuration_changed (ARDOUR::ChanCount);
-       void meter_type_changed (ARDOUR::MeterType);
 
        Gtk::HBox  gain_display_box;
        Gtk::HBox  fader_box;