Commit 5de95525 authored by Wim Taymans's avatar Wim Taymans

UNIT -> UNITS

Original commit message from CVS:
UNIT -> UNITS
parent 97a7f4a3
...@@ -370,7 +370,7 @@ gst_vorbisfile_loop (GstElement *element) ...@@ -370,7 +370,7 @@ gst_vorbisfile_loop (GstElement *element)
} }
} }
break; break;
case GST_FORMAT_UNIT: case GST_FORMAT_UNITS:
if (vorbisfile->seek_accurate) { if (vorbisfile->seek_accurate) {
if (ov_pcm_seek (&vorbisfile->vf, (gdouble) vorbisfile->seek_value / GST_SECOND) == 0) { if (ov_pcm_seek (&vorbisfile->vf, (gdouble) vorbisfile->seek_value / GST_SECOND) == 0) {
vorbisfile->need_discont = TRUE; vorbisfile->need_discont = TRUE;
...@@ -398,7 +398,7 @@ gst_vorbisfile_loop (GstElement *element) ...@@ -398,7 +398,7 @@ gst_vorbisfile_loop (GstElement *element)
samples = (gint64) (ov_pcm_tell (&vorbisfile->vf)); samples = (gint64) (ov_pcm_tell (&vorbisfile->vf));
discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time, discont = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, time,
GST_FORMAT_UNIT, samples, NULL); GST_FORMAT_UNITS, samples, NULL);
vorbisfile->need_discont = FALSE; vorbisfile->need_discont = FALSE;
gst_pad_push (vorbisfile->srcpad, GST_BUFFER (discont)); gst_pad_push (vorbisfile->srcpad, GST_BUFFER (discont));
...@@ -468,7 +468,7 @@ gst_vorbisfile_src_query (GstPad *pad, GstPadQueryType type, ...@@ -468,7 +468,7 @@ gst_vorbisfile_src_query (GstPad *pad, GstPadQueryType type,
case GST_PAD_QUERY_TOTAL: case GST_PAD_QUERY_TOTAL:
{ {
switch (*format) { switch (*format) {
case GST_FORMAT_UNIT: case GST_FORMAT_UNITS:
*value = ov_pcm_total (&vorbisfile->vf, -1); *value = ov_pcm_total (&vorbisfile->vf, -1);
break; break;
case GST_FORMAT_BYTES: case GST_FORMAT_BYTES:
...@@ -494,7 +494,7 @@ gst_vorbisfile_src_query (GstPad *pad, GstPadQueryType type, ...@@ -494,7 +494,7 @@ gst_vorbisfile_src_query (GstPad *pad, GstPadQueryType type,
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
*value = (gint64) (ov_time_tell (&vorbisfile->vf) * GST_SECOND); *value = (gint64) (ov_time_tell (&vorbisfile->vf) * GST_SECOND);
break; break;
case GST_FORMAT_UNIT: case GST_FORMAT_UNITS:
*value = ov_pcm_tell (&vorbisfile->vf); *value = ov_pcm_tell (&vorbisfile->vf);
break; break;
default: default:
...@@ -530,10 +530,10 @@ gst_vorbisfile_src_event (GstPad *pad, GstEvent *event) ...@@ -530,10 +530,10 @@ gst_vorbisfile_src_event (GstPad *pad, GstEvent *event)
vorbisfile->seek_format = GST_FORMAT_TIME; vorbisfile->seek_format = GST_FORMAT_TIME;
vorbisfile->seek_accurate = GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_ACCURATE; vorbisfile->seek_accurate = GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_ACCURATE;
break; break;
case GST_FORMAT_UNIT: case GST_FORMAT_UNITS:
vorbisfile->seek_pending = TRUE; vorbisfile->seek_pending = TRUE;
vorbisfile->seek_value = GST_EVENT_SEEK_OFFSET (event); vorbisfile->seek_value = GST_EVENT_SEEK_OFFSET (event);
vorbisfile->seek_format = GST_FORMAT_UNIT; vorbisfile->seek_format = GST_FORMAT_UNITS;
vorbisfile->seek_accurate = GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_ACCURATE; vorbisfile->seek_accurate = GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_ACCURATE;
break; break;
default: default:
......
...@@ -313,7 +313,7 @@ static seek_format seek_formats[] = ...@@ -313,7 +313,7 @@ static seek_format seek_formats[] =
{ {
{ "tim", GST_FORMAT_TIME }, { "tim", GST_FORMAT_TIME },
{ "byt", GST_FORMAT_BYTES }, { "byt", GST_FORMAT_BYTES },
{ "unt", GST_FORMAT_UNIT }, { "unt", GST_FORMAT_UNITS },
{ "buf", GST_FORMAT_BUFFERS }, { "buf", GST_FORMAT_BUFFERS },
{ "def", GST_FORMAT_DEFAULT }, { "def", GST_FORMAT_DEFAULT },
{ NULL, 0 }, { NULL, 0 },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment