diff options
| author | Benjamin Otte <otte@gnome.org> | 2004-01-14 00:53:52 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2004-01-14 00:53:52 +0000 |
| commit | 9a9f767369ed4ddc8803e62bfcdb9403813220d5 (patch) | |
| tree | 46d7e710a9ae199b81fe480b33e21223c778176b /ext/libcaca | |
| parent | f4c6604e6c4295d1c580860386f7e69ea50dcdaa (diff) | |
use element time.
Original commit message from CVS:
2004-01-14 Benjamin Otte <in7y118@public.uni-hamburg.de>
* ext/aalib/gstaasink.c: (gst_aasink_chain):
* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event):
* ext/esd/esdsink.c: (gst_esdsink_chain):
* ext/libcaca/gstcacasink.c: (gst_cacasink_chain):
* ext/mas/massink.c: (gst_massink_chain):
* ext/sdl/sdlvideosink.c: (gst_sdlvideosink_chain):
* gst/matroska/matroska-demux.c: (gst_matroska_demux_parse_index),
(gst_matroska_demux_parse_metadata):
* gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_loop),
(gst_mpeg_parse_release_locks):
* gst/tcp/gsttcpsink.c: (gst_tcpsink_chain):
* gst/udp/gstudpsink.c: (gst_udpsink_chain):
* gst/videotestsrc/gstvideotestsrc.c: (gst_videotestsrc_get):
* sys/oss/gstosssink.c: (gst_osssink_init), (gst_osssink_chain),
(gst_osssink_change_state):
* sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_chain):
* sys/ximage/ximagesink.c: (gst_ximagesink_chain):
* sys/xvideo/xvideosink.c: (gst_xvideosink_chain),
(gst_xvideosink_release_locks):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_chain):
use element time.
* ext/alsa/gstalsaclock.c: (gst_alsa_clock_start),
(gst_alsa_clock_stop):
* gst-libs/gst/audio/audioclock.c: (gst_audio_clock_set_active),
(gst_audio_clock_get_internal_time):
simplify for use with new clocking code.
* testsuite/alsa/Makefile.am:
* testsuite/alsa/sinesrc.c: (sinesrc_init), (sinesrc_force_caps):
fix testsuite for new caps system
Diffstat (limited to 'ext/libcaca')
| -rw-r--r-- | ext/libcaca/gstcacasink.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ext/libcaca/gstcacasink.c b/ext/libcaca/gstcacasink.c index 1cd674e5..dfd66519 100644 --- a/ext/libcaca/gstcacasink.c +++ b/ext/libcaca/gstcacasink.c @@ -335,19 +335,11 @@ gst_cacasink_chain (GstPad *pad, GstData *_data) cacasink = GST_CACASINK (gst_pad_get_parent (pad)); - if (GST_VIDEOSINK_CLOCK (cacasink) && time != -1) { - GstClockReturn ret; - - cacasink->id = gst_clock_new_single_shot_id ( - GST_VIDEOSINK_CLOCK (cacasink), time); - + if (cacasink->clock && GST_CLOCK_TIME_IS_VALID (time)) { GST_DEBUG ("videosink: clock %s wait: %" G_GUINT64_FORMAT " %u", GST_OBJECT_NAME (GST_VIDEOSINK_CLOCK (cacasink)), time, GST_BUFFER_SIZE (buf)); - - ret = gst_clock_id_wait (cacasink->id, &jitter); - gst_clock_id_free (cacasink->id); - cacasink->id = NULL; + gst_element_wait (GST_ELEMENT (cacasink), GST_BUFFER_TIMESTAMP (buf)); } caca_clear (); |