diff options
| author |  nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-12 17:19:56 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-12 17:19:56 +0000 |
| commit | 6e28f63e36321ad554646b9598f2b1f258620b84 (patch) | |
| tree | be9a189de2782508013242fa38554493976351e2 /stream | |
| parent | 72023719ba723203df4d07b979ea6c476524e187 (diff) | |
consistency fix: STREAM_CTRL_GET_TIME_LENGTH and STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20867 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream_dvd.c | 5 | ||||
| -rw-r--r-- | stream/stream_dvdnav.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index c7a5946457..ddbe637880 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -633,7 +633,7 @@ static int control(stream_t *stream,int cmd,void* arg) { case STREAM_CTRL_GET_TIME_LENGTH: { - *((unsigned int *)arg) = mp_get_titleset_length(d->vts_file, d->tt_srpt, d->cur_title-1); + *((double *)arg) = (double) mp_get_titleset_length(d->vts_file, d->tt_srpt, d->cur_title-1)/1000.0; return 1; } case STREAM_CTRL_GET_NUM_CHAPTERS: @@ -663,8 +663,7 @@ static int control(stream_t *stream,int cmd,void* arg) if(stream_cache_size > 0) return STREAM_UNSUPORTED; tm = dvd_get_current_time(stream, 0); if(tm != -1) { - tm *= 1000.0f; - *((unsigned int *)arg) = (unsigned int) tm; + *((double *)arg) = tm; return 1; } break; diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 4d2f2686b5..57e2de633c 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -279,7 +279,7 @@ static int control(stream_t *stream, int cmd, void* arg) { { if(priv->duration) { - *((unsigned int *)arg) = priv->duration; + *((double *)arg) = (double)priv->duration / 1000.0; return 1; } break; |