use syntactic sugar

[ardour.git] / gtk2_ardour / patch_change_dialog.cc

diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc
index 780323b9bbffaab60a852bcb981117f2230eff4f..961f91b512052ab15916adb54d266591b6d450fd 100644 (file)
--- a/gtk2_ardour/patch_change_dialog.cc
+++ b/gtk2_ardour/patch_change_dialog.cc
@@ -27,7 +27,7 @@
 
 #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"
@@ -41,13 +41,14 @@ 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<Evoral::Beats> const & patch,
+       Evoral::PatchChange<Temporal::Beats> 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)
@@ -56,6 +57,7 @@ PatchChangeDialog::PatchChangeDialog (
        , _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;
@@ -114,15 +116,18 @@ PatchChangeDialog::PatchChangeDialog (
        t->attach (_bank_lsb, 1, 2, r, r + 1);
        ++r;
 
+       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);
@@ -139,6 +144,16 @@ PatchChangeDialog::PatchChangeDialog (
        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
 {
@@ -154,16 +169,16 @@ PatchChangeDialog::instrument_info_changed ()
        fill_patch_combo ();
 }
 
-Evoral::PatchChange<Evoral::Beats>
+Evoral::PatchChange<Temporal::Beats>
 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<Evoral::Beats> (
+       return Evoral::PatchChange<Temporal::Beats> (
                t,
                _channel.get_value_as_int() - 1,
                _program.get_value_as_int() - 1,
@@ -256,10 +271,12 @@ PatchChangeDialog::bank_combo_changed ()
        fill_patch_combo ();
        set_active_patch_combo ();
 
-       _ignore_signals = true;
-       _bank_msb.set_value (_current_patch_bank->number() >> 7);
-       _bank_lsb.set_value (_current_patch_bank->number() & 127);
-       _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 */
@@ -331,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;
                }