ardour/livetrax
13
0
Fork 0
Code

Clarify which version of 'ActionManager::get_action()' we're calling

Browse Source 
For MSVC, the parameter 'false' (i.e. 0) can be considered as either a bool or a pointer - so it'll map to both declarations of ActionManager::get_action()
This commit is contained in:
John Emmas 2019-01-14 14:14:23 +00:00
parent 9d1fa8f820
commit 8f9e63575f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -639,7 +639,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
row[function_key_columns.plain] = action; row[function_key_columns.plain] = action;
} else { } else {
act = ActionManager::get_action (action.c_str(), false); act = ActionManager::get_action (action, false);
if (act) { if (act) {
row[function_key_columns.plain] = act->get_label(); row[function_key_columns.plain] = act->get_label();
} else { } else {
@ -663,7 +663,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
/* Probably a key alias */ /* Probably a key alias */
row[function_key_columns.shift] = action; row[function_key_columns.shift] = action;
} else { } else {
act = ActionManager::get_action (action.c_str(), false); act = ActionManager::get_action (action, false);
if (act) { if (act) {
row[function_key_columns.shift] = act->get_label(); row[function_key_columns.shift] = act->get_label();
} else { } else {
@ -681,7 +681,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
/* Probably a key alias */ /* Probably a key alias */
row[function_key_columns.control] = action; row[function_key_columns.control] = action;
} else { } else {
act = ActionManager::get_action (action.c_str(), false); act = ActionManager::get_action (action, false);
if (act) { if (act) {
row[function_key_columns.control] = act->get_label(); row[function_key_columns.control] = act->get_label();
} else { } else {
@ -698,7 +698,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
/* Probably a key alias */ /* Probably a key alias */
row[function_key_columns.option] = action; row[function_key_columns.option] = action;
} else { } else {
act = ActionManager::get_action (action.c_str(), false); act = ActionManager::get_action (action, false);
if (act) { if (act) {
row[function_key_columns.option] = act->get_label(); row[function_key_columns.option] = act->get_label();
} else { } else {
@ -715,7 +715,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
/* Probably a key alias */ /* Probably a key alias */
row[function_key_columns.cmdalt] = action; row[function_key_columns.cmdalt] = action;
} else { } else {
act = ActionManager::get_action (action.c_str(), false); act = ActionManager::get_action (action, false);
if (act) { if (act) {
row[function_key_columns.cmdalt] = act->get_label(); row[function_key_columns.cmdalt] = act->get_label();
} else { } else {
@ -728,7 +728,7 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
if (action.empty()) { if (action.empty()) {
row[function_key_columns.shiftcontrol] = defstring; row[function_key_columns.shiftcontrol] = defstring;
} else { } else {
act = ActionManager::get_action (action.c_str(), false); act = ActionManager::get_action (action, false);
if (act) { if (act) {
row[function_key_columns.shiftcontrol] = act->get_label(); row[function_key_columns.shiftcontrol] = act->get_label();
} else { } else {
@ -760,7 +760,7 @@ MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib
return; return;
} }
} }
Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (i->second.c_str(), false); Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (i->second, false);
if (act || remove) { if (act || remove) {
/* update visible text, using string supplied by /* update visible text, using string supplied by