vlc | branch: master | Steve Lhomme <[email protected]> | Wed Jul  4 16:58:59 
2018 +0200| [641fb7d9584f0348246f5622b683b7471b1d5ee0] | committer: Steve Lhomme

dbus_player: return the ticks in microseconds

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=641fb7d9584f0348246f5622b683b7471b1d5ee0
---

 modules/control/dbus/dbus_player.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/control/dbus/dbus_player.c 
b/modules/control/dbus/dbus_player.c
index 133b9c5b54..035e5407d5 100644
--- a/modules/control/dbus/dbus_player.c
+++ b/modules/control/dbus/dbus_player.c
@@ -51,7 +51,7 @@ MarshalPosition( intf_thread_t *p_intf, DBusMessageIter 
*container )
         i_pos = 0;
     else
     {
-        i_pos = var_GetInteger( p_input, "time" );
+        i_pos = US_FROM_VLC_TICK(var_GetInteger( p_input, "time" ));
         vlc_object_release( p_input );
     }
 
@@ -99,7 +99,7 @@ DBUS_METHOD( SetPosition )
 
     if( input != NULL )
     {
-        var_SetInteger( input, "time", i_pos );
+        var_SetInteger( input, "time", VLC_TICK_FROM_US(i_pos) );
         vlc_object_release( input );
     }
 
@@ -130,7 +130,7 @@ DBUS_METHOD( Seek )
     if( p_input && var_GetBool( p_input, "can-seek" ) )
     {
         vlc_tick_t i_pos = var_GetInteger( p_input, "time" ) + i_step;
-        var_SetInteger( p_input, "time", (i_pos >= 0) ? i_pos : 0 );
+        var_SetInteger( p_input, "time", (i_pos >= 0) ? 
VLC_TICK_FROM_US(i_pos) : 0 );
     }
 
     if( p_input )
@@ -547,7 +547,7 @@ DBUS_SIGNAL( SeekedSignal )
 
     if( p_input )
     {
-        i_pos = var_GetInteger( p_input, "time" );
+        i_pos = US_FROM_VLC_TICK(var_GetInteger( p_input, "time" ));
         vlc_object_release( p_input );
     }
 

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to