mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-24 06:56:26 +00:00
- UNITS -> DEFAULT
Original commit message from CVS: - UNITS -> DEFAULT - small seek updates
This commit is contained in:
parent
0faa83dc40
commit
fe40d42ec3
1 changed files with 6 additions and 13 deletions
|
@ -278,7 +278,9 @@ print_track_info (GstCDAudio *cdaudio)
|
||||||
gint i;
|
gint i;
|
||||||
|
|
||||||
for (i = 0; i < cdaudio->info.disc_total_tracks; i++) {
|
for (i = 0; i < cdaudio->info.disc_total_tracks; i++) {
|
||||||
g_print ("%d %d:%02d\n", i,
|
g_print ("%d %d %d %d:%02d\n", i,
|
||||||
|
cdaudio->info.disc_track[i].track_length.frames,
|
||||||
|
cdaudio->info.disc_track[i].track_pos.frames,
|
||||||
cdaudio->info.disc_track[i].track_length.minutes,
|
cdaudio->info.disc_track[i].track_length.minutes,
|
||||||
cdaudio->info.disc_track[i].track_length.seconds);
|
cdaudio->info.disc_track[i].track_length.seconds);
|
||||||
}
|
}
|
||||||
|
@ -371,12 +373,7 @@ gst_cdaudio_send_event (GstElement *element, GstEvent *event)
|
||||||
switch (GST_EVENT_SEEK_FORMAT (event)) {
|
switch (GST_EVENT_SEEK_FORMAT (event)) {
|
||||||
case GST_FORMAT_TIME:
|
case GST_FORMAT_TIME:
|
||||||
{
|
{
|
||||||
struct disc_timeval time;
|
cd_play_pos (cdaudio->cd_desc, 1, GST_EVENT_SEEK_OFFSET (event) / (60 * GST_SECOND));
|
||||||
|
|
||||||
time.minutes = GST_EVENT_SEEK_OFFSET (event) / (60 * GST_SECOND);
|
|
||||||
time.seconds = (GST_EVENT_SEEK_OFFSET (event) / GST_SECOND) % 60;
|
|
||||||
|
|
||||||
cd_advance (cdaudio->cd_desc, time);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
@ -398,7 +395,7 @@ gst_cdaudio_get_formats (GstElement *element)
|
||||||
static GstFormat formats[] = {
|
static GstFormat formats[] = {
|
||||||
GST_FORMAT_TIME,
|
GST_FORMAT_TIME,
|
||||||
GST_FORMAT_BYTES,
|
GST_FORMAT_BYTES,
|
||||||
GST_FORMAT_UNITS,
|
GST_FORMAT_DEFAULT,
|
||||||
0, /* fillted below */
|
0, /* fillted below */
|
||||||
0, /* fillted below */
|
0, /* fillted below */
|
||||||
0,
|
0,
|
||||||
|
@ -444,7 +441,7 @@ gst_cdaudio_query (GstElement *element, GstQueryType type,
|
||||||
|
|
||||||
/* take new snapshot every 100000 miliseconds */
|
/* take new snapshot every 100000 miliseconds */
|
||||||
seconds = g_timer_elapsed (cdaudio->timer, µs);
|
seconds = g_timer_elapsed (cdaudio->timer, µs);
|
||||||
if (micros > 100000) {
|
if (micros > 100000 || seconds > 1) {
|
||||||
cd_stat (cdaudio->cd_desc, &cdaudio->info);
|
cd_stat (cdaudio->cd_desc, &cdaudio->info);
|
||||||
g_timer_start (cdaudio->timer);
|
g_timer_start (cdaudio->timer);
|
||||||
}
|
}
|
||||||
|
@ -452,8 +449,6 @@ gst_cdaudio_query (GstElement *element, GstQueryType type,
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case GST_QUERY_TOTAL:
|
case GST_QUERY_TOTAL:
|
||||||
switch (*format) {
|
switch (*format) {
|
||||||
case GST_FORMAT_DEFAULT:
|
|
||||||
*format = GST_FORMAT_TIME;
|
|
||||||
case GST_FORMAT_TIME:
|
case GST_FORMAT_TIME:
|
||||||
*value = (cdaudio->info.disc_length.minutes * 60 +
|
*value = (cdaudio->info.disc_length.minutes * 60 +
|
||||||
cdaudio->info.disc_length.seconds) * GST_SECOND;
|
cdaudio->info.disc_length.seconds) * GST_SECOND;
|
||||||
|
@ -472,8 +467,6 @@ gst_cdaudio_query (GstElement *element, GstQueryType type,
|
||||||
break;
|
break;
|
||||||
case GST_QUERY_POSITION:
|
case GST_QUERY_POSITION:
|
||||||
switch (*format) {
|
switch (*format) {
|
||||||
case GST_FORMAT_DEFAULT:
|
|
||||||
*format = GST_FORMAT_TIME;
|
|
||||||
case GST_FORMAT_TIME:
|
case GST_FORMAT_TIME:
|
||||||
*value = (cdaudio->info.disc_time.minutes * 60 +
|
*value = (cdaudio->info.disc_time.minutes * 60 +
|
||||||
cdaudio->info.disc_time.seconds) * GST_SECOND;
|
cdaudio->info.disc_time.seconds) * GST_SECOND;
|
||||||
|
|
Loading…
Reference in a new issue