[SCM] calf/master: + Big Bull: fix type filter in get_ports, more tests for get_ports

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d79d3a1dceefa47d1861410db3bc7ba16e896c57
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Sat Sep 6 09:57:59 2008 +0000

    + Big Bull: fix type filter in get_ports, more tests for get_ports
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@283 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/bigbull/calfpytools.cpp b/bigbull/calfpytools.cpp
index f977aa6..68e2b76 100644
--- a/bigbull/calfpytools.cpp
+++ b/bigbull/calfpytools.cpp
@@ -138,7 +138,7 @@ static PyObject *jackclient_get_cobj(PyJackClient *self, PyObject *args)
 
 static PyObject *jackclient_get_ports(PyJackClient *self, PyObject *args)
 {
-    const char *name = NULL, type = NULL;
+    const char *name = NULL, *type = NULL;
     unsigned long flags = 0;
     if (!PyArg_ParseTuple(args, "|ssi:get_ports", &name, &type, &flags))
         return NULL;
diff --git a/bigbull/test.py b/bigbull/test.py
index 820e9b5..dc2125f 100755
--- a/bigbull/test.py
+++ b/bigbull/test.py
@@ -21,10 +21,13 @@ assert port.is_valid()
 # This doesn't work: assert client.get_port("calf:port2") == port (because JACK C API doesn't reuse the jack_port_t structs)
 
 print client.get_ports()
-print "Audio capture ports: %s" % (", ".join(client.get_ports("system:capture_.*", calfpytools.JACK_DEFAULT_AUDIO_TYPE)))
-print "Audio playback ports: %s" % (", ".join(client.get_ports("system:playback_.*", calfpytools.JACK_DEFAULT_AUDIO_TYPE)))
-print "MIDI capture ports: %s" % (", ".join(client.get_ports("system:capture_.*", calfpytools.JACK_DEFAULT_MIDI_TYPE)))
-print "MIDI playback ports: %s" % (", ".join(client.get_ports("system:playback_.*", calfpytools.JACK_DEFAULT_MIDI_TYPE)))
+print "Audio capture ports: %s" % (", ".join(client.get_ports("system:.*", calfpytools.JACK_DEFAULT_AUDIO_TYPE, calfpytools.JackPortIsOutput)))
+print "Audio playback ports: %s" % (", ".join(client.get_ports("system:.*", calfpytools.JACK_DEFAULT_AUDIO_TYPE, calfpytools.JackPortIsInput)))
+print "MIDI capture ports: %s" % (", ".join(client.get_ports("system:.*", calfpytools.JACK_DEFAULT_MIDI_TYPE, calfpytools.JackPortIsOutput)))
+print "MIDI playback ports: %s" % (", ".join(client.get_ports("system:.*", calfpytools.JACK_DEFAULT_MIDI_TYPE, calfpytools.JackPortIsInput)))
+
+assert client.get_ports("calf:.*", calfpytools.JACK_DEFAULT_AUDIO_TYPE) == ['calf:port2']
+assert client.get_ports("calf:.*", calfpytools.JACK_DEFAULT_MIDI_TYPE) == []
 
 port2 = client.get_port("system:playback_1")
 assert port2.get_name() == "playback_1"

-- 
calf audio plugins packaging