summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2002-06-02 13:25:40 +0000
committerWim Taymans <wim.taymans@gmail.com>2002-06-02 13:25:40 +0000
commit6bb455cdc9da41aa72ecf8c8b207ec29a3f933c5 (patch)
tree855b87083dfb1c28ace369b31517de9caf0a458d /sys
parent8b094e02a991f2599325012de557a9235a934a90 (diff)
Make elements nanoseconds aware
Original commit message from CVS: Make elements nanoseconds aware
Diffstat (limited to 'sys')
-rw-r--r--sys/oss/gstosssink.c1
-rw-r--r--sys/oss/gstosssrc.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index c0bc4bd3..dbd66701 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -462,6 +462,7 @@ gst_osssink_get_clock (GstElement *element)
osssink = GST_OSSSINK (element);
+ return NULL;
return GST_CLOCK (osssink->provided_clock);
}
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index f8d0c11c..6799f658 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -232,7 +232,7 @@ gst_osssrc_get (GstPad *pad)
GST_BUFFER_SIZE (buf) = readbytes;
GST_BUFFER_OFFSET (buf) = src->curoffset;
GST_BUFFER_TIMESTAMP (buf) = src->basetime +
- src->samples_since_basetime * 1000000LL / src->frequency;
+ src->samples_since_basetime * GST_SECOND / src->frequency;
src->curoffset += readbytes;
readsamples = readbytes / src->channels;
@@ -265,7 +265,7 @@ gst_osssrc_set_property (GObject *object, guint prop_id, const GValue *value, GP
break;
case ARG_FREQUENCY:
/* Preserve the timestamps */
- src->basetime = src->samples_since_basetime * 1000000LL / src->frequency;
+ src->basetime = src->samples_since_basetime * GST_SECOND / src->frequency;
src->samples_since_basetime = 0;
src->frequency = g_value_get_int (value);