Mackie Control: Need signal from session if group parameters change so strips redispl...

[ardour.git] / libs / surfaces / mackie / gui.cc

diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc
index ac03e41e4e86a9ccc5ecbe3a26a9fa493b46dee1..61ca6504cb844ed5db005c89f73b7f24e0837e1f 100644 (file)
--- a/libs/surfaces/mackie/gui.cc
+++ b/libs/surfaces/mackie/gui.cc
@@ -202,8 +202,6 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
 
        vector<string> profiles;
 
-       profiles.push_back ("default");
-
        for (std::map<std::string,DeviceProfile>::iterator i = DeviceProfile::device_profiles.begin(); i != DeviceProfile::device_profiles.end(); ++i) {
                profiles.push_back (i->first);
        }
@@ -869,7 +867,11 @@ MackieControlProtocolGUI::build_midi_port_list (vector<string> const & ports, bo
        for (vector<string>::const_iterator p = ports.begin(); p != ports.end(); ++p) {
                row = *store->append ();
                row[midi_port_columns.full_name] = *p;
-               row[midi_port_columns.short_name] = (*p).substr ((*p).find (':') + 1);
+               std::string pn = ARDOUR::AudioEngine::instance()->get_pretty_name_by_name (*p);
+               if (pn.empty ()) {
+                       pn = (*p).substr ((*p).find (':') + 1);
+               }
+               row[midi_port_columns.short_name] = pn;
        }
 
        return store;