diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-10 16:23:14 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-10 16:23:14 +0100 |
| commit | 225e98d62349b94aed9e4e8158b62626ca3b1218 (patch) | |
| tree | bce712901ccd937f376affee6e35d28f15f333d4 /ext/jack/gstjackaudiosrc.c | |
| parent | 8eca20ead0cf8ce170de394f342726d28c593677 (diff) | |
| parent | 5b25f3737b488c3ddd7f5c2d4f9bd68a46e44da7 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
ext/flac/gstflacenc.c
ext/jack/gstjackaudioclient.c
ext/jack/gstjackaudiosink.c
ext/jack/gstjackaudiosrc.c
ext/pulse/plugin.c
ext/shout2/gstshout2.c
gst/matroska/matroska-mux.c
gst/rtp/gstrtph264pay.c
Diffstat (limited to 'ext/jack/gstjackaudiosrc.c')
| -rw-r--r-- | ext/jack/gstjackaudiosrc.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/ext/jack/gstjackaudiosrc.c b/ext/jack/gstjackaudiosrc.c index 417028c13..d0e7646a6 100644 --- a/ext/jack/gstjackaudiosrc.c +++ b/ext/jack/gstjackaudiosrc.c @@ -217,18 +217,6 @@ jack_process_cb (jack_nframes_t nframes, void *arg) channels = GST_AUDIO_INFO_CHANNELS (&buf->spec.info); - /* handle transport state requisitions */ - if (src->transport == GST_JACK_TRANSPORT_SLAVE) { - GstState state = gst_jack_audio_client_get_transport_state (src->client); - - if ((state != GST_STATE_VOID_PENDING) && (GST_STATE (src) != state)) { - GST_DEBUG_OBJECT (src, "requesting state change: %s", - gst_element_state_get_name (state)); - gst_element_post_message (GST_ELEMENT (src), - gst_message_new_request_state (GST_OBJECT (src), state)); - } - } - /* get input buffers */ for (i = 0; i < channels; i++) src->buffers[i] = |