Changeset 606657480ad9bf46664eea80f2a8e49aabc02d37

Timestamp:

08/17/05 14:00:44 (3 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1124280044 +0000

git-parent:

[5b85463a3602cd055425c8ef0854a8ca7bee13f4]

git-author:

Christophe Massiot <massiot@videolan.org> 1124280044 +0000

Message:

• modules/control/http.c: New RPN functions :
  
  • 'variable' vlc_var_type
    
  • 'variable' vlc_config_type
    
  • value 'variable' vlc_var_set (renamed from vlc_set_var for consistency)
    
  • 'variable' vlc_var_get
    
  • value 'variable' vlc_config_set
    
  • 'variable' vlc_config_get
    

Files:

• modules/control/http.c (modified) (3 diffs)

modules/control/http.c

@@ -1589 +1589 @@
-                         char * );
-
-
+onst c
-static char *SSPop  ( rpn_stack_t * );
-
@@ -3250 +3250 @@
-}
-
-
+onst c
-{
-    if( st->i_stack < STACK_MAX )
@@ -3793 +3793 @@
-            free( psz_value );
-        }
-
-
+
+
+
+
-            char *psz_variable = SSPop( st );
-
-
+
-            int i_type;
-
+            if( !strcmp( s, "vlc_var_type" ) )
+            {
+                p_object = VLC_OBJECT(p_sys->p_input);
+                if( p_object != NULL )
+                    i_type = var_Type( p_object, psz_variable );
+            }
+            else
+            {
+                p_object = VLC_OBJECT(p_intf);
+                i_type = config_GetType( p_object, psz_variable );
+            }
+
+            if( p_object != NULL )
+            {
+                switch( i_type & VLC_VAR_TYPE )
+                {
+                case VLC_VAR_BOOL:
+                    psz_type = "VLC_VAR_BOOL";
+                    break;
+                case VLC_VAR_INTEGER:
+                    psz_type = "VLC_VAR_INTEGER";
+                    break;
+                case VLC_VAR_HOTKEY:
+                    psz_type = "VLC_VAR_HOTKEY";
+                    break;
+                case VLC_VAR_STRING:
+                    psz_type = "VLC_VAR_STRING";
+                    break;
+                case VLC_VAR_MODULE:
+                    psz_type = "VLC_VAR_MODULE";
+                    break;
+                case VLC_VAR_FILE:
+                    psz_type = "VLC_VAR_FILE";
+                    break;
+                case VLC_VAR_DIRECTORY:
+                    psz_type = "VLC_VAR_DIRECTORY";
+                    break;
+                case VLC_VAR_VARIABLE:
+                    psz_type = "VLC_VAR_VARIABLE";
+                    break;
+                case VLC_VAR_FLOAT:
+                    psz_type = "VLC_VAR_FLOAT";
+                    break;
+                default:
+                    psz_type = "UNDEFINED";
+                }
+            }
+            else
+                psz_type = "INVALID";
+
+            SSPush( st, psz_type );
+            free( psz_variable );
+        }
+        else if( !strcmp( s, "vlc_var_set" ) )
+        {
+            char *psz_variable = SSPop( st );
+
-            if( p_sys->p_input != NULL )
-            {
+                vlc_bool_t b_error = VLC_FALSE;
+                char *psz_value = NULL;
+                vlc_value_t val;
+                int i_type;
+
-                i_type = var_Type( p_sys->p_input, psz_variable );
-
-if( (i_type & VLC_VAR_TYPE) == VLC_VAR_INTEGER
-
-    int i_value = SSPopN( st, vars );
-i_int = i_value
+switch( i_type & VLC_VAR_TYPE
+
+case VLC_VAR_BOOL:
+b_bool = SSPopN( st, vars )
-                    msg_Dbg( p_intf, "requested input var change: %s->%d",
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    msg_Dbg( p_intf, "requested input var change: %s->%s",
-                             psz_variable, psz_value );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            free( psz_variable );
-        }