X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpatch_change_dialog.cc;h=9bb339fdd43f2a0e0d01869333c2aedc6c34734a;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=a9ad5c78396dfd633f779c69747c6bf51c4d0466;hpb=2010c0489fb1e482d54c008f6c58fc64e6c406cf;p=ardour.git diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc index a9ad5c7839..9bb339fdd4 100644 --- a/gtk2_ardour/patch_change_dialog.cc +++ b/gtk2_ardour/patch_change_dialog.cc @@ -20,28 +20,36 @@ #include #include + #include -#include "ardour/midi_patch_manager.h" + +#include "gtkmm2ext/utils.h" + +#include "midi++/midnam_patch.h" + #include "ardour/beats_frames_converter.h" +#include "ardour/instrument_info.h" + #include "patch_change_dialog.h" -#include "i18n.h" +#include "gui_thread.h" + +#include "pbd/i18n.h" using namespace std; using namespace Gtk; +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 const & patch, - string const & model_name, - string const & custom_device_node, - const Gtk::BuiltinStockID& ok - ) + const ARDOUR::BeatsFramesConverter* tc, + ARDOUR::Session* session, + Evoral::PatchChange const & patch, + ARDOUR::InstrumentInfo& info, + const Gtk::BuiltinStockID& ok, + bool allow_delete) : ArdourDialog (_("Patch Change"), true) , _time_converter (tc) - , _model_name (model_name) - , _custom_device_mode (custom_device_node) + , _info (info) , _time (X_("patchchangetime"), true, "", true, false) , _channel (*manage (new Adjustment (1, 1, 16, 1, 4))) , _program (*manage (new Adjustment (1, 1, 128, 1, 16))) @@ -54,9 +62,8 @@ PatchChangeDialog::PatchChangeDialog ( int r = 0; if (_time_converter) { - - l = manage (new Label (_("Time"))); - l->set_alignment (0, 0.5); + + l = manage (left_aligned_label (_("Time"))); t->attach (*l, 0, 1, r, r + 1); t->attach (_time, 1, 2, r, r + 1); ++r; @@ -66,24 +73,21 @@ PatchChangeDialog::PatchChangeDialog ( _time.set (_time_converter->to (patch.time ()), true); } - l = manage (new Label (_("Patch Bank"))); - l->set_alignment (0, 0.5); + l = manage (left_aligned_label (_("Patch Bank"))); t->attach (*l, 0, 1, r, r + 1); t->attach (_bank_combo, 1, 2, r, r + 1); ++r; _bank_combo.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::bank_combo_changed)); - l = manage (new Label (_("Patch"))); - l->set_alignment (0, 0.5); + l = manage (left_aligned_label (_("Patch"))); 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 (new Label (_("Channel"))); - l->set_alignment (0, 0.5); + l = manage (left_aligned_label (_("Channel"))); t->attach (*l, 0, 1, r, r + 1); t->attach (_channel, 1, 2, r, r + 1); ++r; @@ -91,8 +95,7 @@ PatchChangeDialog::PatchChangeDialog ( _channel.set_value (patch.channel() + 1); _channel.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::channel_changed)); - l = manage (new Label (_("Program"))); - l->set_alignment (0, 0.5); + l = manage (left_aligned_label (_("Program"))); t->attach (*l, 0, 1, r, r + 1); t->attach (_program, 1, 2, r, r + 1); ++r; @@ -100,8 +103,7 @@ PatchChangeDialog::PatchChangeDialog ( _program.set_value (patch.program () + 1); _program.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::program_changed)); - l = manage (new Label (_("Bank"))); - l->set_alignment (0, 0.5); + l = manage (left_aligned_label (_("Bank"))); t->attach (*l, 0, 1, r, r + 1); t->attach (_bank, 1, 2, r, r + 1); ++r; @@ -113,25 +115,40 @@ PatchChangeDialog::PatchChangeDialog ( add_button (Stock::CANCEL, RESPONSE_CANCEL); add_button (ok, RESPONSE_ACCEPT); + if (allow_delete) { + add_button (Gtk::StockID(GTK_STOCK_DELETE), RESPONSE_REJECT); + } set_default_response (RESPONSE_ACCEPT); fill_bank_combo (); set_active_bank_combo (); bank_combo_changed (); + _info.Changed.connect (_info_changed_connection, invalidator (*this), + boost::bind (&PatchChangeDialog::instrument_info_changed, this), gui_context()); + show_all (); } -Evoral::PatchChange +void +PatchChangeDialog::instrument_info_changed () +{ + _bank_combo.clear (); + _patch_combo.clear (); + fill_bank_combo (); + fill_patch_combo (); +} + +Evoral::PatchChange 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 ( + return Evoral::PatchChange ( t, _channel.get_value_as_int() - 1, _program.get_value_as_int() - 1, @@ -143,15 +160,18 @@ PatchChangeDialog::patch () const void PatchChangeDialog::fill_bank_combo () { - MIDI::Name::ChannelNameSet::PatchBanks const * banks = get_banks (); - if (banks == 0) { + _bank_combo.clear (); + + boost::shared_ptr cns = _info.get_patches (_channel.get_value_as_int() - 1); + + if (!cns) { return; } - for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = banks->begin(); i != banks->end(); ++i) { + for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = cns->patch_banks().begin(); i != cns->patch_banks().end(); ++i) { string n = (*i)->name (); boost::replace_all (n, "_", " "); - _bank_combo.append (n); + _bank_combo.append_text (n); } } @@ -160,18 +180,19 @@ void PatchChangeDialog::set_active_bank_combo () { _current_patch_bank.reset (); - - MIDI::Name::ChannelNameSet::PatchBanks const * banks = get_banks (); - if (banks == 0) { + + boost::shared_ptr cns = _info.get_patches (_channel.get_value_as_int() - 1); + + if (!cns) { return; } - for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = banks->begin(); i != banks->end(); ++i) { + for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = cns->patch_banks().begin(); i != cns->patch_banks().end(); ++i) { + string n = (*i)->name (); boost::replace_all (n, "_", " "); - MIDI::Name::PatchPrimaryKey const * key = (*i)->patch_primary_key (); - if (((key->msb << 7) | key->lsb) == _bank.get_value () - 1) { + if ((*i)->number() == _bank.get_value () - 1) { _current_patch_bank = *i; _ignore_signals = true; _bank_combo.set_active_text (n); @@ -194,15 +215,16 @@ PatchChangeDialog::bank_combo_changed () if (_ignore_signals) { return; } - + _current_patch_bank.reset (); - MIDI::Name::ChannelNameSet::PatchBanks const * banks = get_banks (); - if (banks == 0) { + boost::shared_ptr cns = _info.get_patches (_channel.get_value_as_int() - 1); + + if (!cns) { return; } - for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = banks->begin(); i != banks->end(); ++i) { + for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = cns->patch_banks().begin(); i != cns->patch_banks().end(); ++i) { string n = (*i)->name (); boost::replace_all (n, "_", " "); if (n == _bank_combo.get_active_text()) { @@ -210,14 +232,17 @@ PatchChangeDialog::bank_combo_changed () } } + if (_current_patch_bank == 0) { + return; + } + /* Reflect */ fill_patch_combo (); set_active_patch_combo (); - MIDI::Name::PatchPrimaryKey const * key = _current_patch_bank->patch_primary_key (); _ignore_signals = true; - _bank.set_value (((key->msb << 7) | key->lsb) + 1); + _bank.set_value (_current_patch_bank->number() + 1); _ignore_signals = false; } @@ -231,11 +256,11 @@ PatchChangeDialog::fill_patch_combo () 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 (n); + _patch_combo.append_text (n); } } @@ -253,14 +278,14 @@ PatchChangeDialog::set_active_patch_combo () _ignore_signals = false; 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; @@ -271,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 @@ -281,15 +306,17 @@ PatchChangeDialog::patch_combo_changed () 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, "_", " "); + if (n == _patch_combo.get_active_text ()) { - MIDI::Name::PatchPrimaryKey const & key = (*j)->patch_primary_key (); _ignore_signals = true; - _program.set_value (key.program_number + 1); + _program.set_value ((*j)->program_number() + 1); _ignore_signals = false; + break; } } } @@ -325,17 +352,3 @@ PatchChangeDialog::bank_changed () set_active_patch_combo (); } -MIDI::Name::ChannelNameSet::PatchBanks const * -PatchChangeDialog::get_banks () -{ - MIDI::Name::MidiPatchManager& mpm = MIDI::Name::MidiPatchManager::instance (); - boost::shared_ptr channel_name_set = mpm.find_channel_name_set ( - _model_name, _custom_device_mode, _channel.get_value_as_int() - 1 - ); - - if (!channel_name_set) { - return 0; - } - - return &channel_name_set->patch_banks (); -}