ActionManager::get_all_actions() no longer includes <Actions> in the paths it returns, part 2 (surface support)

6 files changed, 7 insertions, 31 deletions

diff --git a/libs/surfaces/cc121/gui.cc b/libs/surfaces/cc121/gui.cc
index 3bf019a88e..d582b6dcc7 100644
--- a/libs/surfaces/cc121/gui.cc
+++ b/libs/surfaces/cc121/gui.cc
@@ -456,13 +456,7 @@ CC121GUI::build_available_action_menu ()
 			action_map[*l] = *p;
 		}
 
-		string path = (*p);
-		/* ControlProtocol::access_action() is not interested in the
-		   legacy "<Actions>/" prefix part of a path.
-		*/
-		path = path.substr (strlen ("<Actions>/"));
-
-		row[action_columns.path] = path;
+		row[action_columns.path] = *p;
 	}
 }
 
diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc
index 694e221ae9..948eb0cebb 100644
--- a/libs/surfaces/faderport/gui.cc
+++ b/libs/surfaces/faderport/gui.cc
@@ -453,13 +453,7 @@ FPGUI::build_available_action_menu ()
 			action_map[*l] = *p;
 		}
 
-		string path = (*p);
-		/* ControlProtocol::access_action() is not interested in the
-		   legacy "<Actions>/" prefix part of a path.
-		*/
-		path = path.substr (strlen ("<Actions>/"));
-
-		row[action_columns.path] = path;
+		row[action_columns.path] = *p;
 	}
 }
 
diff --git a/libs/surfaces/faderport8/gui.cc b/libs/surfaces/faderport8/gui.cc
index 251ac4a79d..a6948e5fae 100644
--- a/libs/surfaces/faderport8/gui.cc
+++ b/libs/surfaces/faderport8/gui.cc
@@ -432,13 +432,7 @@ FP8GUI::build_available_action_menu ()
 			action_map[*l] = *p;
 		}
 
-		string path = (*p);
-		/* ControlProtocol::access_action() is not interested in the
-		   legacy "<Actions>/" prefix part of a path.
-		*/
-		path = path.substr (strlen ("<Actions>/"));
-
-		row[action_columns.path] = path;
+		row[action_columns.path] = *p;
 	}
 }
 
diff --git a/libs/surfaces/mackie/device_profile.cc b/libs/surfaces/mackie/device_profile.cc
index 8fcde621a5..ac0a16d217 100644
--- a/libs/surfaces/mackie/device_profile.cc
+++ b/libs/surfaces/mackie/device_profile.cc
@@ -258,7 +258,7 @@ DeviceProfile::get_button_action (Button::ID id, int modifier_state) const
 }
 
 void
-DeviceProfile::set_button_action (Button::ID id, int modifier_state, const string& act)
+DeviceProfile::set_button_action (Button::ID id, int modifier_state, const string& action)
 {
 	ButtonActionMap::iterator i = _button_map.find (id);
 
@@ -266,9 +266,6 @@ DeviceProfile::set_button_action (Button::ID id, int modifier_state, const strin
 		i = _button_map.insert (std::make_pair (id, ButtonActions())).first;
 	}
 
-	string action (act);
-	replace_all (action, "<Actions>/", "");
-
 	if (modifier_state == MackieControlProtocol::MODIFIER_CONTROL) {
 		i->second.control = action;
 	} else if (modifier_state == MackieControlProtocol::MODIFIER_SHIFT) {
diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc
index 69feeb5360..035f8fa6fa 100644
--- a/libs/surfaces/mackie/gui.cc
+++ b/libs/surfaces/mackie/gui.cc
@@ -548,7 +548,7 @@ MackieControlProtocolGUI::build_available_action_menu ()
 			action_map[*l] = *p;
 		}
 
-		row[available_action_columns.path] = (*p);
+		row[available_action_columns.path] = *p;
 	}
 }
 
diff --git a/libs/surfaces/us2400/device_profile.cc b/libs/surfaces/us2400/device_profile.cc
index 7af4deead5..ffbffd34f2 100644
--- a/libs/surfaces/us2400/device_profile.cc
+++ b/libs/surfaces/us2400/device_profile.cc
@@ -230,12 +230,12 @@ DeviceProfile::get_button_action (Button::ID id, int modifier_state) const
 	if (modifier_state == US2400Protocol::MODIFIER_SHIFT) {
 		return i->second.shift;
 	}
-	
+
 	return i->second.plain;
 }
 
 void
-DeviceProfile::set_button_action (Button::ID id, int modifier_state, const string& act)
+DeviceProfile::set_button_action (Button::ID id, int modifier_state, const string& action)
 {
 	ButtonActionMap::iterator i = _button_map.find (id);
 
@@ -243,9 +243,6 @@ DeviceProfile::set_button_action (Button::ID id, int modifier_state, const strin
 		i = _button_map.insert (std::make_pair (id, ButtonActions())).first;
 	}
 
-	string action (act);
-	replace_all (action, "<Actions>/", "");
-
 	if (modifier_state == US2400Protocol::MODIFIER_SHIFT) {
 		i->second.shift = action;
 	}