diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2019-03-20 14:23:23 -0700 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2019-03-20 14:23:23 -0700 |
commit | acbd12c885f6d35a93a151bf378c5520cf34276a (patch) | |
tree | 62b62412b0c115e0b7c4b17dba7ccb819e7c7f41 /libs | |
parent | cf2fa0ae84609a217176e0e56e22f97902840fc2 (diff) |
fix all surfaces' available action menus
Note: this replicated code is ridiculous
Diffstat (limited to 'libs')
-rw-r--r-- | libs/surfaces/cc121/gui.cc | 16 | ||||
-rw-r--r-- | libs/surfaces/faderport/gui.cc | 16 | ||||
-rw-r--r-- | libs/surfaces/faderport8/gui.cc | 16 | ||||
-rw-r--r-- | libs/surfaces/us2400/gui.cc | 16 |
4 files changed, 32 insertions, 32 deletions
diff --git a/libs/surfaces/cc121/gui.cc b/libs/surfaces/cc121/gui.cc index d582b6dcc7..8d2ff08c95 100644 --- a/libs/surfaces/cc121/gui.cc +++ b/libs/surfaces/cc121/gui.cc @@ -416,27 +416,27 @@ CC121GUI::build_available_action_menu () } //kinda kludgy way to avoid displaying menu items as mappable - if ( parts[1] == _("Main Menu") ) + if (parts[0] == _("Main Menu") ) continue; - if ( parts[1] == _("JACK") ) + if (parts[0] == _("JACK") ) continue; - if ( parts[1] == _("redirectmenu") ) + if (parts[0] == _("redirectmenu") ) continue; - if ( parts[1] == _("RegionList") ) + if (parts[0] == _("RegionList") ) continue; - if ( parts[1] == _("ProcessorMenu") ) + if (parts[0] == _("ProcessorMenu") ) continue; - if ((r = nodes.find (parts[1])) == nodes.end()) { + if ((r = nodes.find (parts[0])) == nodes.end()) { /* top level is missing */ TreeIter rowp; TreeModel::Row parent; rowp = available_action_model->append(); - nodes[parts[1]] = rowp; + nodes[parts[0]] = rowp; parent = *(rowp); - parent[action_columns.name] = parts[1]; + parent[action_columns.name] = parts[0]; row = *(available_action_model->append (parent.children())); diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc index 948eb0cebb..8406855140 100644 --- a/libs/surfaces/faderport/gui.cc +++ b/libs/surfaces/faderport/gui.cc @@ -413,27 +413,27 @@ FPGUI::build_available_action_menu () } //kinda kludgy way to avoid displaying menu items as mappable - if ( parts[1] == _("Main Menu") ) + if (parts[0] == _("Main Menu") ) continue; - if ( parts[1] == _("JACK") ) + if (parts[0] == _("JACK") ) continue; - if ( parts[1] == _("redirectmenu") ) + if (parts[0] == _("redirectmenu") ) continue; - if ( parts[1] == _("RegionList") ) + if (parts[0] == _("RegionList") ) continue; - if ( parts[1] == _("ProcessorMenu") ) + if (parts[0] == _("ProcessorMenu") ) continue; - if ((r = nodes.find (parts[1])) == nodes.end()) { + if ((r = nodes.find (parts[0])) == nodes.end()) { /* top level is missing */ TreeIter rowp; TreeModel::Row parent; rowp = available_action_model->append(); - nodes[parts[1]] = rowp; + nodes[parts[0]] = rowp; parent = *(rowp); - parent[action_columns.name] = parts[1]; + parent[action_columns.name] = parts[0]; row = *(available_action_model->append (parent.children())); diff --git a/libs/surfaces/faderport8/gui.cc b/libs/surfaces/faderport8/gui.cc index a6948e5fae..6eb4fabfb8 100644 --- a/libs/surfaces/faderport8/gui.cc +++ b/libs/surfaces/faderport8/gui.cc @@ -392,27 +392,27 @@ FP8GUI::build_available_action_menu () } //kinda kludgy way to avoid displaying menu items as mappable - if ( parts[1] == _("Main Menu") ) + if (parts[0] == _("Main Menu") ) continue; - if ( parts[1] == _("JACK") ) + if (parts[0] == _("JACK") ) continue; - if ( parts[1] == _("redirectmenu") ) + if (parts[0] == _("redirectmenu") ) continue; - if ( parts[1] == _("RegionList") ) + if (parts[0] == _("RegionList") ) continue; - if ( parts[1] == _("ProcessorMenu") ) + if (parts[0] == _("ProcessorMenu") ) continue; - if ((r = nodes.find (parts[1])) == nodes.end()) { + if ((r = nodes.find (parts[0])) == nodes.end()) { /* top level is missing */ TreeIter rowp; TreeModel::Row parent; rowp = available_action_model->append(); - nodes[parts[1]] = rowp; + nodes[parts[0]] = rowp; parent = *(rowp); - parent[action_columns.name] = parts[1]; + parent[action_columns.name] = parts[0]; row = *(available_action_model->append (parent.children())); diff --git a/libs/surfaces/us2400/gui.cc b/libs/surfaces/us2400/gui.cc index 5256255b93..9f6543875b 100644 --- a/libs/surfaces/us2400/gui.cc +++ b/libs/surfaces/us2400/gui.cc @@ -422,27 +422,27 @@ US2400ProtocolGUI::build_available_action_menu () } /* kinda kludgy way to avoid displaying menu items as mappable */ - if (parts[1] == _("Main Menu")) + if (parts[0] == _("Main Menu")) continue; - if (parts[1] == _("JACK")) + if (parts[0] == _("JACK")) continue; - if (parts[1] == _("redirectmenu")) + if (parts[0] == _("redirectmenu")) continue; - if (parts[1] == _("RegionList")) + if (parts[0] == _("RegionList")) continue; - if (parts[1] == _("ProcessorMenu")) + if (parts[0] == _("ProcessorMenu")) continue; - if ((r = nodes.find (parts[1])) == nodes.end()) { + if ((r = nodes.find (parts[0])) == nodes.end()) { /* top level is missing */ TreeIter rowp; TreeModel::Row parent; rowp = available_action_model->append(); - nodes[parts[1]] = rowp; + nodes[parts[0]] = rowp; parent = *(rowp); - parent[available_action_columns.name] = parts[1]; + parent[available_action_columns.name] = parts[0]; row = *(available_action_model->append (parent.children())); |