X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=d5699c3651f61d4cbe3a392b06cca376f34f3179;hb=000281e4d039436f022d09f989d08babe0d5f2de;hp=61e659783036eeae4b1a6f1353155b0f1e0e9606;hpb=fb5485261acdafcb0ca118d6f1cf62caa344b162;p=ardour.git

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 61e6597830..d5699c3651 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -106,18 +106,19 @@ ProcessorEntry::ProcessorEntry (boost::shared_ptr<Processor> p, Width w)
 	_vbox.show ();
 	
 	if (_processor->active()) {
-		_button.set_active_state (CairoWidget::Active);
+		_button.set_active_state (Gtkmm2ext::Active);
 	}
 	_button.set_diameter (3);
 	_button.set_distinct_led_click (true);
 	_button.set_led_left (true);
 	_button.signal_led_clicked.connect (sigc::mem_fun (*this, &ProcessorEntry::led_clicked));
-	_button.set_text (name());
+	_button.set_text (name (_width));
 	_button.show ();
 
 	_processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context());
 	_processor->PropertyChanged.connect (name_connection, invalidator (*this), ui_bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context());
 
+	setup_tooltip ();
 	setup_visuals ();
 }
 
@@ -136,7 +137,7 @@ ProcessorEntry::widget ()
 string
 ProcessorEntry::drag_text () const
 {
-	return name ();
+	return name (Wide);
 }
 
 void
@@ -147,23 +148,12 @@ ProcessorEntry::set_position (Position p)
 }
 
 void
-ProcessorEntry::set_visual_state (Gtk::StateType t)
+ProcessorEntry::set_visual_state (Gtkmm2ext::VisualState s, bool yn)
 {
-	/* map from GTK state to CairoWidget */
-	
-	switch (t) {
-	case Gtk::STATE_ACTIVE:
-		_button.unset_visual_state ();
-		break;
-
-	case Gtk::STATE_SELECTED:
-		_button.set_visual_state (CairoWidget::Selected);
-		break;
-
-	case Gtk::STATE_NORMAL:
-	default:
-		_button.unset_visual_state ();
-		break;
+	if (yn) {
+		_button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() | s));
+	} else {
+		_button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() & ~s));
 	}
 }
 
@@ -201,7 +191,7 @@ ProcessorEntry::set_enum_width (Width w)
 void
 ProcessorEntry::led_clicked()
 {
-	if (_button.active_state() == CairoWidget::Active) {
+	if (_button.active_state() == Gtkmm2ext::Active) {
 		_processor->deactivate ();
 	} else {
 		_processor->activate ();
@@ -212,7 +202,7 @@ void
 ProcessorEntry::processor_active_changed ()
 {
 	if (_processor->active()) {
-		_button.set_active_state (CairoWidget::Active);
+		_button.set_active_state (Gtkmm2ext::Active);
 	} else {
 		_button.unset_active_state ();
 	}
@@ -222,12 +212,19 @@ void
 ProcessorEntry::processor_property_changed (const PropertyChange& what_changed)
 {
 	if (what_changed.contains (ARDOUR::Properties::name)) {
-		_button.set_text (name ());
+		_button.set_text (name (_width));
+		setup_tooltip ();
 	}
 }
 
+void
+ProcessorEntry::setup_tooltip ()
+{
+	ARDOUR_UI::instance()->set_tip (_button, name (Wide));
+}
+
 string
-ProcessorEntry::name () const
+ProcessorEntry::name (Width w) const
 {
 	boost::shared_ptr<Send> send;
 	string name_display;
@@ -243,7 +240,7 @@ ProcessorEntry::name () const
 		lbracket = send->name().find ('[');
 		rbracket = send->name().find (']');
 
-		switch (_width) {
+		switch (w) {
 		case Wide:
 			name_display += send->name().substr (lbracket+1, lbracket-rbracket-1);
 			break;
@@ -254,7 +251,7 @@ ProcessorEntry::name () const
 
 	} else {
 
-		switch (_width) {
+		switch (w) {
 		case Wide:
 			name_display += _processor->display_name();
 			break;
@@ -463,7 +460,7 @@ PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev)
 }
 
 ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelector*()> get_plugin_selector,
-			    RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer)
+			    RouteProcessorSelection& rsel, MixerStrip* parent, bool owner_is_mixer)
 	: _parent_strip (parent)
 	, _owner_is_mixer (owner_is_mixer)
 	, ab_direction (true)
@@ -491,15 +488,11 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto
 	processor_display.signal_enter_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::enter_notify), false);
 	processor_display.signal_leave_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::leave_notify), false);
 
-	processor_display.signal_key_press_event().connect (sigc::mem_fun(*this, &ProcessorBox::processor_key_press_event));
-	processor_display.signal_key_release_event().connect (sigc::mem_fun(*this, &ProcessorBox::processor_key_release_event));
-
 	processor_display.ButtonPress.connect (sigc::mem_fun (*this, &ProcessorBox::processor_button_press_event));
 	processor_display.ButtonRelease.connect (sigc::mem_fun (*this, &ProcessorBox::processor_button_release_event));
 
 	processor_display.Reordered.connect (sigc::mem_fun (*this, &ProcessorBox::reordered));
 	processor_display.DropFromAnotherBox.connect (sigc::mem_fun (*this, &ProcessorBox::object_drop));
-	processor_display.SelectionChanged.connect (sigc::mem_fun (*this, &ProcessorBox::selection_changed));
 
 	processor_scroller.show ();
 	processor_display.show ();
@@ -662,12 +655,16 @@ ProcessorBox::show_processor_menu (int arg)
 		processor_menu->signal_unmap().connect (sigc::mem_fun (*this, &ProcessorBox::processor_menu_unmapped));
 	}
 
