X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgeneric_pluginui.cc;h=d6090dea739ce34590c8a6cb7fd29834371fcb18;hb=57ee61772b6c44e7731619c5c74e45bb860ac4aa;hp=47b5f93a9829b296c0fdb5829d04b938444e68a4;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 47b5f93a98..d6090dea73 100644
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -43,6 +43,7 @@
 #include "ardour/session.h"
 #include "ardour/value_as_string.h"
 
+#include "ardour_spinner.h"
 #include "prompter.h"
 #include "plugin_ui.h"
 #include "gui_thread.h"
@@ -340,11 +341,7 @@ GenericPluginUI::build ()
 	for (i = 0; i < control_uis.size(); ++i) {
 		ControlUI* cui = control_uis[i];
 
-		if (cui->controller || cui->clickbox || cui->combo) {
-			// Get all of the controls into a list, so that
-			// we can lay them out a bit more nicely later.
-			cui_controls_list.push_back(cui);
-		} else if (cui->button || cui->file_button) {
+		if (cui->button || cui->file_button) {
 
 			if (!is_scrollable && button_row == button_rows) {
 				button_row = 0;
@@ -358,6 +355,11 @@ GenericPluginUI::build ()
 			                     FILL|EXPAND, FILL);
 			button_row++;
 
+		} else if (cui->controller || cui->clickbox || cui->combo) {
+			// Get all of the controls into a list, so that
+			// we can lay them out a bit more nicely later.
+			cui_controls_list.push_back(cui);
+
 		} else if (cui->display) {
 
 			output_table.attach (*cui, output_col, output_col + 1, output_row, output_row+1,
@@ -501,7 +503,7 @@ GenericPluginUI::ControlUI::ControlUI (const Evoral::Parameter& p)
 
 	ignore_change = 0;
 	display = 0;
-	button = 0;
+	button = false;
 	clickbox = 0;
 	meterinfo = 0;
 }
@@ -633,33 +635,6 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
 			return control_ui;
 		}
 
-		if (desc.toggled) {
-
-			/* Build a button */
-
-			control_ui->button = manage (new ToggleButton ());
-			control_ui->button->set_name ("PluginEditorButton");
-			control_ui->button->set_size_request (20, 20);
-
-			control_ui->pack_start (control_ui->label, true, true);
-			control_ui->pack_start (*control_ui->button, false, true);
-			control_ui->pack_start (control_ui->automate_button, false, false);
-
-			control_ui->button->signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::control_port_toggled), control_ui));
-			control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui));
-
-			mcontrol->Changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::toggle_parameter_changed, this, control_ui), gui_context());
-			mcontrol->alist()->automation_state_changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui), gui_context());
-
-			if (value > 0.5){
-				control_ui->button->set_active(true);
-			}
-
-			automation_state_changed (control_ui);
-
-			return control_ui;
-		}
-
 		if (desc.datatype == Variant::PATH) {
 
 			/* Build a file selector button */
@@ -686,9 +661,10 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
 		}
 
 		/* create the controller */
+		bool use_knob = false; // XXX TODO
 
 		if (mcontrol) {
-			control_ui->controller = AutomationController::create(insert, mcontrol->parameter(), desc, mcontrol);
+			control_ui->controller = AutomationController::create(insert, mcontrol->parameter(), desc, mcontrol, use_knob);
 		}
 
 		/* XXX this code is not right yet, because it doesn't handle
@@ -697,7 +673,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
 
 		Adjustment* adj = control_ui->controller->adjustment();
 
-		if (desc.integer_step) {
+		if (desc.integer_step && !desc.toggled) {
 			control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox", true);
 			Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2);
 			if (desc.unit == ParameterDescriptor::MIDI_NOTE) {
@@ -705,6 +681,8 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
 			} else {
 				control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::integer_printer), control_ui));
 			}
+		} else if (desc.toggled || use_knob) {
+			control_ui->controller->set_size_request (req.height, req.height);
 		} else {
 			//sigc::slot<void,char*,uint32_t> pslot = sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::print_parameter), (uint32_t) port_index);
 
@@ -721,18 +699,36 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
 		*/
 
 		control_ui->pack_start (control_ui->label, true, true);
-		if (desc.integer_step) {
+
+		if (desc.toggled) {
+			control_ui->button = true;
+			ArdourButton* but = dynamic_cast<ArdourButton*>(control_ui->controller->widget ());
+			assert (but);
+			but->set_name ("pluginui toggle");
+			update_control_display(control_ui);
+		}
+
+		if (desc.integer_step && !desc.toggled) {
 			control_ui->pack_start (*control_ui->clickbox, false, false);
 		} else {
+			if (!desc.toggled && use_knob) {
+				ArdourSpinner* spb = manage (new ArdourSpinner (mcontrol, adj, insert));
+				control_ui->pack_start (*spb, false, false);
+			}
 			control_ui->pack_start (*control_ui->controller, false, false);
 		}
 
 		control_ui->pack_start (control_ui->automate_button, false, false);
-		control_ui->automate_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui));
 
-		automation_state_changed (control_ui);
+		if (mcontrol->flags () & Controllable::NotAutomatable) {
+			control_ui->automate_button.set_sensitive (false);
+			set_tooltip(control_ui->automate_button, _("This control cannot be automated"));
+		} else {
+			control_ui->automate_button.signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui));
+			mcontrol->alist()->automation_state_changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui), gui_context());
+		}
 
-		mcontrol->alist()->automation_state_changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui), gui_context());
+		automation_state_changed (control_ui);
 
 		input_controls.push_back (control_ui);
 		input_controls_with_automation.push_back (control_ui);
