Changeset 4684a91eafdc7a56414208681294ecccaac9b83c

Timestamp:

24/07/03 00:01:25 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1058997685 +0000

git-parent:

[5b165b7369efb2c31466e0ed0a120ef16a838cc6]

git-author:

Gildas Bazin <gbazin@videolan.org> 1058997685 +0000

Message:

* include/variables.h, src/misc/variables.c: you can now use var_Create() directly to create an object variable with an inherited value.

eg. var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
Beware, the object in which you create the var must be attached to a parent for this to work (otherwise we can't navigate the parents hierarchy to find the value to inherit).

* src/input/input.c, src/input/input_programs.c, src/video_output/video_output.c: converted more config_GetFoo() into var_Create()/var_Get();

Files:

• include/variables.h (modified) (2 diffs)
• src/input/input.c (modified) (3 diffs)
• src/input/input_programs.c (modified) (4 diffs)
• src/misc/variables.c (modified) (5 diffs)
• src/video_output/video_output.c (modified) (5 diffs)

include/variables.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-4 2003/05/24 23:40:11
+5 2003/07/23 22:01:25
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -97 +97 @@
-#define VLC_VAR_ISCONFIG  0x2000
-
+/* Creation flag */
+#define VLC_VAR_DOINHERIT 0x8000
+
-/*****************************************************************************
- * Variable actions

src/input/input.c

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-4 2003/07/23 01:13:48
+5 2003/07/23 22:01:25
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -87 +87 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    /* Initialize thread properties */
@@ -548 +541 @@
-    /* Initialize optional stream output. */
-    var_Get( p_input, "sout", &val );
- 
+
-    {
-        if ( *val.psz_string && (p_input->stream.p_sout =

src/input/input_programs.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2002 VideoLAN
-4 2003/05/18 23:16:57 fenrir
+5 2003/07/23 22:01:25 gbazin
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -428 +428 @@
-        }
-    }
+
-    /* Get the number of the required audio stream */
-
+
+
-    {
-        /* Default is the first one */
-
+
+
-        if( i_required_audio_es < 0 )
-        {
@@ -444 +447 @@
-
-    /* Same thing for subtitles */
-
+
+
-    {
-        /* for spu, default is none */
-
+
+
-        if( i_required_spu_es < 0 )
-        {
@@ -822 +827 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

src/misc/variables.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-7 2003/07/22 15:59:06
+8 2003/07/23 22:01:25
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -160 +160 @@
-    {
-        /* If the types differ, variable creation failed. */
-i_type
+(i_type & ~VLC_VAR_DOINHERIT)
-        {
-            vlc_mutex_unlock( &p_this->var_lock );
@@ -191 +191 @@
-    p_var->psz_text = NULL;
-
-
+ & ~VLC_VAR_DOINHERIT
-    memset( &p_var->val, 0, sizeof(vlc_value_t) );
-
@@ -261 +261 @@
-    /* Duplicate the default data we stored. */
-    p_var->pf_dup( &p_var->val );
+
+    if( i_type & VLC_VAR_DOINHERIT )
+    {
+        vlc_value_t val;
+
+        if( InheritValue( p_this, psz_name, &val, p_var->i_type )
+            == VLC_SUCCESS );
+        {
+            /* Free data if needed */
+            p_var->pf_free( &p_var->val );
+            /* Check boundaries and list */
+            CheckValue( p_var, &val );
+            /* Set the variable */
+            p_var->val = val;
+        }
+    }
-
-    vlc_mutex_unlock( &p_this->var_lock );
@@ -1143 +1159 @@
-
-        vlc_mutex_unlock( &p_this->p_parent->var_lock );
-
-        return VLC_SUCCESS;
-    }

src/video_output/video_output.c

@@ -6 +6 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-29 2003/07/14 21:32:59 sigmunau
+30 2003/07/23 22:01:25 gbazin
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -217 +217 @@
-    }
-
-    var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
-    val.b_bool = VLC_TRUE;
-    var_Set( p_vout, "intf-change", val );
-
-    p_vout->b_override_aspect = VLC_FALSE;
-
-    /* If the parent is not a VOUT object, that means we are at the start of
-     * the video output pipe */
-    if( p_parent->i_object_type != VLC_OBJECT_VOUT )
-    {
-        char *psz_aspect = config_GetPsz( p_parent, "aspect-ratio" );
-
-        /* Check whether the user tried to override aspect ratio */
-        if( psz_aspect )
-        {
-            unsigned int i_new_aspect = i_aspect;
-            char *psz_parser = strchr( psz_aspect, ':' );
-
-            if( psz_parser )
-            {
-                *psz_parser++ = '\0';
-                i_new_aspect = atoi( psz_aspect ) * VOUT_ASPECT_FACTOR
-                                                  / atoi( psz_parser );
-            }
-            else
-            {
-                i_new_aspect = i_width * VOUT_ASPECT_FACTOR
-                                       * atof( psz_aspect )
-                                       / i_height;
-            }
-
-            free( psz_aspect );
-
-            if( i_new_aspect && i_new_aspect != i_aspect )
-            {
-                int i_pgcd = ReduceHeight( i_new_aspect );
-
-                msg_Dbg( p_vout, "overriding source aspect ratio to %i:%i",
-                         i_new_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
-
-                i_aspect = i_new_aspect;
-
-                p_vout->b_override_aspect = VLC_TRUE;
-            }
-        }
-
-        /* Look for the default filter configuration */
-        p_vout->psz_filter_chain = config_GetPsz( p_parent, "filter" );
-    }
-    else
-    {
-        /* continue the parent's filter chain */
-        char *psz_end;
-
-        psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' );
-        if( psz_end && *(psz_end+1) )
-            p_vout->psz_filter_chain = strdup( psz_end+1 );
-        else p_vout->psz_filter_chain = NULL;
-    }
-
-    /* Choose the video output module */
-    if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain )
-    {
-        psz_plugin = config_GetPsz( p_parent, "vout" );
-    }
-    else
-    {
-        /* the filter chain is a string list of filters separated by double
-         * colons */
-        char *psz_end;
-
-        psz_end = strchr( p_vout->psz_filter_chain, ':' );
-        if( psz_end )
-            psz_plugin = strndup( p_vout->psz_filter_chain,
-                                  psz_end - p_vout->psz_filter_chain );
-        else psz_plugin = strdup( p_vout->psz_filter_chain );
-    }
-
-    /* Initialize pictures and subpictures - translation tables and functions
-     * will be initialized later in InitThread */
@@ -359 +281 @@
-    var_Create( p_vout, "key-pressed", VLC_VAR_STRING );
-
+    var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
+    val.b_bool = VLC_TRUE;
+    var_Set( p_vout, "intf-change", val );
+
+    /* Initialize locks */
+    vlc_mutex_init( p_vout, &p_vout->picture_lock );
+    vlc_mutex_init( p_vout, &p_vout->subpicture_lock );
+    vlc_mutex_init( p_vout, &p_vout->change_lock );
+
+    /* Attach the new object now so we can use var inheritance below */
+    vlc_object_attach( p_vout, p_parent );
+
+    /* Create a few object variables we'll need later on */
+    var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+    var_Create( p_vout, "width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Create( p_vout, "height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+    var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+
+    p_vout->b_override_aspect = VLC_FALSE;
+
+    /* If the parent is not a VOUT object, that means we are at the start of
+     * the video output pipe */
+    if( p_parent->i_object_type != VLC_OBJECT_VOUT )
+    {
+        var_Get( p_vout, "aspect-ratio", &val );
+
+        /* Check whether the user tried to override aspect ratio */
+        if( val.psz_string )
+        {
+            unsigned int i_new_aspect = i_aspect;
+            char *psz_parser = strchr( val.psz_string, ':' );
+
+            if( psz_parser )
+            {
+                *psz_parser++ = '\0';
+                i_new_aspect = atoi( val.psz_string ) * VOUT_ASPECT_FACTOR
+                                                      / atoi( psz_parser );
+            }
+            else
+            {
+                i_new_aspect = i_width * VOUT_ASPECT_FACTOR
+                                       * atof( val.psz_string )
+                                       / i_height;
+            }
+
+            free( val.psz_string );
+
+            if( i_new_aspect && i_new_aspect != i_aspect )
+            {
+                int i_pgcd = ReduceHeight( i_new_aspect );
+
+                msg_Dbg( p_vout, "overriding source aspect ratio to %i:%i",
+                         i_new_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
+
+                p_vout->render.i_aspect = i_new_aspect;
+
+                p_vout->b_override_aspect = VLC_TRUE;
+            }
+        }
+
+        /* Look for the default filter configuration */
+        var_Create( p_vout, "filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+        var_Get( p_vout, "filter", &val );
+        p_vout->psz_filter_chain = val.psz_string;
+    }
+    else
+    {
+        /* continue the parent's filter chain */
+        char *psz_end;
+
+        psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' );
+        if( psz_end && *(psz_end+1) )
+            p_vout->psz_filter_chain = strdup( psz_end+1 );
+        else p_vout->psz_filter_chain = NULL;
+    }
+
+    /* Choose the video output module */
+    if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain )
+    {
+        var_Create( p_vout, "vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+        var_Get( p_vout, "vout", &val );
+        psz_plugin = val.psz_string;
+    }
+    else
+    {
+        /* the filter chain is a string list of filters separated by double
+         * colons */
+        char *psz_end;
+
+        psz_end = strchr( p_vout->psz_filter_chain, ':' );
+        if( psz_end )
+            psz_plugin = strndup( p_vout->psz_filter_chain,
+                                  psz_end - p_vout->psz_filter_chain );
+        else psz_plugin = strdup( p_vout->psz_filter_chain );
+    }
+
-    /* Initialize the dimensions of the video window */
-    InitWindowSize( p_vout, &p_vout->i_window_width,
-                    &p_vout->i_window_height );
-
-
-
-
-
-
-
-
+
-    p_vout->p_module = module_Need( p_vout,
-                           ( p_vout->psz_filter_chain &&
@@ -1158 +1170 @@
-                            int *pi_height )
-{
+    vlc_value_t val;
-    int i_width, i_height;
-    uint64_t ll_zoom;
@@ -1163 +1176 @@
-#define FP_FACTOR 1000                             /* our fixed point factor */
-
-
-
-
+
+
+
+
+
+
-
-    if( i_width > 0 && i_height > 0)