+	/* Sort out the plugin submenu */
+
 	Gtk::MenuItem* plugin_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/newplugin"));
 
 	if (plugin_menu_item) {
 		plugin_menu_item->set_submenu (*_get_plugin_selector()->plugin_menu());
 	}
 
+	/* And the aux submenu */
+
 	Gtk::MenuItem* aux_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/newaux"));
 
 	if (aux_menu_item) {
@@ -682,9 +679,31 @@ ProcessorBox::show_processor_menu (int arg)
 		}
 	}
 
+	/* Sensitise actions as approprioate */
+
         cut_action->set_sensitive (can_cut());
 	paste_action->set_sensitive (!_rr_selection.processors.empty());
 
+	const bool sensitive = !processor_display.selection().empty();
+	ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive);
+	edit_action->set_sensitive (one_processor_can_be_edited ());
+
+	boost::shared_ptr<Processor> single_selection;
+	if (processor_display.selection().size() == 1) {
+		single_selection = processor_display.selection().front()->processor ();
+	}
+
+	boost::shared_ptr<PluginInsert> pi;
+	if (single_selection) {
+		pi = boost::dynamic_pointer_cast<PluginInsert> (single_selection);
+	}
+
+	/* enable gui for plugin inserts with editors */
+	controls_action->set_sensitive(pi && pi->plugin()->has_editor());
+
+	/* disallow rename for multiple selections, for plugin inserts and for the fader */
+	rename_action->set_sensitive (single_selection && !pi && !boost::dynamic_pointer_cast<Amp> (single_selection));
+
 	processor_menu->popup (1, arg);
 
 	/* Add a placeholder gap to the processor list to indicate where a processor would be
@@ -699,36 +718,18 @@ bool
 ProcessorBox::enter_notify (GdkEventCrossing*)
 {
 	_current_processor_box = this;
-	Keyboard::magic_widget_grab_focus ();
-	processor_display.grab_focus ();
-
 	return false;
 }
 
 bool
 ProcessorBox::leave_notify (GdkEventCrossing* ev)
 {
-	switch (ev->detail) {
-	case GDK_NOTIFY_INFERIOR:
-		break;
-	default:
-		Keyboard::magic_widget_drop_focus ();
-	}
-
-	return false;
-}
-
-bool
-ProcessorBox::processor_key_press_event (GdkEventKey *)
-{
-	/* do real stuff on key release */
 	return false;
 }
 
-bool
-ProcessorBox::processor_key_release_event (GdkEventKey *ev)
+void
+ProcessorBox::processor_operation (ProcessorOperation op) 
 {
-	bool ret = false;
 	ProcSelection targets;
 
 	get_selected_processors (targets);
@@ -745,53 +746,32 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
 		}
 	}
 
