X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.h;h=9622011654a7eee104812a452a63ff3d9aff795b;hb=603748d68af1009fac47b284bf6f8815745586c7;hp=6aed08d17e6bbfe4b18e29ac7a3d96b351984f06;hpb=e7c47747286c16aa575456b07120e1e8e8271bd5;p=ardour.git

diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index 6aed08d17e..9622011654 100644
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -91,9 +91,6 @@ class ProcessorWindowProxy : public WM::ProxyBase
     void toggle();
     void set_custom_ui_mode(bool use_custom) { want_custom = use_custom; }
 
-    bool marked;
-    bool valid () const;
-
     void set_state (const XMLNode&);
     XMLNode& get_state () const;
 
@@ -119,13 +116,16 @@ public:
 	std::string drag_text () const;
 	void set_visual_state (Gtkmm2ext::VisualState, bool);
 
+	bool is_selectable() const {return _selectable;}
+	void set_selectable(bool s) { _selectable = s; }
+	
 	enum Position {
 		PreFader,
 		Fader,
 		PostFader
 	};
 
-	void set_position (Position);
+	void set_position (Position, uint32_t);
 	boost::shared_ptr<ARDOUR::Processor> processor () const;
 	void set_enum_width (Width);
 
@@ -138,27 +138,31 @@ public:
 	void set_control_state (XMLNode const *);
 	std::string state_id () const;
 	Gtk::Menu* build_controls_menu ();
+	Gtk::Menu* build_send_options_menu ();
 
 protected:
 	ArdourButton _button;
 	Gtk::VBox _vbox;
 	Position _position;
+	uint32_t _position_num;
 
 	virtual void setup_visuals ();
 
 private:
+	bool _selectable;
 	void led_clicked();
 	void processor_active_changed ();
 	void processor_property_changed (const PBD::PropertyChange&);
+	void processor_configuration_changed (const ARDOUR::ChanCount in, const ARDOUR::ChanCount out);
 	std::string name (Width) const;
 	void setup_tooltip ();
 
 	ProcessorBox* _parent;
 	boost::shared_ptr<ARDOUR::Processor> _processor;
 	Width _width;
-	Gtk::StateType _visual_state;
 	PBD::ScopedConnection active_connection;
 	PBD::ScopedConnection name_connection;
+	PBD::ScopedConnection config_connection;
 
 	class Control : public sigc::trackable {
 	public:
@@ -168,7 +172,6 @@ private:
 		void add_state (XMLNode *) const;
 		void set_state (XMLNode const *);
 		void hide_things ();
-		void hide_label ();
 
 		bool visible () const {
 			return _visible;
@@ -178,7 +181,7 @@ private:
 			return _name;
 		}
 		
-		Gtk::VBox box;
+		Gtk::Alignment box;
 
 	private:
 		void slider_adjusted ();
@@ -191,7 +194,6 @@ private:
 		/* things for a slider */
 		Gtk::Adjustment _adjustment;
 		Gtkmm2ext::HSliderController _slider;
-		Gtk::Label _label;
 		Gtkmm2ext::PersistentTooltip _slider_persistant_tooltip;
 		/* things for a button */
 		ArdourButton _button;
@@ -204,12 +206,44 @@ private:
 	std::list<Control*> _controls;
 
 	void toggle_control_visibility (Control *);
-};
+	void toggle_panner_link ();
 
-class BlankProcessorEntry : public ProcessorEntry
-{
-  public:
-	BlankProcessorEntry (ProcessorBox *, Width w);
+	class PortIcon : public Gtk::DrawingArea {
+	public:
+		PortIcon(bool input) {
+			_input = input;
+			_ports = ARDOUR::ChanCount(ARDOUR::DataType::AUDIO, 1);
+			set_size_request (-1, 2);
+		}
+		void set_ports(ARDOUR::ChanCount const ports) { _ports = ports; }
+	private:
+		bool on_expose_event (GdkEventExpose *);
+		bool _input;
+		ARDOUR::ChanCount _ports;
+	};
+
+	class RoutingIcon : public Gtk::DrawingArea {
+	public:
+		RoutingIcon() {
+			_sources = ARDOUR::ChanCount(ARDOUR::DataType::AUDIO, 1);
+			_sinks = ARDOUR::ChanCount(ARDOUR::DataType::AUDIO, 1);
+			_splitting = false;
+			set_size_request (-1, 4);
+		}
+		void set_sources(ARDOUR::ChanCount const sources) { _sources = sources; }
+		void set_sinks(ARDOUR::ChanCount const sinks) { _sinks = sinks; }
+		void set_splitting(const bool splitting) { _splitting = splitting; }
+	private:
+		bool on_expose_event (GdkEventExpose *);
+		ARDOUR::ChanCount _sources; // signals available to feed into the processor(s)
+		ARDOUR::ChanCount _sinks;   // combined number of outputs of the processor
+		bool _splitting;
+	};
+
+protected:
+	RoutingIcon _routing_icon;
+	PortIcon _input_icon;
+	PortIcon _output_icon;
 };
 
 class PluginInsertProcessorEntry : public ProcessorEntry
@@ -220,25 +254,9 @@ public:
 	void hide_things ();
 
 private:
-	void setup_visuals ();
 	void plugin_insert_splitting_changed ();
-
-	class SplittingIcon : public Gtk::DrawingArea {
-	public:
-		SplittingIcon() {
-			_inputs = ARDOUR::ChanCount(ARDOUR::DataType::AUDIO, 1);
-			_outputs = ARDOUR::ChanCount(ARDOUR::DataType::AUDIO, 2);
-		}
-		void set_inputs(ARDOUR::ChanCount const inputs) { _inputs = inputs; }
-		void set_outputs(ARDOUR::ChanCount const outputs) { _outputs = outputs; }
-	private:
-		bool on_expose_event (GdkEventExpose *);
-		ARDOUR::ChanCount _inputs;
-		ARDOUR::ChanCount _outputs;
-	};
-
 	boost::shared_ptr<ARDOUR::PluginInsert> _plugin_insert;
-	SplittingIcon _splitting_icon;
+
 	PBD::ScopedConnection _splitting_connection;
 };
 
@@ -251,6 +269,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 		ProcessorsPaste,
 		ProcessorsDelete,
 		ProcessorsSelectAll,
+		ProcessorsSelectNone,
 		ProcessorsToggleActive,
 		ProcessorsAB,
 	};
@@ -262,7 +281,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 	void set_route (boost::shared_ptr<ARDOUR::Route>);
 	void set_width (Width);
 
-	void processor_operation (ProcessorOperation);
+	bool processor_operation (ProcessorOperation);
 
 	void select_all_processors ();
 	void deselect_all_processors ();
@@ -420,8 +439,8 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 	void route_property_changed (const PBD::PropertyChange&);
 	std::string generate_processor_title (boost::shared_ptr<ARDOUR::PluginInsert> pi);
 
-        typedef std::list<ProcessorWindowProxy*> ProcessorWindowProxies;
-        ProcessorWindowProxies _processor_window_info;
+        //typedef std::list<ProcessorWindowProxy*> ProcessorWindowProxies;
+        //ProcessorWindowProxies _processor_window_info;
 
         ProcessorWindowProxy* find_window_proxy (boost::shared_ptr<ARDOUR::Processor>) const;
 
@@ -434,6 +453,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 	void mixer_strip_delivery_changed (boost::weak_ptr<ARDOUR::Delivery>);
 
 	XMLNode* entry_gui_object_state (ProcessorEntry *);
+	PBD::ScopedConnection amp_config_connection;
 };
 
 #endif /* __ardour_gtk_processor_box__ */