Correct jack_port_name_size API.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4607 0c269be4-1314-0410-8aa9-9f06e86f4224

ChangeLog

@@ -39,6 +39,7 @@ John Emmas
 2011-11-25 Stephane Letz  <letz@grame.fr>
 
 	* More robust dynamic port management in JACK/CoreMidi bridge.
+	* Correct jack_port_name_size API.
 
 2011-11-24 Stephane Letz  <letz@grame.fr>
 

common/JackAPI.cpp

@@ -1494,7 +1494,7 @@ LIB_EXPORT int jack_client_name_size(void)
 
 LIB_EXPORT int jack_port_name_size(void)
 {
-    return JACK_PORT_NAME_SIZE;
+    return JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE;
 }
 
 LIB_EXPORT int jack_port_type_size(void)

common/JackDriver.cpp

@@ -461,10 +461,21 @@ void JackDriver::SaveConnections()
 {
     const char** connections;
     fConnections.clear();
+    char alias1[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
+    char alias2[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
+    char* aliases[2];
+
+    aliases[0] = alias1;
+    aliases[1] = alias2;
 
     for (int i = 0; i < fCaptureChannels; ++i) {
         if (fCapturePortList[i] && (connections = fGraphManager->GetConnections(fCapturePortList[i])) != 0) {
             for (int j = 0; connections[j]; j++) {
+                /*
+                fGraphManager->GetPort(fCapturePortList[i])->GetAliases(aliases);
+                fConnections.push_back(make_pair(aliases[0], connections[j]));
+                jack_info("Save connection: %s %s", aliases[0], connections[j]);
+                */
                 fConnections.push_back(make_pair(fGraphManager->GetPort(fCapturePortList[i])->GetName(), connections[j]));
                 jack_info("Save connection: %s %s", fGraphManager->GetPort(fCapturePortList[i])->GetName(), connections[j]);
             }
@@ -475,6 +486,11 @@ void JackDriver::SaveConnections()
     for (int i = 0; i < fPlaybackChannels; ++i) {
         if (fPlaybackPortList[i] && (connections = fGraphManager->GetConnections(fPlaybackPortList[i])) != 0) {
             for (int j = 0; connections[j]; j++) {
+                /*
+                fGraphManager->GetPort(fPlaybackPortList[i])->GetAliases(aliases);
+                fConnections.push_back(make_pair(connections[j], aliases[0]));
+                jack_info("Save connection: %s %s", connections[j], aliases[0]);
+                */
                 fConnections.push_back(make_pair(connections[j], fGraphManager->GetPort(fPlaybackPortList[i])->GetName()));
                 jack_info("Save connection: %s %s", connections[j], fGraphManager->GetPort(fPlaybackPortList[i])->GetName());
             }

common/JackGraphManager.cpp

@@ -741,8 +741,9 @@ jack_port_id_t JackGraphManager::GetPort(const char* name)
 {
     for (unsigned int i = 0; i < fPortMax; i++) {
         JackPort* port = GetPort(i);
-        if (port->IsUsed() && port->NameEquals(name))
+        if (port->IsUsed() && port->NameEquals(name)) {
             return i;
+        }
     }
     return NO_PORT;
 }