-
-	switch (ev->keyval) {
-	case GDK_a:
-		if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-			processor_display.select_all ();
-			ret = true;
-		}
+	switch (op) {
+	case ProcessorsSelectAll:
+		processor_display.select_all ();
 		break;
 
-	case GDK_c:
-		if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-			copy_processors (targets);
-			ret = true;
-		}
+	case ProcessorsCopy:
+		copy_processors (targets);
 		break;
 
-	case GDK_x:
-		if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-			cut_processors (targets);
-			ret = true;
-		}
+	case ProcessorsCut:
+		cut_processors (targets);
 		break;
 
-	case GDK_v:
-		if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
-			if (targets.empty()) {
-				paste_processors ();
-			} else {
-				paste_processors (targets.front());
-			}
-			ret = true;
+	case ProcessorsPaste:
+		if (targets.empty()) {
+			paste_processors ();
+		} else {
+			paste_processors (targets.front());
 		}
 		break;
 
-	case GDK_Up:
-		break;
-
-	case GDK_Down:
-		break;
-
-	case GDK_Delete:
-	case GDK_BackSpace:
+	case ProcessorsDelete:
 		delete_processors (targets);
-		ret = true;
 		break;
 
-	case GDK_Return:
+	case ProcessorsToggleActive:
 		for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) {
 			if ((*i)->active()) {
 				(*i)->deactivate ();
@@ -799,26 +779,20 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
 				(*i)->activate ();
 			}
 		}
-		ret = true;
 		break;
 
-	case GDK_slash:
+	case ProcessorsAB:
 		ab_plugins ();
-		ret = true;
 		break;
 
 	default:
 		break;
 	}
-
-	return ret;
 }
 
 bool
 ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child)
 {
-	cerr << "PBPE\n";
-
 	boost::shared_ptr<Processor> processor;
 	if (child) {
 		processor = child->processor ();
@@ -893,29 +867,6 @@ ProcessorBox::build_processor_menu ()
 	return processor_menu;
 }
 
-void
-ProcessorBox::selection_changed ()
-{
-	const bool sensitive = !processor_display.selection().empty();
-	ActionManager::set_sensitive(ActionManager::plugin_selection_sensitive_actions,
-	                             sensitive);
-	edit_action->set_sensitive(one_processor_can_be_edited());
-
-	const bool single_selection = (processor_display.selection().size() == 1);
-
-	boost::shared_ptr<PluginInsert> pi;
-	if (single_selection) {
-		pi = boost::dynamic_pointer_cast<PluginInsert>(
-			processor_display.selection().front()->processor());
-	}
-
-	/* enable gui for plugin inserts with editors */
-	controls_action->set_sensitive(pi && pi->plugin()->has_editor());
-
-	/* disallow rename for multiple selections and for plugin inserts */
-	rename_action->set_sensitive(single_selection && pi);
-}
-
 void
 ProcessorBox::select_all_processors ()
 {
@@ -1389,14 +1340,6 @@ ProcessorBox::can_cut () const
         return false;
 }
 
-void
-ProcessorBox::cut_processors ()
-{
-	ProcSelection to_be_removed;
-
-	get_selected_processors (to_be_removed);
-}
-
 void
 ProcessorBox::cut_processors (const ProcSelection& to_be_removed)
 {
@@ -1438,14 +1381,6 @@ ProcessorBox::cut_processors (const ProcSelection& to_be_removed)
 	redisplay_processors ();
 }
 
-void
-ProcessorBox::copy_processors ()
-{
-	ProcSelection to_be_copied;
-	get_selected_processors (to_be_copied);
-	copy_processors (to_be_copied);
-}
-
 void
 ProcessorBox::copy_processors (const ProcSelection& to_be_copied)
 {
@@ -1468,12 +1403,17 @@ ProcessorBox::copy_processors (const ProcSelection& to_be_copied)
 }
 
 void
-ProcessorBox::delete_processors ()
+ProcessorBox::processors_up ()
+{
+	/* unimplemented */
+}
+
+void
+ProcessorBox::processors_down ()
 {
-	ProcSelection to_be_deleted;
-	get_selected_processors (to_be_deleted);
-	delete_processors (to_be_deleted);
+	/* unimplemented */
 }
+	
 
 void
 ProcessorBox::delete_processors (const ProcSelection& targets)
@@ -1726,10 +1666,9 @@ ProcessorBox::for_selected_processors (void (ProcessorBox::*method)(boost::share
 }
 
 void
-ProcessorBox::all_processors_active (bool state)
+ProcessorBox::all_visible_processors_active (bool state)
 {
-	_route->all_processors_active (PreFader, state);
-	_route->all_processors_active (PostFader, state);
+	_route->all_visible_processors_active (state);
 }
 
 void
@@ -1793,7 +1732,7 @@ ProcessorBox::processor_can_be_edited (boost::shared_ptr<Processor> processor)
 	}
 
 	if (
-		boost::dynamic_pointer_cast<Send> (processor) ||
+		(boost::dynamic_pointer_cast<Send> (processor) && !boost::dynamic_pointer_cast<InternalSend> (processor))||
 		boost::dynamic_pointer_cast<Return> (processor) ||
 		boost::dynamic_pointer_cast<PluginInsert> (processor) ||
 		boost::dynamic_pointer_cast<PortInsert> (processor)
@@ -1839,28 +1778,16 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
 			_parent_strip->revert_to_default_display ();
 		}
 
-	} else if ((internal_send = boost::dynamic_pointer_cast<InternalSend> (processor)) != 0) {
-
-		if (!_session->engine().connected()) {
-			return;
-		}
-
-		if (_parent_strip) {
-			if (boost::dynamic_pointer_cast<Send> (_parent_strip->current_delivery()) == internal_send) {
-				_parent_strip->revert_to_default_display ();
-			} else {
-				_parent_strip->show_send (internal_send);
-			}
-		}
-
 	} else if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
 
 		if (!_session->engine().connected()) {
 			return;
 		}
 
