From f6fc09c170e8aabb87156ee9bda336c7b37ebb81 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Thu, 25 Oct 2007 11:08:23 +0000
Subject: [PATCH] Correct JackGraphManager::GetPortsAux to use port type.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1652 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog                   |  2 +-
 common/JackAPI.cpp          |  4 ++--
 common/JackGraphManager.cpp | 21 +++++----------------
 common/JackPort.cpp         |  4 ++--
 common/JackPort.h           |  4 ++--
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 55985ae9..91aa09a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,7 @@ Tom Szilagyi
 
 2007-10-25 Stephane Letz  <letz@grame.fr>
 
-	* Merge of Dmitry Baikov MIDI branch.
+	* Merge of Dmitry Baikov MIDI branch. Correct JackGraphManager::GetPortsAux to use port type.
 
 2007-10-24 Stephane Letz  <letz@grame.fr>
 
diff --git a/common/JackAPI.cpp b/common/JackAPI.cpp
index c85c1a8d..af121076 100644
--- a/common/JackAPI.cpp
+++ b/common/JackAPI.cpp
@@ -297,7 +297,7 @@ EXPORT int jack_port_flags(const jack_port_t* port)
         jack_error("jack_port_flags called with an incorrect port %ld", myport);
         return -1;
     } else {
-        return GetGraphManager()->GetPort(myport)->Flags();
+        return GetGraphManager()->GetPort(myport)->GetFlags();
     }
 }
 
@@ -311,7 +311,7 @@ EXPORT const char* jack_port_type(const jack_port_t* port)
         jack_error("jack_port_flags called an incorrect port %ld", myport);
         return NULL;
     } else {
-        return GetGraphManager()->GetPort(myport)->Type();
+        return GetGraphManager()->GetPort(myport)->GetType();
     }
 }
 
diff --git a/common/JackGraphManager.cpp b/common/JackGraphManager.cpp
index 3fd26200..a18c0712 100644
--- a/common/JackGraphManager.cpp
+++ b/common/JackGraphManager.cpp
@@ -612,12 +612,12 @@ int JackGraphManager::CheckPorts(jack_port_id_t port_src, jack_port_id_t port_ds
     JackPort* src = GetPort(port_src);
     JackPort* dst = GetPort(port_dst);
 
-    if ((dst->Flags() & JackPortIsInput) == 0) {
+    if ((dst->fFlags & JackPortIsInput) == 0) {
         jack_error("Destination port in attempted (dis)connection of %s and %s is not an input port", src->fName, dst->fName);
         return -1;
     }
 
-    if ((src->Flags() & JackPortIsOutput) == 0) {
+    if ((src->fFlags & JackPortIsOutput) == 0) {
         jack_error("Source port in attempted (dis)connection of %s and %s is not an output port", src->fName, dst->fName);
         return -1;
     }
@@ -736,23 +736,12 @@ const char** JackGraphManager::GetPortsAux(const char* port_name_pattern, const
             }
 
             if (matching && port_name_pattern && port_name_pattern[0]) {
-                if (regexec(&port_regex, port->fName, 0, NULL, 0)) {
+                if (regexec(&port_regex, port->GetName(), 0, NULL, 0)) {
                     matching = false;
                 }
             }
-
-            /*
-            if (matching && type_name_pattern && type_name_pattern[0]) {
-                jack_port_type_id_t ptid = psp[i].ptype_id;
-                if (regexec (&type_regex,engine->port_types[ptid].type_name,0, NULL, 0)) {
-                    matching = false;
-                }
-            } 
-            */
-
-            // TO BE IMPROVED
-            if (matching && type_name_pattern && type_name_pattern[0]) {
-                if (regexec(&type_regex, JACK_DEFAULT_AUDIO_TYPE, 0, NULL, 0)) {
+			if (matching && type_name_pattern && type_name_pattern[0]) {
+                if (regexec(&type_regex, port->GetType(), 0, NULL, 0)) {
                     matching = false;
                 }
             }
diff --git a/common/JackPort.cpp b/common/JackPort.cpp
index be766774..4da8668f 100644
--- a/common/JackPort.cpp
+++ b/common/JackPort.cpp
@@ -181,12 +181,12 @@ const char* JackPort::GetShortName() const
     return strchr(fName, ':') + 1;
 }
 
-int JackPort::Flags() const
+int JackPort::GetFlags() const
 {
     return fFlags;
 }
 
-const char* JackPort::Type() const
+const char* JackPort::GetType() const
 {
     const JackPortType* type = GetPortType(fTypeId);
     return type->name;
diff --git a/common/JackPort.h b/common/JackPort.h
index df285587..ea8761c7 100644
--- a/common/JackPort.h
+++ b/common/JackPort.h
@@ -88,8 +88,8 @@ class JackPort
 		int UnsetAlias(const char* alias);
 		bool NameEquals(const char* target);
 
-        int	Flags() const;
-        const char* Type() const;
+        int	GetFlags() const;
+        const char* GetType() const;
 
         int Lock();
         int Unlock();