X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpatch_change_dialog.cc;h=961f91b512052ab15916adb54d266591b6d450fd;hb=df28a71252f4593c65ec03611586dfc8a62a834f;hp=05cbaab459a7c14bd4f3b46be763a7da5f0b86e3;hpb=2a251b457069ffb4b744fbd0dd7aca7acb31f381;p=ardour.git diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc index 05cbaab459..961f91b512 100644 --- a/gtk2_ardour/patch_change_dialog.cc +++ b/gtk2_ardour/patch_change_dialog.cc @@ -27,13 +27,13 @@ #include "midi++/midnam_patch.h" -#include "ardour/beats_frames_converter.h" +#include "ardour/beats_samples_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; @@ -41,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, + const ARDOUR::BeatsSamplesConverter* tc, ARDOUR::Session* session, - Evoral::PatchChange const & patch, + Evoral::PatchChange const & patch, ARDOUR::InstrumentInfo& info, const Gtk::BuiltinStockID& ok, - bool allow_delete) - : ArdourDialog (_("Patch Change"), true) + 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; @@ -62,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); @@ -84,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"))); @@ -103,17 +106,28 @@ 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)); + assert (patch.bank() != UINT16_MAX); + + _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); @@ -124,12 +138,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 () { @@ -139,20 +169,20 @@ PatchChangeDialog::instrument_info_changed () fill_patch_combo (); } -Evoral::PatchChange +Evoral::PatchChange PatchChangeDialog::patch () const { - Evoral::Beats t = Evoral::Beats(); + Temporal::Beats t = Temporal::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 () ); } @@ -180,7 +210,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) { @@ -192,7 +222,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); @@ -215,7 +245,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); @@ -241,9 +271,12 @@ PatchChangeDialog::bank_combo_changed () fill_patch_combo (); set_active_patch_combo (); - _ignore_signals = true; - _bank.set_value (_current_patch_bank->number() + 1); - _ignore_signals = false; + if (_current_patch_bank->number() != UINT16_MAX) { + _ignore_signals = true; + _bank_msb.set_value (_current_patch_bank->number() >> 7); + _bank_lsb.set_value (_current_patch_bank->number() & 127); + _ignore_signals = false; + } } /** Fill the contents of the patch combo */ @@ -278,7 +311,7 @@ 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 (); @@ -296,7 +329,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 @@ -315,6 +348,8 @@ PatchChangeDialog::patch_combo_changed () if (n == _patch_combo.get_active_text ()) { _ignore_signals = true; _program.set_value ((*j)->program_number() + 1); + _bank_msb.set_value ((*j)->bank_number() >> 7); + _bank_lsb.set_value ((*j)->bank_number() & 127); _ignore_signals = false; break; }