-		SendUIWindow* w = new SendUIWindow (send, _session);
-		w->show ();
+		if (boost::dynamic_pointer_cast<InternalSend> (processor) == 0) {
+			SendUIWindow* w = new SendUIWindow (send, _session);
+			w->show ();
+		}
 
 	} else if ((retrn = boost::dynamic_pointer_cast<Return> (processor)) != 0) {
 
@@ -2018,9 +1945,9 @@ ProcessorBox::register_actions ()
 
 	/* activation etc. */
 
-	ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate all"),
+	ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate All"),
 			sigc::ptr_fun (ProcessorBox::rb_activate_all));
-	ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate all"),
+	ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate All"),
 			sigc::ptr_fun (ProcessorBox::rb_deactivate_all));
 	ActionManager::register_action (popup_act_grp, X_("ab_plugins"), _("A/B Plugins"),
 			sigc::ptr_fun (ProcessorBox::rb_ab_plugins));
@@ -2124,7 +2051,7 @@ ProcessorBox::rb_cut ()
 		return;
 	}
 
-	_current_processor_box->cut_processors ();
+	_current_processor_box->processor_operation (ProcessorsCut);
 }
 
 void
@@ -2134,7 +2061,7 @@ ProcessorBox::rb_delete ()
 		return;
 	}
 
-	_current_processor_box->delete_processors ();
+	_current_processor_box->processor_operation (ProcessorsDelete);
 }
 
 void
@@ -2143,7 +2070,7 @@ ProcessorBox::rb_copy ()
 	if (_current_processor_box == 0) {
 		return;
 	}
-	_current_processor_box->copy_processors ();
+	_current_processor_box->processor_operation (ProcessorsCopy);
 }
 
 void
@@ -2153,7 +2080,7 @@ ProcessorBox::rb_paste ()
 		return;
 	}
 
-	_current_processor_box->paste_processors ();
+	_current_processor_box->processor_operation (ProcessorsPaste);
 }
 
 void
@@ -2172,7 +2099,7 @@ ProcessorBox::rb_select_all ()
 		return;
 	}
 
-	_current_processor_box->select_all_processors ();
+	_current_processor_box->processor_operation (ProcessorsSelectAll);
 }
 
 void
@@ -2192,7 +2119,7 @@ ProcessorBox::rb_activate_all ()
 		return;
 	}
 
-	_current_processor_box->all_processors_active (true);
+	_current_processor_box->all_visible_processors_active (true);
 }
 
 void
@@ -2201,7 +2128,7 @@ ProcessorBox::rb_deactivate_all ()
 	if (_current_processor_box == 0) {
 		return;
 	}
-	_current_processor_box->all_processors_active (false);
+	_current_processor_box->all_visible_processors_active (false);
 }
 
 void