mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 14:26:43 +00:00
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.
This commit is contained in:
parent
750b054a42
commit
6c73f3f7a7
2 changed files with 11 additions and 2 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2005-01-10 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
|
* 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 <rbultje@ronald.bitfreak.net>
|
2005-01-10 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
* sys/v4l/gstv4lxoverlay.c: (gst_v4l_xoverlay_interface_init),
|
* sys/v4l/gstv4lxoverlay.c: (gst_v4l_xoverlay_interface_init),
|
||||||
|
|
|
@ -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++) {
|
for (n = 0; n < NUM_TYPES; n++) {
|
||||||
if (play_base_bin->current[n] >= group->type[n].npads) {
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue