Remove bogus vlc_object_wait (no condition to wait on)

[vlc] / src / control / mediacontrol_core.c

diff --git a/src/control/mediacontrol_core.c b/src/control/mediacontrol_core.c
index 8ed878b9574ee810beb86be543737112bdbbe188..67a4cbef8168099596e5100b0ca1c0dffbf5fa0a 100644 (file)
--- a/src/control/mediacontrol_core.c
+++ b/src/control/mediacontrol_core.c
@@ -330,6 +330,7 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self,
                                      mediacontrol_PositionKey a_key,
                                      mediacontrol_Exception *exception )
 {
+    (void)a_key;
     mediacontrol_StreamInformation *retval = NULL;
     libvlc_media_t * p_media;
     libvlc_exception_t ex;
@@ -379,12 +380,6 @@ mediacontrol_get_stream_information( mediacontrol_Instance *self,
         case libvlc_Stopped:
             retval->streamstatus = mediacontrol_StopStatus;
             break;
-        case libvlc_Forward:
-            retval->streamstatus = mediacontrol_ForwardStatus;
-            break;
-        case libvlc_Backward:
-            retval->streamstatus = mediacontrol_BackwardStatus;
-            break;
         case libvlc_Ended:
             retval->streamstatus = mediacontrol_EndStatus;
             break;
@@ -397,18 +392,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;
 }