[vlc-commits] core: transform vlc_tick_t value to milliseconds with MS_FROM_VLC_TICK

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Sat May  5 09:39:05 2018 +0200| [8c8d28e377f09c616b42f032a9663ab93e5fc48e] | committer: Steve Lhomme

core: transform vlc_tick_t value to milliseconds with MS_FROM_VLC_TICK

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

 src/libvlc-module.c | 8 ++++----
 src/network/tcp.c   | 2 +-
 src/network/tls.c   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 2cb2e4b905..0ce952a494 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1861,12 +1861,12 @@ vlc_module_begin ()
 
     set_section( N_( "Advanced" ), NULL )
 
-    add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000,
+    add_integer( "file-caching", MS_FROM_VLC_TICK(DEFAULT_PTS_DELAY),
                  CACHING_TEXT, CACHING_LONGTEXT, true )
         change_integer_range( 0, 60000 )
         change_safe()
     add_obsolete_integer( "vdr-caching" ) /* 2.0.0 */
-    add_integer( "live-caching", DEFAULT_PTS_DELAY / 1000,
+    add_integer( "live-caching", MS_FROM_VLC_TICK(DEFAULT_PTS_DELAY),
                  CAPTURE_CACHING_TEXT, CAPTURE_CACHING_LONGTEXT, true )
         change_integer_range( 0, 60000 )
         change_safe()
@@ -1881,7 +1881,7 @@ vlc_module_begin ()
     add_obsolete_integer( "oss-caching" ) /* 2.0.0 */
     add_obsolete_integer( "screen-caching" ) /* 2.0.0 */
     add_obsolete_integer( "v4l2-caching" ) /* 2.0.0 */
-    add_integer( "disc-caching", DEFAULT_PTS_DELAY / 1000,
+    add_integer( "disc-caching", MS_FROM_VLC_TICK(DEFAULT_PTS_DELAY),
                  DISC_CACHING_TEXT, DISC_CACHING_LONGTEXT, true )
         change_integer_range( 0, 60000 )
         change_safe()
@@ -1891,7 +1891,7 @@ vlc_module_begin ()
     add_obsolete_integer( "dvdnav-caching" ) /* 2.0.0 */
     add_obsolete_integer( "dvdread-caching" ) /* 2.0.0 */
     add_obsolete_integer( "vcd-caching" ) /* 2.0.0 */
-    add_integer( "network-caching", CLOCK_FREQ / 1000,
+    add_integer( "network-caching", MS_FROM_VLC_TICK(1),
                  NETWORK_CACHING_TEXT, NETWORK_CACHING_LONGTEXT, true )
         change_integer_range( 0, 60000 )
         change_safe()
diff --git a/src/network/tcp.c b/src/network/tcp.c
index 007a9c813b..f289e5c01a 100644
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -174,7 +174,7 @@ int net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
                 if (now > deadline)
                     now = deadline;
 
-                val = vlc_poll_i11e(&ufd, 1, (deadline - now) / 1000);
+                val = vlc_poll_i11e(&ufd, 1, MS_FROM_VLC_TICK(deadline - now));
             }
             while (val == -1 && errno == EINTR);
 
diff --git a/src/network/tls.c b/src/network/tls.c
index 473b36ab89..f94196b5f8 100644
--- a/src/network/tls.c
+++ b/src/network/tls.c
@@ -194,7 +194,7 @@ error:
         ufd[0] .events = (val == 1) ? POLLIN : POLLOUT;
 
         vlc_restorecancel(canc);
-        val = vlc_poll_i11e(ufd, 1, (deadline - now) / 1000);
+        val = vlc_poll_i11e(ufd, 1, MS_FROM_VLC_TICK(deadline - now));
         canc = vlc_savecancel();
         if (val == 0)
         {