Compare revisions

Thomas Guillem · Steve Lhomme · Thomas Guillem · Steve Lhomme · adfdbcb0 · adfdbcb0
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -331,7 +331,10 @@ input_thread_t * input_Create( vlc_object_t *p_parent, input_item_t *p_item,
    vlc_interrupt_init(&priv->interrupt);

    /* Create Object Variables for private use only */
-    input_ConfigVarInit( p_input );
+
+    vlc_object_InitInputConfig(VLC_OBJECT(p_input),
+                               input_priv(p_input)->type != INPUT_TYPE_PREPARSING,
+                               true);

    priv->b_low_delay = var_InheritBool( p_input, "low-delay" );
    priv->i_jitter_max = VLC_TICK_FROM_MS(var_InheritInteger( p_input, "clock-jitter" ));

--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -700,7 +700,8 @@ void input_ExtractAttachmentAndCacheArt( input_thread_t *, const char *name );

 /* var.c */

-void input_ConfigVarInit ( input_thread_t * );
+void vlc_object_InitInputConfig(vlc_object_t *obj,
+                                bool playback, bool do_inherit);

 /* Subtitles */
 int subtitles_Detect( input_thread_t *, char *, const char *, input_item_slave_t ***, int * );

--- a/src/input/var.c
+++ b/src/input/var.c
@@ -36,93 +36,95 @@
 * input_ConfigVarInit:
 *  Create all config object variables
 *****************************************************************************/
-void input_ConfigVarInit ( input_thread_t *p_input )
+void vlc_object_InitInputConfig(vlc_object_t *obj,
+                                bool playback, bool do_inherit)
 {
    /* Create Object Variables for private use only */
+    int inherit_flag = do_inherit ? VLC_VAR_DOINHERIT : 0;

-    if( input_priv(p_input)->type != INPUT_TYPE_PREPARSING )
+    if (playback)
    {
-        var_Create( p_input, "video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "spu", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "video-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "audio-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-track", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "audio-language",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-language",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "menu-language",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "video-track-id",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "audio-track-id",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-track-id",
-                    VLC_VAR_STRING|VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "sub-file", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-autodetect-file", VLC_VAR_BOOL |
-                    VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-autodetect-path", VLC_VAR_STRING |
-                    VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sub-autodetect-fuzzy", VLC_VAR_INTEGER |
-                    VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "sout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sout-all",   VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sout-audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sout-video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sout-spu", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "sout-keep",  VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "input-repeat",
-                    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",
-                    VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-
-        var_Create( p_input, "audio-desync",
-                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "cr-average",
-                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "clock-synchro",
-                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-
-        var_Create( p_input, "bookmarks", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "programs", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "program", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-        var_Create( p_input, "rate", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+        var_Create(obj, "video", VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "audio", VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "spu", VLC_VAR_BOOL | inherit_flag);
+
+        var_Create(obj, "video-track", VLC_VAR_INTEGER|inherit_flag);
+        var_Create(obj, "audio-track", VLC_VAR_INTEGER|inherit_flag);
+        var_Create(obj, "sub-track", VLC_VAR_INTEGER|inherit_flag);
+
+        var_Create(obj, "audio-language",
+                    VLC_VAR_STRING|inherit_flag);
+        var_Create(obj, "sub-language",
+                    VLC_VAR_STRING|inherit_flag);
+        var_Create(obj, "menu-language",
+                    VLC_VAR_STRING|inherit_flag);
+
+        var_Create(obj, "video-track-id",
+                    VLC_VAR_STRING|inherit_flag);
+        var_Create(obj, "audio-track-id",
+                    VLC_VAR_STRING|inherit_flag);
+        var_Create(obj, "sub-track-id",
+                    VLC_VAR_STRING|inherit_flag);
+
+        var_Create(obj, "sub-file", VLC_VAR_STRING | inherit_flag);
+        var_Create(obj, "sub-autodetect-file", VLC_VAR_BOOL |
+                    inherit_flag);
+        var_Create(obj, "sub-autodetect-path", VLC_VAR_STRING |
+                    inherit_flag);
+        var_Create(obj, "sub-autodetect-fuzzy", VLC_VAR_INTEGER |
+                    inherit_flag);
+
+        var_Create(obj, "sout", VLC_VAR_STRING | inherit_flag);
+        var_Create(obj, "sout-all",   VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "sout-audio", VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "sout-video", VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "sout-spu", VLC_VAR_BOOL | inherit_flag);
+        var_Create(obj, "sout-keep",  VLC_VAR_BOOL | inherit_flag);
+
+        var_Create(obj, "input-repeat",
+                    VLC_VAR_INTEGER|inherit_flag);
+        var_Create(obj, "start-time", VLC_VAR_FLOAT|inherit_flag);
+        var_Create(obj, "stop-time", VLC_VAR_FLOAT|inherit_flag);
+        var_Create(obj, "run-time", VLC_VAR_FLOAT|inherit_flag);
+        var_Create(obj, "input-fast-seek", VLC_VAR_BOOL|inherit_flag);
+
+        var_Create(obj, "input-slave",
+                    VLC_VAR_STRING | inherit_flag);
+
+        var_Create(obj, "audio-desync",
+                    VLC_VAR_INTEGER | inherit_flag);
+        var_Create(obj, "cr-average",
+                    VLC_VAR_INTEGER | inherit_flag);
+        var_Create(obj, "clock-synchro",
+                    VLC_VAR_INTEGER | inherit_flag);
+
+        var_Create(obj, "bookmarks", VLC_VAR_STRING | inherit_flag);
+        var_Create(obj, "programs", VLC_VAR_STRING | inherit_flag);
+        var_Create(obj, "program", VLC_VAR_INTEGER | inherit_flag);
+        var_Create(obj, "rate", VLC_VAR_FLOAT | inherit_flag);
    }

    /* */
-    var_Create( p_input, "input-record-native", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+    var_Create(obj, "input-record-native", VLC_VAR_BOOL | inherit_flag);

    /* */
-    var_Create( p_input, "demux", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "demux-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "stream-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    var_Create(obj, "demux", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "demux-filter", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "stream-filter", VLC_VAR_STRING | inherit_flag);

    /* Meta */
-    var_Create( p_input, "meta-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "meta-author", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "meta-artist", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "meta-genre", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "meta-copyright", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
-    var_Create( p_input, "meta-description", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
-    var_Create( p_input, "meta-date", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-    var_Create( p_input, "meta-url", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    var_Create(obj, "meta-title", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-author", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-artist", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-genre", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-copyright", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-description", VLC_VAR_STRING|inherit_flag);
+    var_Create(obj, "meta-date", VLC_VAR_STRING | inherit_flag);
+    var_Create(obj, "meta-url", VLC_VAR_STRING | inherit_flag);

    /* Inherited by demux/subtitle.c */
-    var_Create( p_input, "sub-original-fps", VLC_VAR_FLOAT );
+    var_Create(obj, "sub-original-fps", VLC_VAR_FLOAT);

    /* used by Medialibrary */
-    var_Create( p_input, "save-recentplay", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+    var_Create(obj, "save-recentplay", VLC_VAR_BOOL | inherit_flag);
 }
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -330,8 +330,8 @@ FORCE:
 .PHONY: FORCE

 libvlc_demux_run_la_SOURCES = src/input/demux-run.c src/input/demux-run.h \
-	src/input/common.c src/input/common.h
-libvlc_demux_run_la_CPPFLAGS = $(AM_CPPFLAGS)
+	src/input/common.c src/input/common.h $(top_srcdir)/src/input/var.c
+libvlc_demux_run_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src
 libvlc_demux_run_la_LDFLAGS = -no-install -static
 libvlc_demux_run_la_LIBADD = \
 	../lib/libvlc.la ../src/libvlccore.la ../compat/libcompat.la

--- a/test/src/input/demux-run.c
+++ b/test/src/input/demux-run.c
@@ -49,6 +49,9 @@
 #include "demux-run.h"
 #include "decoder.h"

+void vlc_object_InitInputConfig(vlc_object_t *obj,
+                                bool playback, bool do_inherit);
+
 struct test_es_out_t
 {
    struct es_out_t out;
@@ -222,6 +225,8 @@ static const struct es_out_callbacks es_out_cbs =

 static es_out_t *test_es_out_create(vlc_object_t *parent)
 {
+    vlc_object_InitInputConfig(parent, true, false);
+
    struct test_es_out_t *ctx = malloc(sizeof (*ctx));
    if (ctx == NULL)
    {
No results found