X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpatch_change_dialog.cc;h=32a102af1f692ebf86eac4103cf7e9f1ef583654;hb=4bfc5ddf71728c1f14a3fbff5dab4986fbabe15c;hp=081604344cb971430eb4fe4acbde78b200bdd63c;hpb=8f930477be9e2c88859a8ea30b213fba3f7fc443;p=ardour.git diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc index 081604344c..32a102af1f 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,20 +41,23 @@ 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, - ARDOUR::InstrumentInfo& info, - const Gtk::BuiltinStockID& ok, - bool allow_delete) - : ArdourDialog (_("Patch Change"), true) + const ARDOUR::BeatsFramesConverter* tc, + ARDOUR::Session* session, + Evoral::PatchChange const & patch, + ARDOUR::InstrumentInfo& info, + const Gtk::BuiltinStockID& ok, + bool allow_delete, + bool modal) + : ArdourDialog (_("Patch Change"), modal) , _time_converter (tc) , _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))) - , _bank (*manage (new Adjustment (1, 1, 16384, 1, 64))) + , _bank_msb (*manage (new Adjustment (0, 0, 127, 1, 16))) + , _bank_lsb (*manage (new Adjustment (0, 0, 127, 1, 16))) , _ignore_signals (false) + , _keep_open (!modal) { Table* t = manage (new Table (4, 2)); Label* l; @@ -63,7 +65,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 +87,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"))); @@ -104,17 +106,27 @@ PatchChangeDialog::PatchChangeDialog ( _program.set_value (patch.program () + 1); _program.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::program_changed)); - l = manage (left_aligned_label (_("Bank"))); + l = manage (left_aligned_label (_("Bank MSB"))); + t->attach (*l, 0, 1, r, r + 1); + t->attach (_bank_msb, 1, 2, r, r + 1); + ++r; + + l = manage (left_aligned_label (_("Bank LSB"))); t->attach (*l, 0, 1, r, r + 1); - t->attach (_bank, 1, 2, r, r + 1); + t->attach (_bank_lsb, 1, 2, r, r + 1); ++r; - _bank.set_value (patch.bank() + 1); - _bank.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::bank_changed)); + _bank_msb.set_value ((patch.bank() >> 7)); + _bank_msb.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::bank_changed)); + + _bank_lsb.set_value ((patch.bank() & 127)); + _bank_lsb.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::bank_changed)); get_vbox()->add (*t); - add_button (Stock::CANCEL, RESPONSE_CANCEL); + if (modal) { + add_button (Stock::CANCEL, RESPONSE_CANCEL); + } add_button (ok, RESPONSE_ACCEPT); if (allow_delete) { add_button (Gtk::StockID(GTK_STOCK_DELETE), RESPONSE_REJECT); @@ -125,12 +137,28 @@ 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 (); } +void +PatchChangeDialog::on_response (int response_id) +{ + if (_keep_open) { + Gtk::Dialog::on_response (response_id); + } else { + ArdourDialog::on_response (response_id); + } +} + +int +PatchChangeDialog::get_14bit_bank () const +{ + return (_bank_msb.get_value_as_int() << 7) + _bank_lsb.get_value_as_int(); +} + void PatchChangeDialog::instrument_info_changed () { @@ -140,20 +168,20 @@ PatchChangeDialog::instrument_info_changed () fill_patch_combo (); } -Evoral::PatchChange +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, - _bank.get_value_as_int() - 1 + get_14bit_bank () ); } @@ -181,7 +209,7 @@ void PatchChangeDialog::set_active_bank_combo () { _current_patch_bank.reset (); - + boost::shared_ptr cns = _info.get_patches (_channel.get_value_as_int() - 1); if (!cns) { @@ -193,7 +221,7 @@ PatchChangeDialog::set_active_bank_combo () string n = (*i)->name (); boost::replace_all (n, "_", " "); - if ((*i)->number() == _bank.get_value () - 1) { + if ((*i)->number() == get_14bit_bank()) { _current_patch_bank = *i; _ignore_signals = true; _bank_combo.set_active_text (n); @@ -216,7 +244,7 @@ PatchChangeDialog::bank_combo_changed () if (_ignore_signals) { return; } - + _current_patch_bank.reset (); boost::shared_ptr cns = _info.get_patches (_channel.get_value_as_int() - 1); @@ -243,7 +271,8 @@ PatchChangeDialog::bank_combo_changed () set_active_patch_combo (); _ignore_signals = true; - _bank.set_value (_current_patch_bank->number() + 1); + _bank_msb.set_value (_current_patch_bank->number() >> 7); + _bank_lsb.set_value (_current_patch_bank->number() & 127); _ignore_signals = false; } @@ -279,14 +308,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 +326,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