[vlc-commits] modules: the "disc-caching" is always translated to a vlc_tick_t

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jul  6 10:08:08 2018 +0200| [43bb27d91ce344eee93df3c956cd2513e3eecc3c] | committer: Steve Lhomme

modules: the "disc-caching" is always translated to a vlc_tick_t

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

 modules/access/bluray.c  | 2 +-
 modules/access/cdda.c    | 2 +-
 modules/access/dvdnav.c  | 2 +-
 modules/access/dvdread.c | 2 +-
 modules/access/vcd/vcd.c | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index fd7b586281..e8fc3a451a 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -1832,7 +1832,7 @@ static int blurayControl(demux_t *p_demux, int query, va_list args)
 
     case DEMUX_GET_PTS_DELAY:
         pi_64 = va_arg(args, int64_t *);
-        *pi_64 = INT64_C(1000) * var_InheritInteger(p_demux, "disc-caching");
+        *pi_64 = VLC_TICK_FROM_MS(var_InheritInteger(p_demux, "disc-caching"));
         break;
 
     case DEMUX_SET_PAUSE_STATE:
diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 73e0ca7a75..f663c62bbb 100644
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -181,7 +181,7 @@ static int DemuxControl(demux_t *demux, int query, va_list args)
             break;
         case DEMUX_GET_PTS_DELAY:
             *va_arg(args, int64_t *) =
-                INT64_C(1000) * var_InheritInteger(demux, "disc-caching");
+                VLC_TICK_FROM_MS( var_InheritInteger(demux, "disc-caching") );
             break;
 
         case DEMUX_SET_PAUSE_STATE:
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index d078d5a016..ce6ba356a3 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -700,7 +700,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             *va_arg( args, int64_t * ) =
-                INT64_C(1000) * var_InheritInteger( p_demux, "disc-caching" );
+                VLC_TICK_FROM_MS( var_InheritInteger( p_demux, "disc-caching" ) );
             return VLC_SUCCESS;
 
         case DEMUX_GET_META:
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 9cc6884140..3b42c1eee9 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -452,7 +452,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         case DEMUX_GET_PTS_DELAY:
             pi64 = va_arg( args, int64_t * );
             *pi64 =
-                INT64_C(1000) * var_InheritInteger( p_demux, "disc-caching" );
+                VLC_TICK_FROM_MS(var_InheritInteger( p_demux, "disc-caching" ));
             return VLC_SUCCESS;
 
         /* TODO implement others */
diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index 91a331ba38..e4bb0335cc 100644
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -255,8 +255,8 @@ static int Control( stream_t *p_access, int i_query, va_list args )
 
         /* */
         case STREAM_GET_PTS_DELAY:
-            *va_arg( args, int64_t * ) = INT64_C(1000)
-                * var_InheritInteger(p_access, "disc-caching");
+            *va_arg( args, int64_t * ) = VLC_TICK_FROM_MS(
+                var_InheritInteger(p_access, "disc-caching") );
             break;
 
         /* */