X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmediacontrol_util.c;h=965f853e08c27b36a86d0f4a5859b192eb1c6b70;hb=595e377e334bff112c55d2799467173adff71001;hp=09e5b7423f2879f861e48373aaa46b4ae10c0bd7;hpb=37485818653989b5f4b8fbabfdc75198dfc84a05;p=vlc

diff --git a/src/control/mediacontrol_util.c b/src/control/mediacontrol_util.c
index 09e5b7423f..965f853e08 100644
--- a/src/control/mediacontrol_util.c
+++ b/src/control/mediacontrol_util.c
@@ -35,19 +35,12 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
-#include <errno.h>                                                 /* ENOMEM */
 #include <stdio.h>
-#include <ctype.h>
 
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#endif
+#include <sys/types.h>
 
 libvlc_time_t private_mediacontrol_unit_convert( libvlc_media_player_t *p_media_player,
                                                  mediacontrol_PositionKey from,
@@ -73,10 +66,8 @@ libvlc_time_t private_mediacontrol_unit_convert( libvlc_media_player_t *p_media_
         if( to == mediacontrol_SampleCount )
         {
             double f_fps;
-            libvlc_exception_t ex;
-            libvlc_exception_init( &ex );
 
-            f_fps = libvlc_media_player_get_rate( p_media_player, &ex );
+            f_fps = libvlc_media_player_get_rate( p_media_player );
             if( f_fps < 0 )
                 return 0;
             else
@@ -89,10 +80,8 @@ libvlc_time_t private_mediacontrol_unit_convert( libvlc_media_player_t *p_media_
     case mediacontrol_SampleCount:
     {
         double f_fps;
-        libvlc_exception_t ex;
-        libvlc_exception_init( &ex );
 
-        f_fps = libvlc_media_player_get_rate( p_media_player, &ex );
+        f_fps = libvlc_media_player_get_rate( p_media_player );
         if( f_fps < 0 )
             return 0;
 
@@ -136,16 +125,14 @@ private_mediacontrol_position2microsecond( libvlc_media_player_t * p_media_playe
     {
         libvlc_time_t l_time = 0;
         libvlc_time_t l_pos = 0;
-        libvlc_exception_t ex;
-        libvlc_exception_init( &ex );
 
-        l_time = libvlc_media_player_get_time( p_media_player, &ex );
+        l_time = libvlc_media_player_get_time( p_media_player );
         /* Ignore exception, we will assume a 0 time value */
 
         l_pos = private_mediacontrol_unit_convert( p_media_player,
-						   pos->key,
-						   mediacontrol_MediaTime,
-						   pos->value );
+                                                   pos->key,
+                                                   mediacontrol_MediaTime,
+                                                   pos->value );
         return 1000 * ( l_time + l_pos );
         break;
     }
@@ -154,20 +141,18 @@ private_mediacontrol_position2microsecond( libvlc_media_player_t * p_media_playe
         libvlc_time_t l_time = 0;
         libvlc_time_t l_length = 0;
         libvlc_time_t l_pos = 0;
-        libvlc_exception_t ex;
-        libvlc_exception_init( &ex );
 
-        l_length = libvlc_media_player_get_length( p_media_player, &ex );
+        l_length = libvlc_media_player_get_length( p_media_player );
         if( l_length <= 0 )
             return 0;
 
-        l_time = libvlc_media_player_get_time( p_media_player, &ex );
+        l_time = libvlc_media_player_get_time( p_media_player );
         /* Ignore exception, we will assume a 0 time value */
 
         l_pos = private_mediacontrol_unit_convert( p_media_player,
-						   pos->key,
-						   mediacontrol_MediaTime,
-						   pos->value );
+                                                   pos->key,
+                                                   mediacontrol_MediaTime,
+                                                   pos->value );
 
         return 1000 * ( ( l_time + l_pos ) % l_length );
         break;
@@ -245,7 +230,7 @@ mediacontrol_exception_free( mediacontrol_Exception *exception )
  */
 mediacontrol_RGBPicture*
 private_mediacontrol_createRGBPicture( int i_width, int i_height, long i_chroma, int64_t l_date,
-				       char* p_data, int i_datasize )
+                                       char* p_data, int i_datasize )
 {
     mediacontrol_RGBPicture *retval;