X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmonitor_section.h;h=b58203f52164148859183564d5ef8947be9ea443;hb=589c13c0eb9f6003a7e8cf923110459c897ea4b0;hp=31d73748106400d6b8c81a6df0cb570893f7ff4a;hpb=f44e2e55fdd6e4d265f3eff715b071a27da8b5eb;p=ardour.git

diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h
index 31d7374810..b58203f521 100644
--- a/gtk2_ardour/monitor_section.h
+++ b/gtk2_ardour/monitor_section.h
@@ -19,27 +19,29 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/table.h>
+#include <gtkmm/eventbox.h>
 
 #include "gtkmm2ext/bindable_button.h"
+#include "gtkmm2ext/bindings.h"
 
 #include "ardour_button.h"
 #include "ardour_knob.h"
 #include "ardour_display.h"
-#include "axis_view.h"
 #include "level_meter.h"
 #include "route_ui.h"
 #include "monitor_selector.h"
 
+#include "plugin_selector.h"
+#include "route_processor_selection.h"
+#include "processor_box.h"
+
 namespace Gtkmm2ext {
 	class TearOff;
-	class MotionFeedback;
 }
 
-class VolumeController;
-
-class MonitorSection : public RouteUI
+class MonitorSection : public RouteUI, public Gtk::EventBox
 {
-	public:
+  public:
 	MonitorSection (ARDOUR::Session*);
 	~MonitorSection ();
 
@@ -49,17 +51,18 @@ class MonitorSection : public RouteUI
 
 	std::string state_id() const;
 
+	PluginSelector* plugin_selector() { return _plugin_selector; }
+
 	private:
-	Gtk::VBox vpacker;
 	Gtk::HBox hpacker;
-	Gtk::VBox upper_packer;
-	Gtk::VBox lower_packer;
+	Gtk::VBox vpacker;
 	Gtkmm2ext::TearOff* _tearoff;
 
 	Gtk::HBox  channel_table_packer;
 	Gtk::HBox  table_hpacker;
-	Gtk::Table channel_table;
+	Gtk::HBox  master_packer;
 	Gtk::Table channel_table_header;
+	Gtk::Table *channel_table;
 	Gtk::ScrolledWindow channel_table_scroller;
 	Gtk::Viewport channel_table_viewport;
 	Glib::RefPtr<Gtk::SizeGroup> channel_size_group;
@@ -93,7 +96,6 @@ class MonitorSection : public RouteUI
 
 	void maybe_add_bundle_to_output_menu (boost::shared_ptr<ARDOUR::Bundle>, ARDOUR::BundleList const &);
 	void bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle>);
-	void output_button_resized (Gtk::Allocation&);
 	void update_output_display ();
 	void disconnect_output ();
 	void edit_output_configuration ();
@@ -104,8 +106,30 @@ class MonitorSection : public RouteUI
 	boost::shared_ptr<ARDOUR::MonitorProcessor> _monitor;
 	boost::shared_ptr<ARDOUR::Route> _route;
 
+	enum MonitorActions {
+		MonitorMono,
+		MonitorCutAll,
+		MonitorDimAll,
+		ToggleExclusiveSolo,
+		ToggleMuteOverridesSolo,
+		SoloUseInPlace,
+		SoloUseAFL,
+		SoloUsePFL,
+		ToggleMonitorProcessorBox
+	};
+
+	enum ChannelActions {
+		CutChannel,
+		DimChannel,
+		SoloChannel,
+		InvertChannel
+	};
+
 	static Glib::RefPtr<Gtk::ActionGroup> monitor_actions;
-	void register_actions ();
+	static void register_actions ();
+
+	static void action_proxy0 (enum MonitorActions);
+	static void action_proxy1 (enum ChannelActions, uint32_t);
 
 	void cut_channel (uint32_t);
 	void dim_channel (uint32_t);
@@ -126,7 +150,7 @@ class MonitorSection : public RouteUI
 	ArdourButton solo_in_place_button;
 	ArdourButton afl_button;
 	ArdourButton pfl_button;
-	Gtk::HBox        solo_model_box;
+	Gtk::VBox    solo_model_box;
 
 	void solo_use_in_place ();
 	void solo_use_afl ();
@@ -140,6 +164,7 @@ class MonitorSection : public RouteUI
 	ArdourButton rude_audition_button;
 	ArdourButton exclusive_solo_button;
 	ArdourButton solo_mute_override_button;
+	ArdourButton toggle_processorbox_button;
 
 	void do_blink (bool);
 	void solo_blink (bool);
@@ -153,10 +178,32 @@ class MonitorSection : public RouteUI
 
 	PBD::ScopedConnection config_connection;
 	PBD::ScopedConnectionList control_connections;
-	PBD::ScopedConnection _output_changed_connection;
+	PBD::ScopedConnectionList output_changed_connections;
 
 	bool _inhibit_solo_model_update;
 
 	void assign_controllables ();
+
 	void port_connected_or_disconnected (boost::weak_ptr<ARDOUR::Port>, boost::weak_ptr<ARDOUR::Port>);
+
+	void update_processor_box ();
+
+	void route_property_changed (const PBD::PropertyChange&) {}
+
+	ProcessorBox* insert_box;
+	PluginSelector* _plugin_selector;
+	RouteProcessorSelection _rr_selection;
+	void help_count_processors (boost::weak_ptr<ARDOUR::Processor> p, uint32_t* cnt) const;
+	uint32_t count_processors ();
+
+	void processors_changed (ARDOUR::RouteProcessorChange);
+	Glib::RefPtr<Gtk::Action> proctoggle;
+	bool _ui_initialized;
+
+	static Gtkmm2ext::ActionMap myactions;
+	static Gtkmm2ext::Bindings* bindings;
+
+	static void load_bindings ();
+	bool enter_handler (GdkEventCrossing*);
+	bool leave_handler (GdkEventCrossing*);
 };