X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Ffaderport%2Fgui.cc;h=160ba0ec87fb199a8096a812671bdb4959a3eca1;hb=1aab360b7d944350dea1f5ef81394229adb07c1e;hp=4dcf2920e9ad000634fe51c11467e03577c5ca37;hpb=682e152aafbc49b5a7908fcd4b2734aed3b872e6;p=ardour.git diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc index 4dcf2920e9..160ba0ec87 100644 --- a/libs/surfaces/faderport/gui.cc +++ b/libs/surfaces/faderport/gui.cc @@ -23,18 +23,20 @@ #include "pbd/unwind.h" #include "pbd/strsplit.h" +#include "pbd/file_utils.h" -#include "gtkmm2ext/actions.h" +#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/gui_thread.h" #include "gtkmm2ext/utils.h" #include "ardour/audioengine.h" +#include "ardour/filesystem_paths.h" #include "faderport.h" #include "gui.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace ARDOUR; @@ -78,7 +80,7 @@ FaderPort::build_gui () FPGUI::FPGUI (FaderPort& p) : fp (p) , table (2, 5) - , action_table (4, 5) + , action_table (5, 4) , ignore_active_change (false) { set_border_width (12); @@ -88,6 +90,16 @@ FPGUI::FPGUI (FaderPort& p) table.set_border_width (12); table.set_homogeneous (false); + std::string data_file_path; + string name = "faderport-small.png"; + Searchpath spath(ARDOUR::ardour_data_search_path()); + spath.add_subdirectory_to_paths ("icons"); + find_file (spath, name, data_file_path); + if (!data_file_path.empty()) { + image.set (data_file_path); + hpacker.pack_start (image, false, false); + } + Gtk::Label* l; Gtk::Alignment* align; int row = 0; @@ -98,13 +110,15 @@ FPGUI::FPGUI (FaderPort& p) input_combo.signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &FPGUI::active_port_changed), &input_combo, true)); output_combo.signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &FPGUI::active_port_changed), &output_combo, false)); - l = manage (new Gtk::Label (_("Sends MIDI to:"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Incoming MIDI on:"))); l->set_alignment (1.0, 0.5); table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0)); table.attach (input_combo, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0); row++; - l = manage (new Gtk::Label (_("Receives MIDI from:"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Outgoing MIDI on:"))); l->set_alignment (1.0, 0.5); table.attach (*l, 0, 1, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0)); table.attach (output_combo, 1, 2, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions(0), 0, 0); @@ -112,18 +126,28 @@ FPGUI::FPGUI (FaderPort& p) build_mix_action_combo (mix_combo[0], FaderPort::ButtonState(0)); build_mix_action_combo (mix_combo[1], FaderPort::ShiftDown); - build_mix_action_combo (mix_combo[2], FaderPort::LongishPress); - build_mix_action_combo (mix_combo[3], FaderPort::LongPress); + build_mix_action_combo (mix_combo[2], FaderPort::LongPress); build_proj_action_combo (proj_combo[0], FaderPort::ButtonState(0)); build_proj_action_combo (proj_combo[1], FaderPort::ShiftDown); - build_proj_action_combo (proj_combo[2], FaderPort::LongishPress); - build_proj_action_combo (proj_combo[3], FaderPort::LongPress); + build_proj_action_combo (proj_combo[2], FaderPort::LongPress); build_trns_action_combo (trns_combo[0], FaderPort::ButtonState(0)); build_trns_action_combo (trns_combo[1], FaderPort::ShiftDown); - build_trns_action_combo (trns_combo[2], FaderPort::LongishPress); - build_trns_action_combo (trns_combo[3], FaderPort::LongPress); + build_trns_action_combo (trns_combo[2], FaderPort::LongPress); + + build_available_action_menu (); + + build_foot_action_combo (foot_combo[0], FaderPort::ButtonState(0)); + build_foot_action_combo (foot_combo[1], FaderPort::ShiftDown); + build_foot_action_combo (foot_combo[2], FaderPort::LongPress); + + /* No shift-press combo for User because that is labelled as "next" + * (marker) + */ + + build_user_action_combo (user_combo[0], FaderPort::ButtonState(0)); + build_user_action_combo (user_combo[1], FaderPort::LongPress); action_table.set_row_spacings (4); action_table.set_col_spacings (6); @@ -132,25 +156,22 @@ FPGUI::FPGUI (FaderPort& p) int action_row = 0; - - l = manage (new Gtk::Label (_("Button"))); - l->set_alignment (1.0, 0.5); - action_table.attach (*l, 0, 1, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); - l = manage (new Gtk::Label (_("Press"))); - l->set_alignment (1.0, 0.5); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Press Action"))); + l->set_alignment (0.5, 0.5); action_table.attach (*l, 1, 2, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); - l = manage (new Gtk::Label (_("Shift"))); - l->set_alignment (1.0, 0.5); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Shift-Press Action"))); + l->set_alignment (0.5, 0.5); action_table.attach (*l, 2, 3, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); - l = manage (new Gtk::Label (_("Medium"))); - l->set_alignment (1.0, 0.5); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Long Press Action"))); + l->set_alignment (0.5, 0.5); action_table.attach (*l, 3, 4, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); - l = manage (new Gtk::Label (_("Long"))); - l->set_alignment (1.0, 0.5); - action_table.attach (*l, 4, 5, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); action_row++; - l = manage (new Gtk::Label (_("Mix"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Mix"))); l->set_alignment (1.0, 0.5); action_table.attach (*l, 0, 1, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); align = manage (new Alignment); @@ -165,13 +186,10 @@ FPGUI::FPGUI (FaderPort& p) align->set (0.0, 0.5); align->add (mix_combo[2]); action_table.attach (*align, 3, 4, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); - align = manage (new Alignment); - align->set (0.0, 0.5); - align->add (mix_combo[3]); - action_table.attach (*align, 4, 5, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); action_row++; - l = manage (new Gtk::Label (_("Proj"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Proj"))); l->set_alignment (1.0, 0.5); action_table.attach (*l, 0, 1, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); align = manage (new Alignment); @@ -186,13 +204,10 @@ FPGUI::FPGUI (FaderPort& p) align->set (0.0, 0.5); align->add (proj_combo[2]); action_table.attach (*align, 3, 4, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); - align = manage (new Alignment); - align->set (0.0, 0.5); - align->add (proj_combo[3]); - action_table.attach (*align, 4, 5, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); action_row++; - l = manage (new Gtk::Label (_("Trns"))); + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Trns"))); l->set_alignment (1.0, 0.5); action_table.attach (*l, 0, 1, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); align = manage (new Alignment); @@ -207,16 +222,46 @@ FPGUI::FPGUI (FaderPort& p) align->set (0.0, 0.5); align->add (trns_combo[2]); action_table.attach (*align, 3, 4, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); + action_row++; + + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("User"))); + l->set_alignment (1.0, 0.5); + action_table.attach (*l, 0, 1, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); + align = manage (new Alignment); + align->set (0.0, 0.5); + align->add (user_combo[0]); + action_table.attach (*align, 1, 2, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); + /* skip shift press combo */ + align = manage (new Alignment); + align->set (0.0, 0.5); + align->add (user_combo[1]); + action_table.attach (*align, 3, 4, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); + action_row++; + + l = manage (new Gtk::Label); + l->set_markup (string_compose ("%1", _("Footswitch"))); + l->set_alignment (1.0, 0.5); + action_table.attach (*l, 0, 1, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); align = manage (new Alignment); align->set (0.0, 0.5); - align->add (trns_combo[3]); - action_table.attach (*align, 4, 5, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); + align->add (foot_combo[0]); + action_table.attach (*align, 1, 2, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); + align = manage (new Alignment); + align->set (0.0, 0.5); + align->add (foot_combo[1]); + action_table.attach (*align, 2, 3, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); + align = manage (new Alignment); + align->set (0.0, 0.5); + align->add (foot_combo[2]); + action_table.attach (*align, 3, 4, action_row, action_row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); action_row++; table.attach (action_table, 0, 5, row, row+1, AttachOptions(FILL|EXPAND), AttachOptions (0)); row++; - pack_start (table, false, false); + hpacker.pack_start (table, true, true); + pack_start (hpacker, false, false); /* update the port connection combos */ @@ -312,12 +357,14 @@ FPGUI::build_available_action_menu () vector labels; vector tooltips; vector keys; - vector bindings; + vector > actions; + + Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions); + typedef std::map NodeMap; NodeMap nodes; NodeMap::iterator r; - ActionManager::get_all_actions (labels, paths, tooltips, keys, bindings); vector::iterator k; vector::iterator p; @@ -326,14 +373,14 @@ FPGUI::build_available_action_menu () available_action_model->clear (); - /* Because there are button bindings built in that are not - in the key binding map, there needs to be a way to undo - a profile edit. */ TreeIter rowp; TreeModel::Row parent; + + /* Disabled item (row 0) */ + rowp = available_action_model->append(); parent = *(rowp); - parent[action_columns.name] = _("Remove Binding"); + parent[action_columns.name] = _("Disabled"); /* Key aliasing */ @@ -407,17 +454,24 @@ FPGUI::build_available_action_menu () action_map[*l] = *p; } - row[action_columns.path] = (*p); + string path = (*p); + /* ControlProtocol::access_action() is not interested in the + legacy "/" prefix part of a path. + */ + path = path.substr (strlen ("/")); + + row[action_columns.path] = path; } } void -FPGUI::action_changed (Gtk::ComboBox* cb, FaderPort::ButtonID id) +FPGUI::action_changed (Gtk::ComboBox* cb, FaderPort::ButtonID id, FaderPort::ButtonState bs) { TreeModel::const_iterator row = cb->get_active (); string action_path = (*row)[action_columns.path]; - fp.set_action (id, action_path, true); + /* release binding */ + fp.set_action (id, action_path, false, bs); } void @@ -426,23 +480,38 @@ FPGUI::build_action_combo (Gtk::ComboBox& cb, vector > const Glib::RefPtr model (Gtk::ListStore::create (action_columns)); TreeIter rowp; TreeModel::Row row; + string current_action = fp.get_action (id, false, bs); /* lookup release action */ + int active_row = -1; + int n; + vector >::const_iterator i; rowp = model->append(); row = *(rowp); row[action_columns.name] = _("Disabled"); row[action_columns.path] = string(); - for (vector >::const_iterator i = actions.begin(); i != actions.end(); ++i) { + if (current_action.empty()) { + active_row = 0; + } + + for (i = actions.begin(), n = 0; i != actions.end(); ++i, ++n) { rowp = model->append(); row = *(rowp); row[action_columns.name] = i->first; row[action_columns.path] = i->second; + if (current_action == i->second) { + active_row = n+1; + } } cb.set_model (model); cb.pack_start (action_columns.name); - cb.signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &FPGUI::action_changed), &cb, id)); + if (active_row >= 0) { + cb.set_active (active_row); + } + + cb.signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &FPGUI::action_changed), &cb, id, bs)); } void @@ -450,7 +519,9 @@ FPGUI::build_mix_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs) { vector > actions; - actions.push_back (make_pair (string (_("Toggle Editor & Mixer Windows")), string (X_("Common/toggle-editor-mixer")))); + actions.push_back (make_pair (string (_("Toggle Editor & Mixer Windows")), string (X_("Common/toggle-editor-and-mixer")))); + actions.push_back (make_pair (string (_("Show/Hide Mixer list")), string (X_("Common/ToggleMixerList")))); + actions.push_back (make_pair (string("Toggle Meterbridge"), string(X_("Common/toggle-meterbridge")))); actions.push_back (make_pair (string (_("Show/Hide Editor mixer strip")), string (X_("Editor/show-editor-mixer")))); build_action_combo (cb, actions, FaderPort::Mix, bs); @@ -461,7 +532,13 @@ FPGUI::build_proj_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs) { vector > actions; + actions.push_back (make_pair (string("Toggle Editor Lists"), string(X_("Editor/show-editor-list")))); + actions.push_back (make_pair (string("Toggle Summary"), string(X_("Editor/ToggleSummary")))); actions.push_back (make_pair (string("Toggle Meterbridge"), string(X_("Common/toggle-meterbridge")))); + actions.push_back (make_pair (string (_("Zoom to Session")), string (X_("Editor/zoom-to-session")))); + +// actions.push_back (make_pair (string (_("Zoom In")), string (X_("Editor/temporal-zoom-in")))); +// actions.push_back (make_pair (string (_("Zoom Out")), string (X_("Editor/temporal-zoom-out")))); build_action_combo (cb, actions, FaderPort::Proj, bs); } @@ -471,11 +548,74 @@ FPGUI::build_trns_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs) { vector > actions; - actions.push_back (make_pair (string("Toggle Locations"), string(X_("Window/toggle-locations")))); + actions.push_back (make_pair (string("Toggle Big Clock"), string(X_("Window/toggle-big-clock")))); //note: this would really make sense if the Big Clock had transport buttons on it + actions.push_back (make_pair (string("Toggle Locations window"), string(X_("Window/toggle-locations")))); + actions.push_back (make_pair (string("Toggle Metronome"), string(X_("Transport/ToggleClick")))); + actions.push_back (make_pair (string("Toggle External Sync"), string(X_("Transport/ToggleExternalSync")))); + actions.push_back (make_pair (string("Toggle Follow Playhead"), string(X_("Editor/toggle-follow-playhead")))); + +// actions.push_back (make_pair (string("Set Playhead @pointer"), string(X_("Editor/set-playhead")))); + build_action_combo (cb, actions, FaderPort::Trns, bs); } +void +FPGUI::build_foot_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs) +{ + vector > actions; + + actions.push_back (make_pair (string("Toggle Roll"), string(X_("Transport/ToggleRoll")))); + actions.push_back (make_pair (string("Toggle Rec-Enable"), string(X_("Transport/Record")))); + actions.push_back (make_pair (string("Toggle Roll+Rec"), string(X_("Transport/record-roll")))); + actions.push_back (make_pair (string("Toggle Loop"), string(X_("Transport/Loop")))); + actions.push_back (make_pair (string("Toggle Click"), string(X_("Transport/ToggleClick")))); + + build_action_combo (cb, actions, FaderPort::Footswitch, bs); +} + +bool +FPGUI::find_action_in_model (const TreeModel::iterator& iter, std::string const & action_path, TreeModel::iterator* found) +{ + TreeModel::Row row = *iter; + string path = row[action_columns.path]; + + if (path == action_path) { + *found = iter; + return true; + } + + return false; +} + +void +FPGUI::build_user_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs) +{ + cb.set_model (available_action_model); + cb.pack_start (action_columns.name); + cb.signal_changed().connect (sigc::bind (sigc::mem_fun (*this, &FPGUI::action_changed), &cb, FaderPort::User, bs)); + + /* set the active "row" to the right value for the current button binding */ + + string current_action = fp.get_action (FaderPort::User, false, bs); /* lookup release action */ + + if (current_action.empty()) { + cb.set_active (0); /* "disabled" */ + return; + } + + TreeModel::iterator iter = available_action_model->children().end(); + + available_action_model->foreach_iter (sigc::bind (sigc::mem_fun (*this, &FPGUI::find_action_in_model), current_action, &iter)); + + if (iter != available_action_model->children().end()) { + cb.set_active (iter); + } else { + cb.set_active (0); + } + +} + Glib::RefPtr FPGUI::build_midi_port_list (vector const & ports, bool for_input) {