mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 05:05:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/playback/gstplaybin.c: Don't assume the user provided sinks are named "sink"...

Browse source 
Original commit message from CVS:
* gst/playback/gstplaybin.c: (gst_play_bin_set_property),
(gen_video_element), (gen_audio_element), (setup_sinks):
Don't assume the user provided sinks are named "sink"...
This commit is contained in:
Wim Taymans 2004-10-08 17:39:28 +00:00
parent f1684d7324
commit b6fd3e4990
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,9 @@
2004-10-08 Wim Taymans <wim@fluendo.com>
* gst/playback/gstplaybin.c: (gst_play_bin_set_property),
(gen_video_element), (gen_audio_element), (setup_sinks):
Don't assume the user provided sinks are named "sink"...
2004-10-08 Wim Taymans <wim@fluendo.com>
* gst/playback/gstplaybasebin.c: (gen_preroll_element),
@ -16,8 +22,8 @@
(cdparanoia_uri_get_protocols), (cdparanoia_uri_get_uri),
(cdparanoia_uri_set_uri), (cdparanoia_uri_handler_init):
* ext/cdparanoia/gstcdparanoia.h:
Added reworked patch from #154903 from milosz derezynski. This
adds the cdda://<tracknum> uri.
Added reworked patch from #154903 from milosz derezynski (deadchip).
This adds the cdda://<tracknum> uri.
2004-10-08 Wim Taymans <wim@fluendo.com>

6
gst/playback/gstplaybin.c
View file

@ -307,7 +307,7 @@ gen_video_element (GstPlayBin * play_bin)
element = g_hash_table_lookup (play_bin->cache, "vbin");
if (element != NULL) {
g_object_ref (G_OBJECT (element));
sink = gst_bin_get_by_name (GST_BIN (element), "sink");
sink = g_hash_table_lookup (play_bin->cache, "video_sink");
goto done;
}
@ -320,6 +320,7 @@ gen_video_element (GstPlayBin * play_bin)
} else {
sink = gst_element_factory_make ("ximagesink", "sink");
}
g_hash_table_insert (play_bin->cache, "video_sink", sink);
gst_bin_add (GST_BIN (element), conv);
gst_bin_add (GST_BIN (element), scale);
@ -354,7 +355,7 @@ gen_audio_element (GstPlayBin * play_bin)
element = g_hash_table_lookup (play_bin->cache, "abin");
if (element != NULL) {
g_object_ref (G_OBJECT (element));
sink = gst_bin_get_by_name (GST_BIN (element), "sink");
sink = g_hash_table_lookup (play_bin->cache, "audio_sink");
goto done;
}
element = gst_bin_new ("abin");
@ -371,6 +372,7 @@ gen_audio_element (GstPlayBin * play_bin)
} else {
sink = gst_element_factory_make ("osssink", "sink");
}
g_hash_table_insert (play_bin->cache, "audio_sink", sink);
gst_bin_add (GST_BIN (element), conv);
gst_bin_add (GST_BIN (element), scale);