mediacontrol: libvlc_media_player_get_time/get_length return times in ms

[vlc] / src / control / mediacontrol_util.c

diff --git a/src/control/mediacontrol_util.c b/src/control/mediacontrol_util.c
index 9d091b818075ec98313d0ac0ea3889344ef12684..e86646fb1a92b45759f0a93c3d56b372d17b24fb 100644 (file)
--- a/src/control/mediacontrol_util.c
+++ b/src/control/mediacontrol_util.c
@@ -25,12 +25,12 @@
 # include "config.h"
 #endif
 
+#include "mediacontrol_internal.h"
 #include <vlc/mediacontrol.h>
 
 #include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>
-#include "mediacontrol_internal.h"
 
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
@@ -142,11 +142,11 @@ private_mediacontrol_position2microsecond( libvlc_media_player_t * p_media_playe
         l_time = libvlc_media_player_get_time( p_media_player, &ex );
         /* Ignore exception, we will assume a 0 time value */
 
-        l_pos = 1000 * private_mediacontrol_unit_convert( p_media_player,
-                                                          pos->key,
-                                                          mediacontrol_MediaTime,
-                                                          pos->value );
-        return l_time + l_pos;
+        l_pos = private_mediacontrol_unit_convert( p_media_player,
+                                                  pos->key,
+                                                  mediacontrol_MediaTime,
+                                                  pos->value );
+        return 1000 * ( l_time + l_pos );
         break;
     }
     case mediacontrol_ModuloPosition:
@@ -164,12 +164,12 @@ private_mediacontrol_position2microsecond( libvlc_media_player_t * p_media_playe
         l_time = libvlc_media_player_get_time( p_media_player, &ex );
         /* Ignore exception, we will assume a 0 time value */
 
-        l_pos = ( 1000 * private_mediacontrol_unit_convert( p_media_player,
-                                                            pos->key,
-                                                            mediacontrol_MediaTime,
-                                                            pos->value ) );
+        l_pos = private_mediacontrol_unit_convert( p_media_player,
+                                                  pos->key,
+                                                  mediacontrol_MediaTime,
+                                                  pos->value );
 
-        return ( l_time + l_pos ) % l_length;
+        return 1000 * ( ( l_time + l_pos ) % l_length );
         break;
     }
     }