* added comments to midi_region_view.h

* implemented choosing patches with context menu on the program change flag
* added convenience method and a little refactoring in midi_patch_manager.h

Conflicts:

	.cproject
	build-tmp.sh


git-svn-id: svn://localhost/ardour2/branches/3.0@4338 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 75 insertions, 2 deletions

diff --git a/gtk2_ardour/canvas-program-change.cc b/gtk2_ardour/canvas-program-change.cc
index 8c24ce95e3..24f13f2605 100644
--- a/gtk2_ardour/canvas-program-change.cc
+++ b/gtk2_ardour/canvas-program-change.cc
@@ -1,9 +1,12 @@
-#include "canvas-program-change.h"
 #include <iostream>
+
+#include "ardour/midi_patch_manager.h"
 #include "ardour_ui.h"
 #include "midi_region_view.h"
+#include "canvas-program-change.h"
 
 using namespace Gnome::Canvas;
+using namespace MIDI::Name;
 using namespace std;
 
 CanvasProgramChange::CanvasProgramChange(
@@ -12,7 +15,13 @@ CanvasProgramChange::CanvasProgramChange(
 		string&                               text,
 		double                                height,
 		double                                x,
-		double                                y)
+		double                                y,
+		string&                               model_name,
+		string&                               custom_device_mode,
+		nframes_t                             event_time,
+		uint8_t                               channel,
+		uint8_t                               program
+		)
 	: CanvasFlag(
 			region, 
 			parent, 
@@ -22,18 +31,80 @@ CanvasProgramChange::CanvasProgramChange(
 			x,
 			y
 		)
+	 , _model_name(model_name)
+	 , _custom_device_mode(custom_device_mode)
+	 , _event_time(event_time)
+	 , _channel(channel)
+	 , _program(program)
 {
 	set_text(text);
+	initialize_popup_menus();
 }
 
 CanvasProgramChange::~CanvasProgramChange()
 {
 }
 
+void 
+CanvasProgramChange::initialize_popup_menus()
+{
+	boost::shared_ptr<ChannelNameSet> channel_name_set = 
+		MidiPatchManager::instance()
+			.find_channel_name_set(_model_name, _custom_device_mode, _channel);
+
+	if (!channel_name_set) {
+		return;
+	}
+	
+	const ChannelNameSet::PatchBanks& patch_banks = channel_name_set->patch_banks();
+	
+	// fill popup menu:
+	Gtk::Menu::MenuList& patch_bank_menus = _popup.items();
+	
+	for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin();
+	     bank != patch_banks.end();
+	     ++bank) {
+		Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu());
+		
+		const PatchBank::PatchNameList& patches = (*bank)->patch_name_list();
+		Gtk::Menu::MenuList& patch_menus = patch_bank_menu.items();
+		
+		for (PatchBank::PatchNameList::const_iterator patch = patches.begin();
+		     patch != patches.end();
+		     ++patch) {
+			patch_menus.push_back(
+				Gtk::Menu_Helpers::MenuElem(
+					(*patch)->name(), 
+					sigc::bind(
+						sigc::mem_fun(*this, &CanvasProgramChange::on_patch_menu_selected), 
+						(*patch)->patch_primary_key())) );		
+		}
+		
+		patch_bank_menus.push_back( 
+			Gtk::Menu_Helpers::MenuElem(
+				(*bank)->name(), 
+				patch_bank_menu) );		
+	}
+}
+
+void 
+CanvasProgramChange::on_patch_menu_selected(const PatchPrimaryKey& key)
+{
+	cerr << " got patch program number " << key.program_number << endl;
+	_region.program_selected(*this, key);
+}
+
 bool
 CanvasProgramChange::on_event(GdkEvent* ev)
 {
 	switch (ev->type) {
+	case GDK_BUTTON_PRESS:
+		if (ev->button.button == 3) {
+		    _popup.popup(ev->button.button, ev->button.time);
+			return true;
+		}
+		break;
+		
 	case GDK_SCROLL:
 		if (ev->scroll.direction == GDK_SCROLL_UP) {
 			_region.previous_program(*this);
@@ -42,6 +113,8 @@ CanvasProgramChange::on_event(GdkEvent* ev)
 			_region.next_program(*this);
 			return true;
 		} 
+		break;
+		
 	default:
 		break;
 	}