X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fgui.cc;h=e27a354305de65c2f4bff3cc867936d46d3270f0;hb=40ef762db4c830b482aa7830c30dca4f32b753c4;hp=6ca76d4c0e1c847ee08a0f41037ea710dff7be16;hpb=e240fb16bdd66d145981a9737bd51341f25a5134;p=ardour.git diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc index 6ca76d4c0e..e27a354305 100644 --- a/libs/surfaces/mackie/gui.cc +++ b/libs/surfaces/mackie/gui.cc @@ -25,12 +25,16 @@ #include #include #include +#include +#include #include "pbd/strsplit.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/actions.h" +#include "ardour/rc_configuration.h" + #include "mackie_control_protocol.h" #include "device_info.h" #include "gui.h" @@ -65,35 +69,123 @@ MackieControlProtocol::build_gui () MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p) : _cp (p) + , touch_sensitivity_adjustment (0, 0, 9, 1, 4) + , touch_sensitivity_scale (touch_sensitivity_adjustment) + , 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, 2)); - table->set_spacings (4); - - table->attach (*manage (new Gtk::Label (_("Surface type:"))), 0, 1, 0, 1, AttachOptions(FILL|EXPAND), AttachOptions(0)); - table->attach (_surface_combo, 1, 2, 0, 1, AttachOptions(FILL|EXPAND), AttachOptions(0)); + Gtk::Table* table = Gtk::manage (new Gtk::Table (2, 9)); + table->set_row_spacings (4); + table->set_col_spacings (6); + 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)); + table->attach (_surface_combo, 1, 2, 0, 1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 20); vector surfaces; for (std::map::iterator i = DeviceInfo::device_info.begin(); i != DeviceInfo::device_info.end(); ++i) { - std::cerr << "Dveice known: " << i->first << endl; surfaces.push_back (i->first); } Gtkmm2ext::set_popdown_strings (_surface_combo, surfaces); _surface_combo.set_active_text (p.device_info().name()); _surface_combo.signal_changed().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::surface_combo_changed)); - append_page (*table, _("Device Selection")); + RadioButtonGroup rb_group = absolute_touch_mode_button.get_group(); + touch_move_mode_button.set_group (rb_group); + + l = manage (new Gtk::Label (_("Button click"))); + l->set_alignment (1.0, 0.5); + table->attach (*l, 0, 1, 1, 2, AttachOptions(FILL|EXPAND), AttachOptions (0)); + align = manage (new Alignment); + align->set (0.0, 0.5); + align->add (relay_click_button); + table->attach (*align, 1, 2, 1, 2, AttachOptions(FILL|EXPAND), AttachOptions (0)); + l = manage (new Gtk::Label (_("Backlight"))); + l->set_alignment (1.0, 0.5); + table->attach (*l, 0, 1, 2, 3, AttachOptions(FILL|EXPAND), AttachOptions (0)); + align = manage (new Alignment); + align->set (0.0, 0.5); + align->add (backlight_button); + table->attach (*align, 1, 2, 2, 3, AttachOptions(FILL|EXPAND), AttachOptions (0)); + l = manage (new Gtk::Label (_("Send Fader Position Only When Touched"))); + l->set_alignment (1.0, 0.5); + table->attach (*l, 0, 1, 3, 4, AttachOptions(FILL|EXPAND), AttachOptions (0)); + align = manage (new Alignment); + align->set (0.0, 0.5); + align->add (absolute_touch_mode_button); + table->attach (*align, 1, 2, 3, 4, AttachOptions(FILL|EXPAND), AttachOptions (0)); + l = manage (new Gtk::Label (_("Send Fader Position When Moved"))); + l->set_alignment (1.0, 0.5); + table->attach (*l, 0, 1, 4, 5, AttachOptions(FILL|EXPAND), AttachOptions (0)); + align = manage (new Alignment); + align->set (0.0, 0.5); + align->add (touch_move_mode_button); + table->attach (*align, 1, 2, 4, 5, AttachOptions(FILL|EXPAND), AttachOptions (0)); + l = manage (new Gtk::Label (_("Fader Touch Sense Sensitivity"))); + l->set_alignment (1.0, 0.5); + table->attach (*l, 0, 1, 5, 6, AttachOptions(FILL|EXPAND), AttachOptions (0)); + touch_sensitivity_scale.property_digits() = 0; + touch_sensitivity_scale.property_draw_value() = false; + table->attach (touch_sensitivity_scale, 1, 2, 5, 6, AttachOptions(FILL|EXPAND), AttachOptions (0)); + table->attach (recalibrate_fader_button, 1, 2, 6, 7, AttachOptions(FILL|EXPAND), AttachOptions (0)); + + l = manage (new Gtk::Label (_("ipMIDI Port (lowest)"))); + l->set_alignment (1.0, 0.5); + table->attach (*l, 0, 1, 7, 8, AttachOptions(FILL|EXPAND), AttachOptions (0)); + table->attach (ipmidi_base_port_spinner, 1, 2, 7, 8, AttachOptions(FILL|EXPAND), AttachOptions (0)); + + 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 profiles; + + profiles.push_back ("default"); + + for (std::map::iterator i = DeviceProfile::device_profiles.begin(); i != DeviceProfile::device_profiles.end(); ++i) { + profiles.push_back (i->first); + } + Gtkmm2ext::set_popdown_strings (_profile_combo, profiles); + _profile_combo.set_active_text (p.device_profile().name()); + _profile_combo.signal_changed().connect (sigc::mem_fun (*this, &MackieControlProtocolGUI::profile_combo_changed)); + + append_page (*table, _("Device Setup")); table->show_all(); /* function key editor */ - append_page (function_key_scroller, _("Function Keys")); + VBox* fkey_packer = manage (new VBox); + HBox* profile_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); + + fkey_packer->pack_start (*profile_packer, false, false); + fkey_packer->pack_start (function_key_scroller, true, true); + 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")); - rebuild_function_key_editor (); - function_key_scroller.show_all(); + build_available_action_menu (); + build_function_key_editor (); + refresh_function_key_editor (); + fkey_packer->show_all(); } CellRendererCombo* @@ -110,7 +202,7 @@ MackieControlProtocolGUI::make_action_renderer (Glib::RefPtr model, G } void -MackieControlProtocolGUI::rebuild_function_key_editor () +MackieControlProtocolGUI::build_available_action_menu () { /* build a model of all available actions (needs to be tree structured * more) @@ -186,16 +278,21 @@ MackieControlProtocolGUI::rebuild_function_key_editor () if (l->empty ()) { row[available_action_columns.name] = *t; + action_map[*t] = *p; } else { row[available_action_columns.name] = *l; + action_map[*l] = *p; } row[available_action_columns.path] = (*p); } +} +void +MackieControlProtocolGUI::build_function_key_editor () +{ function_key_editor.append_column (_("Key"), function_key_columns.name); - TreeViewColumn* col; CellRendererCombo* renderer; @@ -229,23 +326,104 @@ MackieControlProtocolGUI::rebuild_function_key_editor () col->add_attribute (renderer->property_text(), function_key_columns.shiftcontrol); function_key_editor.append_column (*col); - /* now fill with data */ - function_key_model = ListStore::create (function_key_columns); + function_key_editor.set_model (function_key_model); +} + +void +MackieControlProtocolGUI::refresh_function_key_editor () +{ + function_key_editor.set_model (Glib::RefPtr()); + function_key_model->clear (); + + /* now fill with data */ TreeModel::Row row; - - for (uint32_t n = 0; n < 16; ++n) { + DeviceProfile dp (_cp.device_profile()); + + 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] = string_compose ("F%1", n+1); - row[function_key_columns.number] = n; - row[function_key_columns.plain] = _cp.f_action (n, 0); - row[function_key_columns.control] = "c"; - row[function_key_columns.option] = "o"; - row[function_key_columns.shift] = "s"; - row[function_key_columns.cmdalt] = "ca"; - row[function_key_columns.shiftcontrol] = "sc"; + row[function_key_columns.name] = Mackie::Button::id_to_name (bid); + row[function_key_columns.id] = bid; + + Glib::RefPtr act; + string action; + const string defstring = "\u2022"; + + action = dp.get_button_action (bid, 0); + if (action.empty()) { + row[function_key_columns.plain] = defstring; + } else { + act = ActionManager::get_action (action.c_str()); + if (act) { + row[function_key_columns.plain] = act->get_label(); + } else { + row[function_key_columns.plain] = defstring; + } + } + + action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_CONTROL); + if (action.empty()) { + row[function_key_columns.control] = defstring; + } else { + act = ActionManager::get_action (action.c_str()); + if (act) { + row[function_key_columns.control] = act->get_label(); + } else { + row[function_key_columns.control] = defstring; + } + } + + action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_SHIFT); + if (action.empty()) { + row[function_key_columns.shift] = defstring; + } else { + act = ActionManager::get_action (action.c_str()); + if (act) { + row[function_key_columns.shift] = act->get_label(); + } else { + row[function_key_columns.shift] = defstring; + } + } + + action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_OPTION); + if (action.empty()) { + row[function_key_columns.option] = defstring; + } else { + act = ActionManager::get_action (action.c_str()); + if (act) { + row[function_key_columns.option] = act->get_label(); + } else { + row[function_key_columns.option] = defstring; + } + } + + action = dp.get_button_action (bid, MackieControlProtocol::MODIFIER_CMDALT); + if (action.empty()) { + row[function_key_columns.cmdalt] = defstring; + } else { + act = ActionManager::get_action (action.c_str()); + if (act) { + row[function_key_columns.cmdalt] = act->get_label(); + } else { + row[function_key_columns.cmdalt] = defstring; + } + } + + action = dp.get_button_action (bid, (MackieControlProtocol::MODIFIER_SHIFT|MackieControlProtocol::MODIFIER_CONTROL)); + if (action.empty()) { + row[function_key_columns.shiftcontrol] = defstring; + } else { + act = ActionManager::get_action (action.c_str()); + if (act) { + row[function_key_columns.shiftcontrol] = act->get_label(); + } else { + row[function_key_columns.shiftcontrol] = defstring; + } + } } function_key_editor.set_model (function_key_model); @@ -257,10 +435,55 @@ MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib Gtk::TreePath path(sPath); Gtk::TreeModel::iterator row = function_key_model->get_iter(path); - cerr << sPath << '-' << col.index() << " changed to " << text << endl; - if (row) { - (*row).set_value (col.index(), text); + + std::map::iterator i = action_map.find (text); + + if (i == action_map.end()) { + return; + } + + cerr << "Changed to " << i->first << " aka " << i->second << endl; + + Glib::RefPtr act = ActionManager::get_action (i->second.c_str()); + + if (act) { + /* update visible text, using string supplied by + available action model so that it matches and is found + within the model. + */ + (*row).set_value (col.index(), text); + + /* update the current DeviceProfile, using the full + * path + */ + + int modifier; + + switch (col.index()) { + case 3: + modifier = MackieControlProtocol::MODIFIER_SHIFT; + break; + case 4: + modifier = MackieControlProtocol::MODIFIER_CONTROL; + break; + case 5: + modifier = MackieControlProtocol::MODIFIER_OPTION; + break; + case 6: + modifier = MackieControlProtocol::MODIFIER_CMDALT; + break; + case 7: + modifier = (MackieControlProtocol::MODIFIER_SHIFT|MackieControlProtocol::MODIFIER_CONTROL); + break; + default: + modifier = 0; + } + + _cp.device_profile().set_button_action ((*row)[function_key_columns.id], modifier, i->second); + } else { + std::cerr << "no such action\n"; + } } } @@ -268,6 +491,34 @@ void MackieControlProtocolGUI::surface_combo_changed () { _cp.set_device (_surface_combo.get_active_text()); + + /* 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()); } +void +MackieControlProtocolGUI::profile_combo_changed () +{ + string profile = _profile_combo.get_active_text(); + _cp.set_profile (profile); + + refresh_function_key_editor (); +} + +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 (); +}