mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 06:54:49 +00:00
fix jack input port connection
Original commit message from CVS: fix jack input port connection
This commit is contained in:
parent
de7a0d3426
commit
d2bdc96634
2 changed files with 5 additions and 4 deletions
|
@ -471,6 +471,7 @@ gst_jack_loop (GstElement *element)
|
||||||
GST_BUFFER_DATA (buffer) = pad->data;
|
GST_BUFFER_DATA (buffer) = pad->data;
|
||||||
GST_BUFFER_SIZE (buffer) = len;
|
GST_BUFFER_SIZE (buffer) = len;
|
||||||
GST_BUFFER_MAXSIZE (buffer) = len;
|
GST_BUFFER_MAXSIZE (buffer) = len;
|
||||||
|
GST_BUFFER_FLAG_SET(buffer, GST_BUFFER_DONTFREE);
|
||||||
|
|
||||||
gst_pad_push (pad->pad, buffer);
|
gst_pad_push (pad->pad, buffer);
|
||||||
}
|
}
|
||||||
|
|
|
@ -160,14 +160,14 @@ gst_jack_bin_change_state (GstElement *element)
|
||||||
l = this->src_pads;
|
l = this->src_pads;
|
||||||
while (l) {
|
while (l) {
|
||||||
pad = GST_JACK_PAD (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);
|
pad->port = jack_port_register (this->client, pad->name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput|JackPortIsTerminal, 0);
|
||||||
l = g_list_next (l);
|
l = g_list_next (l);
|
||||||
}
|
}
|
||||||
l = this->sink_pads;
|
l = this->sink_pads;
|
||||||
while (l) {
|
while (l) {
|
||||||
pad = GST_JACK_PAD (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);
|
pad->port = jack_port_register (this->client, pad->name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput|JackPortIsTerminal, 0);
|
||||||
l = g_list_next (l);
|
l = g_list_next (l);
|
||||||
}
|
}
|
||||||
|
@ -184,8 +184,8 @@ gst_jack_bin_change_state (GstElement *element)
|
||||||
l = this->src_pads;
|
l = this->src_pads;
|
||||||
while (l) {
|
while (l) {
|
||||||
pad = GST_JACK_PAD (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);
|
g_message ("connecting jack port %s to gst jack port %s", pad->peer_name, jack_port_name (pad->port));
|
||||||
if (jack_connect (this->client, jack_port_name (pad->port), pad->peer_name)) {
|
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));
|
g_warning ("jack: could not connect %s and %s", pad->peer_name, jack_port_name (pad->port));
|
||||||
return GST_STATE_FAILURE;
|
return GST_STATE_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue