Fix session-open after selecting new, template, then back

[ardour.git] / gtk2_ardour / patch_change_dialog.h

diff --git a/gtk2_ardour/patch_change_dialog.h b/gtk2_ardour/patch_change_dialog.h
index 02eb311d484f529304d2afd97e25b1fed259a2af..65b107c8a517d9519d0daa54d8f242cb9a37ed81 100644 (file)
--- a/gtk2_ardour/patch_change_dialog.h
+++ b/gtk2_ardour/patch_change_dialog.h
@@ -19,6 +19,8 @@
 */
 
 #include <gtkmm/spinbutton.h>
+#include <gtkmm/comboboxtext.h>
+
 #include "evoral/PatchChange.hpp"
 #include "ardour_dialog.h"
 #include "audio_clock.h"
@@ -26,6 +28,13 @@
 namespace ARDOUR {
        class BeatsFramesConverter;
        class Session;
+       class InstrumentInfo;
+}
+
+namespace MIDI {
+       namespace Name {
+               class PatchBank;
+       }
 }
 
 class PatchChangeDialog : public ArdourDialog
@@ -34,16 +43,40 @@ public:
        PatchChangeDialog (
                const ARDOUR::BeatsFramesConverter *,
                ARDOUR::Session *,
-               Evoral::PatchChange<Evoral::MusicalTime> const &,
-               const Gtk::BuiltinStockID &
+               Evoral::PatchChange<Evoral::Beats> const &,
+               ARDOUR::InstrumentInfo&,
+               const Gtk::BuiltinStockID &,
+               bool allow_delete = false
                );
 
-       Evoral::PatchChange<Evoral::MusicalTime> patch () const;
+       Evoral::PatchChange<Evoral::Beats> patch () const;
 
 private:
+       void fill_bank_combo ();
+       void set_active_bank_combo ();
+       void fill_patch_combo ();
+       void set_active_patch_combo ();
+       void bank_combo_changed ();
+       void patch_combo_changed ();
+       void channel_changed ();
+       void bank_changed ();
+       void program_changed ();
+
+       int get_14bit_bank () const;
+
        const ARDOUR::BeatsFramesConverter* _time_converter;
+       ARDOUR::InstrumentInfo& _info;
        AudioClock _time;
        Gtk::SpinButton _channel;
        Gtk::SpinButton _program;
-       Gtk::SpinButton _bank;
+       Gtk::SpinButton _bank_msb;
+       Gtk::SpinButton _bank_lsb;
+       Gtk::ComboBoxText _bank_combo;
+       Gtk::ComboBoxText _patch_combo;
+
+       boost::shared_ptr<MIDI::Name::PatchBank> _current_patch_bank;
+       bool _ignore_signals;
+
+       void instrument_info_changed ();
+       PBD::ScopedConnection _info_changed_connection;
 };