X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpatch_change.cc;h=ebad5518cf5b29a212076dae1339577879b9781b;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=6be40811bfa99ea2f1526bf2c726ace70575dfd9;hpb=86343b6c15a3a43f082802484d2bc813d34db821;p=ardour.git

diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc
index 6be40811bf..ebad5518cf 100644
--- a/gtk2_ardour/patch_change.cc
+++ b/gtk2_ardour/patch_change.cc
@@ -26,30 +26,30 @@
 #include "gtkmm2ext/keyboard.h"
 #include "gtkmm2ext/utils.h"
 
-#include "ardour/midi_patch_manager.h"
+#include "midi++/midnam_patch.h"
 
 #include "canvas/debug.h"
 
 #include "ardour_ui.h"
-#include "midi_region_view.h"
-#include "patch_change.h"
 #include "editor.h"
 #include "editor_drag.h"
+#include "midi_region_view.h"
+#include "patch_change.h"
 
 using namespace MIDI::Name;
 using namespace std;
+using Gtkmm2ext::Keyboard;
 
 /** @param x x position in pixels.
  */
-PatchChange::PatchChange(
-		MidiRegionView& region,
-		ArdourCanvas::Group* parent,
-		const string&   text,
-		double          height,
-		double          x,
-		double          y,
-		ARDOUR::InstrumentInfo& info,
-		ARDOUR::MidiModel::PatchChangePtr patch)
+PatchChange::PatchChange(MidiRegionView&                   region,
+                         ArdourCanvas::Container*          parent,
+                         const string&                     text,
+                         double                            height,
+                         double                            x,
+                         double                            y,
+                         ARDOUR::InstrumentInfo&           info,
+                         ARDOUR::MidiModel::PatchChangePtr patch)
 	: _region (region)
 	, _info (info)
 	, _patch (patch)
@@ -58,14 +58,14 @@ PatchChange::PatchChange(
 	_flag = new ArdourCanvas::Flag (
 		parent,
 		height,
-		ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeOutline(),
-		ARDOUR_UI::config()->get_canvasvar_MidiPatchChangeFill(),
-		ArdourCanvas::Duple (x, y)
-		);
+		ARDOUR_UI::config()->color ("midi patch change outline"),
+		ARDOUR_UI::config()->color_mod ("midi patch change fill", "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);
 }
 
@@ -157,10 +157,14 @@ PatchChange::event_handler (GdkEvent* ev)
 {
 	/* XXX: icky dcast */
 	Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
+	
+	if (!e->internal_editing()) {
+		return false;
+	}
 
 	switch (ev->type) {
 	case GDK_BUTTON_PRESS:
-		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)) {
 
@@ -193,13 +197,15 @@ PatchChange::event_handler (GdkEvent* ev)
 		case GDK_Up:
 		case GDK_KP_Up:
 		case GDK_uparrow:
-			_region.previous_patch (*this);
-			break;
+			_region.step_patch(
+				*this, Keyboard::modifier_state_contains(ev->key.state, Keyboard::TertiaryModifier), 1);
+			return true;
 		case GDK_Down:
 		case GDK_KP_Down:
 		case GDK_downarrow:
-			_region.next_patch (*this);
-			break;
+			_region.step_patch(
+				*this, Keyboard::modifier_state_contains(ev->key.state, Keyboard::TertiaryModifier), -1);
+			return true;
 		default:
 			break;
 		}
@@ -207,10 +213,12 @@ PatchChange::event_handler (GdkEvent* ev)
 
 	case GDK_SCROLL:
 		if (ev->scroll.direction == GDK_SCROLL_UP) {
-			_region.previous_patch (*this);
+			_region.step_patch(
+				*this, Keyboard::modifier_state_contains(ev->scroll.state, Keyboard::TertiaryModifier), 1);
 			return true;
 		} else if (ev->scroll.direction == GDK_SCROLL_DOWN) {
-			_region.next_patch (*this);
+			_region.step_patch(
+				*this, Keyboard::modifier_state_contains(ev->scroll.state, Keyboard::TertiaryModifier), -1);
 			return true;
 		}
 		break;