]> git.sesse.net Git - vlc/commitdiff
mediacontrol_core: libvlc_media_player_get_length/time return time in ms, no need...
authorOlivier Aubert <olivier.aubert@liris.cnrs.fr>
Fri, 8 Aug 2008 16:45:42 +0000 (18:45 +0200)
committerOlivier Aubert <olivier.aubert@liris.cnrs.fr>
Fri, 8 Aug 2008 16:45:42 +0000 (18:45 +0200)
Additionnaly, add check for exception.

src/control/mediacontrol_core.c

index 8ed878b9574ee810beb86be543737112bdbbe188..997f41247b18a32ab0c713b8796aec6fdf9878ab 100644 (file)
@@ -397,18 +397,21 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self,
         }
 
         retval->url = libvlc_media_get_mrl( p_media, &ex );
-
-        /* TIME and LENGTH are in microseconds. We want them in ms */
+       
         retval->position = libvlc_media_player_get_time( self->p_media_player, &ex );
+        if( libvlc_exception_raised( &ex ) )
+        {
+            libvlc_exception_clear( &ex );
+            retval->position = 0;
+        }
 
         retval->length = libvlc_media_player_get_length( self->p_media_player, &ex );
+        if( libvlc_exception_raised( &ex ) )
+        {
+            libvlc_exception_clear( &ex );
+            retval->length = 0;
+        }
 
-        retval->position = private_mediacontrol_unit_convert( self->p_media_player,
-                                         mediacontrol_MediaTime, a_key,
-                                         retval->position );
-        retval->length   = private_mediacontrol_unit_convert( self->p_media_player,
-                                         mediacontrol_MediaTime, a_key,
-                                         retval->length );
     }
     return retval;
 }