summaryrefslogtreecommitdiffstats
path: root/ext/jack
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2002-08-23 04:04:11 +0000
committerAndy Wingo <wingo@pobox.com>2002-08-23 04:04:11 +0000
commitd2bdc966342da1145ca4fe5832cba7e6312b40a0 (patch)
tree56e70bfacb3c1af95c96bf705ba072b0711951dc /ext/jack
parentde7a0d3426727f219e69e1c9838bffd97cc6682d (diff)
downloadgst-plugins-bad-d2bdc966342da1145ca4fe5832cba7e6312b40a0.tar.gz
gst-plugins-bad-d2bdc966342da1145ca4fe5832cba7e6312b40a0.tar.bz2
gst-plugins-bad-d2bdc966342da1145ca4fe5832cba7e6312b40a0.zip
fix jack input port connection
Original commit message from CVS: fix jack input port connection
Diffstat (limited to 'ext/jack')
-rw-r--r--ext/jack/gstjack.c1
-rw-r--r--ext/jack/gstjackbin.c8
2 files changed, 5 insertions, 4 deletions
diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
index 3a9aef79..14e50d5e 100644
--- 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 64aab499..52222b65 100644
--- 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;
}