Allow :start-time, :stop-time and :run-time arguments to be float values,

since we may want sub-second granularity.

diff --git a/src/input/input.c b/src/input/input.c
index c7afcfe9c289a654b2a6f648345a61677095bd81..3f51cf58b6746d49a816e4aa1d0e330af5642ec5 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -918,9 +918,12 @@ static void StartTitle( input_thread_t * p_input )
         input_ControlPush( p_input, INPUT_CONTROL_SET_SEEKPOINT, &val );
 
     /* Start/stop/run time */
-    p_input->p->i_start = INT64_C(1000000) * var_GetInteger( p_input, "start-time" );
-    p_input->p->i_stop  = INT64_C(1000000) * var_GetInteger( p_input, "stop-time" );
-    p_input->p->i_run   = INT64_C(1000000) * var_GetInteger( p_input, "run-time" );
+    p_input->p->i_start = (int64_t)(1000000.0
+                                     * var_GetFloat( p_input, "start-time" ));
+    p_input->p->i_stop  = (int64_t)(1000000.0
+                                     * var_GetFloat( p_input, "stop-time" ));
+    p_input->p->i_run   = (int64_t)(1000000.0
+                                     * var_GetFloat( p_input, "run-time" ));
     if( p_input->p->i_run < 0 )
     {
         msg_Warn( p_input, "invalid run-time ignored" );

diff --git a/src/input/var.c b/src/input/var.c
index 58547f1445fe67075bc2b2d8a8e39eb0107ea300..f13d700448a09c487a5112f1e19e5c28b799c0ef 100644 (file)
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -443,9 +443,9 @@ void input_ConfigVarInit ( input_thread_t *p_input )
 
         var_Create( p_input, "input-repeat",
                     VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "start-time", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "stop-time", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "run-time", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
+        var_Create( p_input, "start-time", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT );
+        var_Create( p_input, "stop-time", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT );
+        var_Create( p_input, "run-time", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT );
         var_Create( p_input, "input-fast-seek", VLC_VAR_BOOL|VLC_VAR_DOINHERIT );
 
         var_Create( p_input, "input-slave",

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 3edcd9e543a6e6290c62242f33cbf3042f6c77b5..32bc5feee3b86e213f296cea3d614860dde9227a 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1729,14 +1729,14 @@ vlc_module_begin ()
     add_integer( "input-repeat", 0, NULL,
                  INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, false )
         change_safe ()
-    add_integer( "start-time", 0, NULL,
-                 START_TIME_TEXT, START_TIME_LONGTEXT, true )
+    add_float( "start-time", 0, NULL,
+               START_TIME_TEXT, START_TIME_LONGTEXT, true )
         change_safe ()
-    add_integer( "stop-time", 0, NULL,
-                 STOP_TIME_TEXT, STOP_TIME_LONGTEXT, true )
+    add_float( "stop-time", 0, NULL,
+               STOP_TIME_TEXT, STOP_TIME_LONGTEXT, true )
         change_safe ()
-    add_integer( "run-time", 0, NULL,
-                 RUN_TIME_TEXT, RUN_TIME_LONGTEXT, true )
+    add_float( "run-time", 0, NULL,
+               RUN_TIME_TEXT, RUN_TIME_LONGTEXT, true )
         change_safe ()
     add_bool( "input-fast-seek", false, NULL,
               INPUT_FAST_SEEK_TEXT, INPUT_FAST_SEEK_LONGTEXT, false )