X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpatch_change.cc;h=530f903bad520c6266101ee143f06f087ec828d2;hb=56ca52651e910496084b992486ac7b8e3bbc88cf;hp=df824f43427ccdf5cd5de3bf80170631d5c7a6ea;hpb=36c233fe6ce570ce85224626ce7aba4a2607537f;p=ardour.git

diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc
index df824f4342..530f903bad 100644
--- a/gtk2_ardour/patch_change.cc
+++ b/gtk2_ardour/patch_change.cc
@@ -24,7 +24,12 @@
 #include <glibmm/regex.h>
 
 #include "gtkmm2ext/keyboard.h"
-#include "ardour/midi_patch_manager.h"
+#include "gtkmm2ext/utils.h"
+
+#include "midi++/midnam_patch.h"
+
+#include "canvas/debug.h"
+
 #include "ardour_ui.h"
 #include "midi_region_view.h"
 #include "patch_change.h"
@@ -38,7 +43,7 @@ using namespace std;
  */
 PatchChange::PatchChange(
 		MidiRegionView& region,
-		ArdourCanvas::Group* parent,
+		ArdourCanvas::Container* parent,
 		const string&   text,
 		double          height,
 		double          x,
@@ -53,17 +58,21 @@ PatchChange::PatchChange(
 	_flag = new ArdourCanvas::Flag (
 		parent,
 		height,
-		ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeOutline(),
-		ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeFill(),
+		ARDOUR_UI::config()->color ("midi patch change outline"),
+		ARDOUR_UI::config()->color ("midi patch change fill"),
 		ArdourCanvas::Duple (x, y)
 		);
 	
+	CANVAS_DEBUG_NAME (_flag, text);
+
 	_flag->Event.connect (sigc::mem_fun (*this, &PatchChange::event_handler));
+	_flag->set_font_description (ARDOUR_UI::config()->get_SmallFont());
 	_flag->set_text(text);
 }
 
 PatchChange::~PatchChange()
 {
+	delete _flag;
 }
 
 void
@@ -147,12 +156,17 @@ PatchChange::on_patch_menu_selected(const PatchPrimaryKey& key)
 bool
 PatchChange::event_handler (GdkEvent* ev)
 {
+	/* XXX: icky dcast */
+	Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
+
+	if (!e->internal_editing()) {
+		// not in internal edit mode, so no patch change editing
+		return false;
+	}
+
 	switch (ev->type) {
 	case GDK_BUTTON_PRESS:
-	{
-		/* XXX: icky dcast */
-		Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
-		if (e->current_mouse_mode() == Editing::MouseObject && e->internal_editing()) {
+		if (e->current_mouse_mode() == Editing::MouseObject) {
 
 			if (Gtkmm2ext::Keyboard::is_delete_event (&ev->button)) {
 
@@ -179,7 +193,6 @@ PatchChange::event_handler (GdkEvent* ev)
 			return true;
 		}
 		break;
-	}
 
 	case GDK_KEY_PRESS:
 		switch (ev->key.keyval) {