Changeset b271b9ffc4080ae42a549ad9185c8f0c8e0b85e6

Timestamp:

06/13/07 21:49:08 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1181764148 +0000

git-parent:

[a14c0186d6d7e58d274a46b10c36ff8ce641c8b6]

git-author:

Laurent Aimar <fenrir@videolan.org> 1181764148 +0000

Message:

Added --run-time option to specify how many second VLC will play an item
(Usefull to save live programs like DVB/UDP)

Files:

• src/input/input.c (modified) (5 diffs)
• src/input/input_internal.h (modified) (1 diff)
• src/input/var.c (modified) (1 diff)
• src/libvlc-module.c (modified) (2 diffs)

src/input/input.c

@@ -148 +148 @@
-    p_input->i_time  = 0;
-    p_input->p->i_stop  = 0;
+    p_input->p->i_run  = 0;
-    p_input->p->i_title = 0;
-    p_input->p->title   = NULL;
@@ -574 +575 @@
-static void MainLoop( input_thread_t *p_input )
-{
+    int64_t i_start_mdate = mdate();
-    int64_t i_intf_update = 0;
-    int i_updates = 0;
@@ -587 +589 @@
-        if( p_input->i_state != PAUSE_S  )
-        {
-
-
+
+
+
-            else
-0;  /* EOF */
+p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux);
-
-            if( i_ret > 0 )
@@ -660 +663 @@
-                                           &val );
-                    }
+
+                    /* */
+                    i_start_mdate = mdate();
-                }
-            }
@@ -916 +922 @@
-        /* Start time*/
-        /* Set start time */
-
-
-
-
+
+
+
+
+
+
+
+
-
-        if( p_input->p->i_start > 0 )

src/input/input_internal.h

@@ -76 +76 @@
-    int64_t     i_start;    /* :start-time,0 by default */
-    int64_t     i_stop;     /* :stop-time, 0 if none */
+    int64_t     i_run;      /* :run-time, 0 if none */
-
-    /* Title infos FIXME multi-input (not easy) ? */

src/input/var.c

@@ -433 +433 @@
-        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, "input-slave",

src/libvlc-module.c

@@ -531 +531 @@
-#define STOP_TIME_LONGTEXT N_( \
-    "The stream will stop at this position (in seconds)." )
+
+#define RUN_TIME_TEXT N_("Run time")
+#define RUN_TIME_LONGTEXT N_( \
+    "The stream will run this duration (in seconds)." )
-
-#define INPUT_LIST_TEXT N_("Input list")
@@ -1455 +1459 @@
-    add_integer( "stop-time", 0, NULL,
-                 STOP_TIME_TEXT, STOP_TIME_LONGTEXT, VLC_TRUE );
+    add_integer( "run-time", 0, NULL,
+                 RUN_TIME_TEXT, RUN_TIME_LONGTEXT, VLC_TRUE );
-    add_string( "input-list", NULL, NULL,
-                 INPUT_LIST_TEXT, INPUT_LIST_LONGTEXT, VLC_TRUE );