X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmonitor_section.h;h=f7848a3f01261f384efa3e9b61eca03d33f2ce05;hb=44680aa1bb6c42d261e4b6424d5d76fd42f26624;hp=da20857aead13c7506ac05492e0d441e1ee4def5;hpb=e69aca28426dd17a0f82ea01c7c98e217b4fdcc3;p=ardour.git

diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h
index da20857aea..f7848a3f01 100644
--- a/gtk2_ardour/monitor_section.h
+++ b/gtk2_ardour/monitor_section.h
@@ -22,12 +22,14 @@
 
 #include "gtkmm2ext/bindable_button.h"
 
+#include "ardour_button.h"
 #include "axis_view.h"
 #include "level_meter.h"
 #include "route_ui.h"
 
 namespace Gtkmm2ext {
         class TearOff;
+        class MotionFeedback;
 }
 
 class VolumeController;
@@ -43,19 +45,28 @@ class MonitorSection : public RouteUI
 
         Gtkmm2ext::TearOff& tearoff() const { return *_tearoff; }
 
+	std::string state_id() const;
+
   private:
         Gtk::VBox vpacker;
         Gtk::HBox hpacker;
-        Gtk::Table main_table;
         Gtk::VBox upper_packer;
         Gtk::VBox lower_packer;
         Gtkmm2ext::TearOff* _tearoff;
 
-        struct ChannelButtonSet { 
-            BindableToggleButton cut;
-            BindableToggleButton dim;
-            BindableToggleButton solo;
-            BindableToggleButton invert;
+	Gtk::HBox  channel_table_packer;
+	Gtk::HBox  table_hpacker;
+        Gtk::Table channel_table;
+        Gtk::Table channel_table_header;
+	Gtk::ScrolledWindow channel_table_scroller;
+	Gtk::Viewport channel_table_viewport;
+	Glib::RefPtr<Gtk::SizeGroup> channel_size_group;
+
+        struct ChannelButtonSet {
+            ArdourButton cut;
+            ArdourButton dim;
+            ArdourButton solo;
+            ArdourButton invert;
 
             ChannelButtonSet ();
         };
@@ -63,17 +74,12 @@ class MonitorSection : public RouteUI
         typedef std::vector<ChannelButtonSet*> ChannelButtons;
         ChannelButtons _channel_buttons;
 
-        Gtk::Adjustment   gain_adjustment;
         VolumeController* gain_control;
-        Gtk::Adjustment   dim_adjustment;
         VolumeController* dim_control;
-        Gtk::Adjustment   solo_boost_adjustment;
         VolumeController* solo_boost_control;
-        Gtk::Adjustment   solo_cut_adjustment;
         VolumeController* solo_cut_control;
 
         void populate_buttons ();
-	void set_button_names ();
         void map_state ();
 
         boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor;
@@ -92,36 +98,45 @@ class MonitorSection : public RouteUI
         void dim_all ();
         void cut_all ();
         void mono ();
+        void toggle_exclusive_solo ();
+	void set_button_names () {}
+        void toggle_mute_overrides_solo ();
         void dim_level_changed ();
         void solo_boost_changed ();
         void gain_value_changed ();
 
-        bool nonlinear_gain_printer (Gtk::SpinButton*);
-        bool linear_gain_printer (Gtk::SpinButton*);
-
-        Gtk::RadioButtonGroup solo_model_group;
-        Gtk::RadioButton solo_in_place_button;
-        Gtk::RadioButton afl_button;
-        Gtk::RadioButton pfl_button;
+        ArdourButton solo_in_place_button;
+        ArdourButton afl_button;
+        ArdourButton pfl_button;
         Gtk::HBox        solo_model_box;
 
         void solo_use_in_place ();
         void solo_use_afl ();
         void solo_use_pfl ();
 
-        BindableToggleButton cut_all_button;
-        BindableToggleButton dim_all_button;
-        BindableToggleButton mono_button;
-        BindableToggleButton rude_solo_button;
+        ArdourButton cut_all_button;
+        ArdourButton dim_all_button;
+        ArdourButton mono_button;
+        ArdourButton rude_solo_button;
+        ArdourButton rude_iso_button;
+        ArdourButton rude_audition_button;
+        ArdourButton exclusive_solo_button;
+        ArdourButton solo_mute_override_button;
 
+        void do_blink (bool);
         void solo_blink (bool);
+        void audition_blink (bool);
         bool cancel_solo (GdkEventButton*);
-        void solo_cut_changed ();
+        bool cancel_isolate (GdkEventButton*);
+        bool cancel_audition (GdkEventButton*);
         void update_solo_model ();
         void parameter_changed (std::string);
+        void isolated_changed ();
 
         PBD::ScopedConnection config_connection;
         PBD::ScopedConnectionList control_connections;
-        
+
+	bool _inhibit_solo_model_update;
+	
         void assign_controllables ();
 };