fix incorrect accumulation of export video options each time the dialog is used

[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 9a7b746b8929b07dd156e79a863a84742f7d05a7..961f91b512052ab15916adb54d266591b6d450fd 100644 (file)
--- a/gtk2_ardour/patch_change_dialog.cc
+++ b/gtk2_ardour/patch_change_dialog.cc
@@ -43,7 +43,7 @@ using namespace Gtkmm2ext;
 PatchChangeDialog::PatchChangeDialog (
        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,
@@ -116,9 +116,10 @@ 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));
 
@@ -168,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,
@@ -270,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 */
@@ -345,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;
                }