#include "gtkmm2ext/utils.h"
-#include "ardour/midi_patch_manager.h"
+#include "midi++/midnam_patch.h"
+
#include "ardour/beats_frames_converter.h"
#include "ardour/instrument_info.h"
/** @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)
add_button (Stock::CANCEL, RESPONSE_CANCEL);
add_button (ok, RESPONSE_ACCEPT);
if (allow_delete) {
- add_button (Stock::DELETE, RESPONSE_REJECT);
+ add_button (Gtk::StockID(GTK_STOCK_DELETE), RESPONSE_REJECT);
}
set_default_response (RESPONSE_ACCEPT);
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,
void
PatchChangeDialog::fill_bank_combo ()
{
+ _bank_combo.clear ();
+
boost::shared_ptr<MIDI::Name::ChannelNameSet> cns = _info.get_patches (_channel.get_value_as_int() - 1);
if (!cns) {
return;
}
- const MIDI::Name::PatchBank::PatchNameList& patches = _current_patch_bank->patch_name_list ();
- for (MIDI::Name::PatchBank::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
+ 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, "_", " ");
_patch_combo.append_text (n);
return;
}
- const MIDI::Name::PatchBank::PatchNameList& patches = _current_patch_bank->patch_name_list ();
- for (MIDI::Name::PatchBank::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
+ 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;
return;
}
- const MIDI::Name::PatchBank::PatchNameList& patches = _current_patch_bank->patch_name_list ();
+ const MIDI::Name::PatchNameList& patches = _current_patch_bank->patch_name_list ();
- for (MIDI::Name::PatchBank::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
+ for (MIDI::Name::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
string n = (*j)->name ();
boost::replace_all (n, "_", " ");