X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpatch_change_dialog.cc;h=9bb339fdd43f2a0e0d01869333c2aedc6c34734a;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=081604344cb971430eb4fe4acbde78b200bdd63c;hpb=08371ae2cf6231bbb8522645d14add41ffa9c1c0;p=ardour.git

diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc
index 081604344c..9bb339fdd4 100644
--- a/gtk2_ardour/patch_change_dialog.cc
+++ b/gtk2_ardour/patch_change_dialog.cc
@@ -27,14 +27,13 @@
 
 #include "midi++/midnam_patch.h"
 
-#include "ardour/midi_patch_manager.h"
 #include "ardour/beats_frames_converter.h"
 #include "ardour/instrument_info.h"
 
 #include "patch_change_dialog.h"
 #include "gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -42,12 +41,12 @@ using namespace Gtkmm2ext;
 
 /** @param tc If non-0, a time converter for this patch change.  If 0, time control will be desensitized */
 PatchChangeDialog::PatchChangeDialog (
-	const ARDOUR::BeatsFramesConverter*              tc,
-	ARDOUR::Session*                                 session,
-	Evoral::PatchChange<Evoral::MusicalTime> const & patch,
-	ARDOUR::InstrumentInfo&                          info,
-	const Gtk::BuiltinStockID&                       ok,
-	bool                                             allow_delete)
+	const ARDOUR::BeatsFramesConverter*        tc,
+	ARDOUR::Session*                           session,
+	Evoral::PatchChange<Evoral::Beats> const & patch,
+	ARDOUR::InstrumentInfo&                    info,
+	const Gtk::BuiltinStockID&                 ok,
+	bool                                       allow_delete)
 	: ArdourDialog (_("Patch Change"), true)
 	, _time_converter (tc)
 	, _info (info)
@@ -63,7 +62,7 @@ PatchChangeDialog::PatchChangeDialog (
 	int r = 0;
 
 	if (_time_converter) {
-		
+
 		l = manage (left_aligned_label (_("Time")));
 		t->attach (*l, 0, 1, r, r + 1);
 		t->attach (_time, 1, 2, r, r + 1);
@@ -85,7 +84,7 @@ PatchChangeDialog::PatchChangeDialog (
 	t->attach (*l, 0, 1, r, r + 1);
 	t->attach (_patch_combo, 1, 2, r, r + 1);
 	++r;
-	
+
 	_patch_combo.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::patch_combo_changed));
 
 	l = manage (left_aligned_label (_("Channel")));
@@ -125,7 +124,7 @@ PatchChangeDialog::PatchChangeDialog (
 	set_active_bank_combo ();
 	bank_combo_changed ();
 
-	_info.Changed.connect (_info_changed_connection, invalidator (*this), 
+	_info.Changed.connect (_info_changed_connection, invalidator (*this),
 			       boost::bind (&PatchChangeDialog::instrument_info_changed, this), gui_context());
 
 	show_all ();
@@ -140,16 +139,16 @@ PatchChangeDialog::instrument_info_changed ()
 	fill_patch_combo ();
 }
 
-Evoral::PatchChange<Evoral::MusicalTime>
+Evoral::PatchChange<Evoral::Beats>
 PatchChangeDialog::patch () const
 {
-	Evoral::MusicalTime t = 0;
+	Evoral::Beats t = Evoral::Beats();
 
 	if (_time_converter) {
 		t = _time_converter->from (_time.current_time ());
 	}
 
-	return Evoral::PatchChange<Evoral::MusicalTime> (
+	return Evoral::PatchChange<Evoral::Beats> (
 		t,
 		_channel.get_value_as_int() - 1,
 		_program.get_value_as_int() - 1,
@@ -181,7 +180,7 @@ void
 PatchChangeDialog::set_active_bank_combo ()
 {
 	_current_patch_bank.reset ();
-	
+
 	boost::shared_ptr<MIDI::Name::ChannelNameSet> cns = _info.get_patches (_channel.get_value_as_int() - 1);
 
 	if (!cns) {
@@ -216,7 +215,7 @@ PatchChangeDialog::bank_combo_changed ()
 	if (_ignore_signals) {
 		return;
 	}
-	
+
 	_current_patch_bank.reset ();
 
 	boost::shared_ptr<MIDI::Name::ChannelNameSet> cns = _info.get_patches (_channel.get_value_as_int() - 1);
@@ -279,14 +278,14 @@ PatchChangeDialog::set_active_patch_combo ()
 		_ignore_signals = false;
 		return;
 	}
-	
+
 	const MIDI::Name::PatchNameList& patches = _current_patch_bank->patch_name_list ();
 	for (MIDI::Name::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
 		string n = (*j)->name ();
 		boost::replace_all (n, "_", " ");
 
 		MIDI::Name::PatchPrimaryKey const & key = (*j)->patch_primary_key ();
-		if (key.program_number == _program.get_value() - 1) {
+		if (key.program() == _program.get_value() - 1) {
 			_ignore_signals = true;
 			_patch_combo.set_active_text (n);
 			_ignore_signals = false;
@@ -297,7 +296,7 @@ PatchChangeDialog::set_active_patch_combo ()
 	_ignore_signals = true;
 	_patch_combo.set_active (-1);
 	_ignore_signals = false;
-}	
+}
 
 /** Set _program from the current state of _patch_combo */
 void