@@ -751,48 +747,55 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
 
 		control_ui->display->show_all ();
 
-		/* set up a meter */
-		/* TODO: only make a meter if the port is Hinted for it */
+		control_ui->vbox = manage (new VBox);
+		control_ui->vbox->set_spacing(3);
 
-		MeterInfo * info = new MeterInfo();
- 		control_ui->meterinfo = info;
+		if (desc.integer_step || desc.enumeration) {
+			control_ui->vbox->pack_end (*control_ui->display, false, false);
+			control_ui->vbox->pack_end (control_ui->label, false, false);
+		} else {
+			/* set up a meter for float ports */
 
-		info->meter = new FastMeter (
-				5, 5, FastMeter::Vertical, 0,
-				0x0000aaff,
-				0x008800ff, 0x008800ff,
-				0x00ff00ff, 0x00ff00ff,
-				0xcccc00ff, 0xcccc00ff,
-				0xffaa00ff, 0xffaa00ff,
-				0xff0000ff,
-				UIConfiguration::instance().color ("meter background bottom"),
-				UIConfiguration::instance().color ("meter background top")
-				);
+			MeterInfo * info = new MeterInfo();
+			control_ui->meterinfo = info;
 
-		info->min_unbound = desc.min_unbound;
-		info->max_unbound = desc.max_unbound;
+			info->meter = new FastMeter (
+					5, 5, FastMeter::Vertical, 0,
+					0x0000aaff,
+					0x008800ff, 0x008800ff,
+					0x00ff00ff, 0x00ff00ff,
+					0xcccc00ff, 0xcccc00ff,
+					0xffaa00ff, 0xffaa00ff,
+					0xff0000ff,
+					UIConfiguration::instance().color ("meter background bottom"),
+					UIConfiguration::instance().color ("meter background top")
+					);
 
-		info->min = desc.lower;
-		info->max = desc.upper;
+			info->min_unbound = desc.min_unbound;
+			info->max_unbound = desc.max_unbound;
 
-		control_ui->vbox = manage (new VBox);
-		control_ui->hbox = manage (new HBox);
+			info->min = desc.lower;
+			info->max = desc.upper;
 
-		control_ui->hbox->set_spacing(1);
-		control_ui->vbox->set_spacing(3);
+			control_ui->label.set_angle(90);
 
-		control_ui->label.set_angle(90);
-		control_ui->hbox->pack_start (control_ui->label, false, false);
- 		control_ui->hbox->pack_start (*info->meter, false, false);
+			HBox* center =  manage (new HBox);
+			center->set_spacing(1);
+			center->pack_start (control_ui->label, false, false);
+			center->pack_start (*info->meter, false, false);
 
- 		control_ui->vbox->pack_start (*control_ui->hbox, false, false);
+			control_ui->hbox = manage (new HBox);
+			control_ui->hbox->pack_start (*center, true, false);
 
- 		control_ui->vbox->pack_start (*control_ui->display, false, false);
+			// horizontally center this hbox in the vbox
+			control_ui->vbox->pack_start (*control_ui->hbox, false, false);
 
-		control_ui->pack_start (*control_ui->vbox);
+			control_ui->meterinfo->meter->show_all();
+			control_ui->meterinfo->packed = true;
+			control_ui->vbox->pack_start (*control_ui->display, false, false);
+		}
 
-		control_ui->meterinfo->meter->show_all();
-		control_ui->meterinfo->packed = true;
+		control_ui->pack_start (*control_ui->vbox);
 
 		output_controls.push_back (control_ui);
 	}
@@ -845,22 +848,6 @@ GenericPluginUI::set_automation_state (AutoState state, ControlUI* cui)
 	insert->set_parameter_automation_state (cui->parameter(), state);
 }
 
-void
-GenericPluginUI::toggle_parameter_changed (ControlUI* cui)
-{
-	float val = cui->control->get_value();
-
-	if (!cui->ignore_change) {
-		if (val > 0.5) {
-			cui->button->set_active (true);
-			cui->button->set_name ("PluginEditorButton-active");
-		} else {
-			cui->button->set_active (false);
-			cui->button->set_name ("PluginEditorButton");
-		}
-	}
-}
-
 void
 GenericPluginUI::ui_parameter_changed (ControlUI* cui)
 {
@@ -889,12 +876,7 @@ GenericPluginUI::update_control_display (ControlUI* cui)
 			}
 		}
 	} else if (cui->button) {
-
-		if (val > 0.5) {
-			cui->button->set_active (true);
-		} else {
-			cui->button->set_active (false);
-		}
+		// AutomationController handles this
 	}
 
 	if( cui->controller ) {
@@ -913,26 +895,12 @@ GenericPluginUI::update_control_display (ControlUI* cui)
 	cui->ignore_change--;
 }
 
-void
-GenericPluginUI::control_port_toggled (ControlUI* cui)
-{
-	cui->ignore_change++;
-	const bool active = cui->button->get_active();
-	if (active) {
-		cui->button->set_name ("PluginEditorButton-active");
-	} else {
-		cui->button->set_name ("PluginEditorButton");
-	}
-	insert->automation_control (cui->parameter())->set_value (active);
-	cui->ignore_change--;
-}
-
 void
 GenericPluginUI::control_combo_changed (ControlUI* cui)
 {
 	if (!cui->ignore_change && cui->scale_points) {
 		string value = cui->combo->get_active_text();
-		insert->automation_control (cui->parameter())->set_value ((*cui->scale_points)[value]);
+		insert->automation_control (cui->parameter())->set_value ((*cui->scale_points)[value], Controllable::NoGroup);
 	}
 }