fix jack input port connection

Original commit message from CVS:
fix jack input port connection

diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
index 3a9aef796cfe89bf6c06d926d7fd46d3b62f97cf..14e50d5e10dd9b57fab5124e18f6651b96a49aff 100644 (file)
--- a/ext/jack/gstjack.c
+++ b/ext/jack/gstjack.c
@@ -471,6 +471,7 @@ gst_jack_loop (GstElement *element)
                 GST_BUFFER_DATA (buffer)    = pad->data;
                 GST_BUFFER_SIZE (buffer)    = len;
                 GST_BUFFER_MAXSIZE (buffer) = len;
+               GST_BUFFER_FLAG_SET(buffer, GST_BUFFER_DONTFREE);
                 
                 gst_pad_push (pad->pad, buffer);
             }

diff --git a/ext/jack/gstjackbin.c b/ext/jack/gstjackbin.c
index 64aab499de87d61a1570361ae677160ca7f8963b..52222b65a7efc6a867c5379de16dd71b2b066c22 100644 (file)
--- a/ext/jack/gstjackbin.c
+++ b/ext/jack/gstjackbin.c
@@ -160,14 +160,14 @@ gst_jack_bin_change_state (GstElement *element)
             l = this->src_pads;
             while (l) {
                 pad = GST_JACK_PAD (l);
-                g_message ("jack: registering output port %s (peer %s)", pad->name, pad->peer_name);
+                g_message ("jack: registering input port %s (peer %s)", pad->name, pad->peer_name);
                 pad->port = jack_port_register (this->client, pad->name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput|JackPortIsTerminal, 0);
                 l = g_list_next (l);
             }
             l = this->sink_pads;
             while (l) {
                 pad = GST_JACK_PAD (l);
-                g_message ("jack: registering input port %s (peer %s)", pad->name, pad->peer_name);
+                g_message ("jack: registering output port %s (peer %s)", pad->name, pad->peer_name);
                 pad->port = jack_port_register (this->client, pad->name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput|JackPortIsTerminal, 0);
                 l = g_list_next (l);
             }
@@ -184,8 +184,8 @@ gst_jack_bin_change_state (GstElement *element)
             l = this->src_pads;
             while (l) {
                 pad = GST_JACK_PAD (l);
-                g_message ("connecting gst jack port %s to jack port %s", jack_port_name (pad->port), pad->peer_name);
-                if (jack_connect (this->client, jack_port_name (pad->port), pad->peer_name)) {
+                g_message ("connecting jack port %s to gst jack port %s", pad->peer_name, jack_port_name (pad->port));
+                if (jack_connect (this->client, pad->peer_name, jack_port_name (pad->port))) {
                     g_warning ("jack: could not connect %s and %s", pad->peer_name, jack_port_name (pad->port));
                     return GST_STATE_FAILURE;
                 }