MCP: Fix up the feedback for the bank left/right buttons.

[ardour.git] / libs / surfaces / mackie / gui.h

diff --git a/libs/surfaces/mackie/gui.h b/libs/surfaces/mackie/gui.h
index 934736a33d850ed3c2879fd77a77c15b4f5fe4ae..0f91a32e123d55d5b81c7326a6b2ad1e1c1d8eb8 100644 (file)
--- a/libs/surfaces/mackie/gui.h
+++ b/libs/surfaces/mackie/gui.h
@@ -18,7 +18,7 @@
 
 #include <vector>
 
-#include <gtkmm/comboboxtext.h>
+#include <gtkmm/combobox.h>
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/table.h>
@@ -33,12 +33,16 @@ namespace Gtk {
 
 #include "button.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 namespace ArdourSurface {
 
 class MackieControlProtocol;
 
+namespace Mackie {
+       class Surface;
+}
+
 class MackieControlProtocolGUI : public Gtk::Notebook
 {
    public:
@@ -50,8 +54,18 @@ class MackieControlProtocolGUI : public Gtk::Notebook
        Gtk::ComboBoxText _surface_combo;
        Gtk::ComboBoxText _profile_combo;
 
-       typedef std::vector<Gtk::ComboBoxText*> PortCombos;
-       PortCombos port_combos;
+       typedef std::vector<Gtk::ComboBox*> PortCombos;
+       PortCombos input_combos;
+       PortCombos output_combos;
+
+       struct MidiPortColumns : public Gtk::TreeModel::ColumnRecord {
+               MidiPortColumns() {
+                       add (short_name);
+                       add (full_name);
+               }
+               Gtk::TreeModelColumn<std::string> short_name;
+               Gtk::TreeModelColumn<std::string> full_name;
+       };
 
        struct AvailableActionColumns : public Gtk::TreeModel::ColumnRecord {
                AvailableActionColumns() {
@@ -85,12 +99,15 @@ class MackieControlProtocolGUI : public Gtk::Notebook
 
        AvailableActionColumns available_action_columns;
        FunctionKeyColumns function_key_columns;
+       MidiPortColumns midi_port_columns;
 
        Gtk::ScrolledWindow function_key_scroller;
        Gtk::TreeView function_key_editor;
        Glib::RefPtr<Gtk::ListStore> function_key_model;
        Glib::RefPtr<Gtk::TreeStore> available_action_model;
 
+       Glib::RefPtr<Gtk::ListStore> build_midi_port_list (bool for_input);
+
        void build_available_action_menu ();
        void refresh_function_key_editor ();
        void build_function_key_editor ();
@@ -124,6 +141,19 @@ class MackieControlProtocolGUI : public Gtk::Notebook
 
        PBD::ScopedConnection device_change_connection;
        void device_changed ();
+
+       void update_port_combos (std::vector<std::string> const&, std::vector<std::string> const&,
+                                Gtk::ComboBox* input_combo,
+                                Gtk::ComboBox* output_combo,
+                                boost::shared_ptr<Mackie::Surface> surface);
+
+       PBD::ScopedConnection connection_change_connection;
+       void connection_handler ();
+
+       Glib::RefPtr<Gtk::ListStore> build_midi_port_list (std::vector<std::string> const & ports, bool for_input);
+       bool _ignore_profile_changed;
+       bool ignore_active_change;
+       void active_port_changed (Gtk::ComboBox* combo, boost::weak_ptr<Mackie::Surface> ws, bool for_input);
 };
 
 }