ardour/livetrax
13
0
Fork 0
Code

Add option to mackie control profile editor to remove binding (fixes #6301)

Browse Source
This commit is contained in:
Len Ovens 2015-06-20 09:32:46 -07:00 committed by Paul Davis
parent e5ea600ba0
commit 974e5dcc0c
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libs/surfaces/mackie/gui.cc
View File

@ -242,6 +242,15 @@ MackieControlProtocolGUI::build_available_action_menu ()
available_action_model->clear (); 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;
rowp = available_action_model->append();
parent = *(rowp);
parent[available_action_columns.name] = _("Remove Binding");
for (l = labels.begin(), k = keys.begin(), p = paths.begin(), t = tooltips.begin(); l != labels.end(); ++k, ++p, ++t, ++l) { for (l = labels.begin(), k = keys.begin(), p = paths.begin(), t = tooltips.begin(); l != labels.end(); ++k, ++p, ++t, ++l) {
TreeModel::Row row; TreeModel::Row row;
@ -451,6 +460,11 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
void void
MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib::ustring &text, TreeModelColumnBase col) MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib::ustring &text, TreeModelColumnBase col)
{ {
// Remove Binding is not in the action map but still valid
bool remove (false);
if ( text == "Remove Binding") {
remove = true;
}
Gtk::TreePath path(sPath); Gtk::TreePath path(sPath);
Gtk::TreeModel::iterator row = function_key_model->get_iter(path); Gtk::TreeModel::iterator row = function_key_model->get_iter(path);
@ -459,17 +473,23 @@ MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib
std::map<std::string,std::string>::iterator i = action_map.find (text); std::map<std::string,std::string>::iterator i = action_map.find (text);
if (i == action_map.end()) { if (i == action_map.end()) {
if (!remove) {
return; return;
} }
}
Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (i->second.c_str()); Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (i->second.c_str());
if (act) { if (act || remove) {
/* update visible text, using string supplied by /* update visible text, using string supplied by
available action model so that it matches and is found available action model so that it matches and is found
within the model. within the model.
*/ */
if (remove) {
Glib::ustring dot = "\u2022";
(*row).set_value (col.index(), dot);
} else {
(*row).set_value (col.index(), text); (*row).set_value (col.index(), text);
}
/* update the current DeviceProfile, using the full /* update the current DeviceProfile, using the full
* path * path
@ -497,7 +517,12 @@ MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib
modifier = 0; modifier = 0;
} }
if (remove) {
_cp.device_profile().set_button_action ((*row)[function_key_columns.id], modifier, "");
} else {
_cp.device_profile().set_button_action ((*row)[function_key_columns.id], modifier, i->second); _cp.device_profile().set_button_action ((*row)[function_key_columns.id], modifier, i->second);
}
} else { } else {
std::cerr << "no such action\n"; std::cerr << "no such action\n";
} }