Merge remote-tracking branch 'origin/master' into export-dialog

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

diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc
index 8728b4a88c51e8c097a371d9f98557a08098cc4e..7425b388266c5369de132e370bbc8228c801bafa 100644 (file)
--- a/libs/surfaces/mackie/gui.cc
+++ b/libs/surfaces/mackie/gui.cc
@@ -74,15 +74,17 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
        , recalibrate_fader_button (_("Recalibrate Faders"))
        , ipmidi_base_port_adjustment (_cp.ipmidi_base(), 0, 32767, 1, 1000)
        , ipmidi_base_port_spinner (ipmidi_base_port_adjustment)
+       , discover_button (_("Discover Mackie Devices"))
 {
        Gtk::Label* l;
        Gtk::Alignment* align;
 
        set_border_width (12);
 
-       Gtk::Table* table = Gtk::manage (new Gtk::Table (2, 8));
+       Gtk::Table* table = Gtk::manage (new Gtk::Table (2, 9));
        table->set_row_spacings (4);
        table->set_col_spacings (6);
+       table->set_border_width (12);
        l = manage (new Gtk::Label (_("Device Type:")));
        l->set_alignment (1.0, 0.5);
        table->attach (*l, 0, 1, 0, 1, AttachOptions(FILL|EXPAND), AttachOptions(0));
@@ -144,6 +146,10 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
        ipmidi_base_port_spinner.set_sensitive (_cp.device_info().uses_ipmidi());
        ipmidi_base_port_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::ipmidi_spinner_changed));
 
+       
+       table->attach (discover_button, 1, 2, 8, 9, AttachOptions(FILL|EXPAND), AttachOptions (0));
+       discover_button.signal_clicked().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::discover_clicked));
+
        vector<string> profiles;
        
        profiles.push_back ("default");
@@ -162,21 +168,25 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
 
        VBox* fkey_packer = manage (new VBox);
        HBox* profile_packer = manage (new HBox);
-
+       HBox* observation_packer = manage (new HBox);
+       
        l = manage (new Gtk::Label (_("Profile/Settings:")));
        profile_packer->pack_start (*l, false, false);
        profile_packer->pack_start (_profile_combo, true, true);
        profile_packer->set_spacing (12);
        profile_packer->set_border_width (12);
+       
+       l = manage (new Gtk::Label (_("* Button available at the original Mackie MCU PRO or current device if enabled (NOT implemented yet). Device specific name presented.")));
+       observation_packer->pack_start (*l, false, false);
 
        fkey_packer->pack_start (*profile_packer, false, false);
        fkey_packer->pack_start (function_key_scroller, true, true);
+       fkey_packer->pack_start (*observation_packer, false, false);
        fkey_packer->set_spacing (12);
-       function_key_scroller.set_size_request (700,700);
        function_key_scroller.property_shadow_type() = Gtk::SHADOW_NONE;
        function_key_scroller.add (function_key_editor);
        append_page (*fkey_packer, _("Function Keys"));
-       
+
        build_available_action_menu ();
        build_function_key_editor ();
        refresh_function_key_editor ();
@@ -335,13 +345,18 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
 
        TreeModel::Row row;
        DeviceProfile dp (_cp.device_profile());
+       DeviceInfo di;
 
        for (int n = 0; n < Mackie::Button::FinalGlobalButton; ++n) {
 
                Mackie::Button::ID bid = (Mackie::Button::ID) n;
 
                row = *(function_key_model->append());
-               row[function_key_columns.name] = Mackie::Button::id_to_name (bid);
+               if (di.global_buttons().find (bid) == di.global_buttons().end()) {
+                       row[function_key_columns.name] = Mackie::Button::id_to_name (bid);
+               } else {
+                       row[function_key_columns.name] = di.get_global_button_name (bid) + "*";
+               }
                row[function_key_columns.id] = bid;
 
                Glib::RefPtr<Gtk::Action> act;
@@ -438,8 +453,6 @@ MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib
                        return;
                }
 
-               cerr << "Changed to " << i->first << " aka " << i->second << endl;
-
                Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (i->second.c_str());
 
                if (act) {
@@ -489,8 +502,6 @@ MackieControlProtocolGUI::surface_combo_changed ()
 
        /* update ipMIDI field */
 
-       cerr << "New device called " << _cp.device_info().name() << " with ipMIDI ? " << _cp.device_info().uses_ipmidi() << endl;
-
        ipmidi_base_port_spinner.set_sensitive (_cp.device_info().uses_ipmidi());
 }
 
@@ -507,6 +518,12 @@ MackieControlProtocolGUI::profile_combo_changed ()
 void
 MackieControlProtocolGUI::ipmidi_spinner_changed ()
 {
-       cerr << "Set IP MIDI base to " << ipmidi_base_port_spinner.get_value() << endl;
        _cp.set_ipmidi_base ((int16_t) lrintf (ipmidi_base_port_spinner.get_value()));
 }
+
+void
+MackieControlProtocolGUI::discover_clicked ()
+{
+       /* this should help to get things started */
+       _cp.midi_connectivity_established ();
+}