From 6c73f3f7a75e2150ff010788f7ec82456deb5766 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 10 Jan 2005 13:15:11 +0000 Subject: [PATCH] gst/playback/gstplaybasebin.c: Don't disable streamtype if the stream doesn't exist, since then playing a video after... Original commit message from CVS: * gst/playback/gstplaybasebin.c: (setup_substreams): Don't disable streamtype if the stream doesn't exist, since then playing a video after audio will disable both and nothing will happen. Fixes the testsuite. --- ChangeLog | 7 +++++++ gst/playback/gstplaybasebin.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3cdf3a8..e306119 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-01-10 Ronald S. Bultje + * gst/playback/gstplaybasebin.c: (setup_substreams): + Don't disable streamtype if the stream doesn't exist, since + then playing a video after audio will disable both and nothing + will happen. Fixes the testsuite. + +2005-01-10 Ronald S. Bultje + * sys/v4l/gstv4lxoverlay.c: (gst_v4l_xoverlay_interface_init), (gst_v4l_xoverlay_set_xwindow_id): * sys/v4l2/gstv4l2xoverlay.c: (gst_v4l2_xoverlay_interface_init), diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c index 2a7c614..f296ceb 100644 --- a/gst/playback/gstplaybasebin.c +++ b/gst/playback/gstplaybasebin.c @@ -1044,10 +1044,12 @@ setup_substreams (GstPlayBaseBin * play_base_bin) } } - /* now check if the requested current streams exist */ + /* now check if the requested current streams exist. If + * current >= num_streams, decrease current so at least + * we have output. Always keep it enabled. */ for (n = 0; n < NUM_TYPES; n++) { if (play_base_bin->current[n] >= group->type[n].npads) { - play_base_bin->current[n] = group->type[n].npads > 0 ? 0 : -1; + play_base_bin->current[n] = 0; } } -- 2.7.4