stream_MemoryNew: remove vlc_object_find()

[vlc] / src / config / core.c

diff --git a/src/config/core.c b/src/config/core.c
index 24925efa8ea6bc4a3a6fcc1077ae7da40036c264..5a11a32bb082be2ae146b13a0f429f911c0287fe 100644 (file)
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -26,7 +26,9 @@
 #endif
 
 #include <vlc_common.h>
-#include "vlc_keys.h"
+#include <vlc_keys.h>
+#include <vlc_modules.h>
+
 #include "vlc_configuration.h"
 
 #include <assert.h>
@@ -46,9 +48,10 @@ int IsConfigStringType (int type)
 {
     static const unsigned char config_types[] =
     {
-        CONFIG_ITEM_STRING, CONFIG_ITEM_FILE, CONFIG_ITEM_MODULE,
-        CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_MODULE_CAT, CONFIG_ITEM_PASSWORD,
-        CONFIG_ITEM_MODULE_LIST, CONFIG_ITEM_MODULE_LIST_CAT, CONFIG_ITEM_FONT
+        CONFIG_ITEM_STRING, CONFIG_ITEM_MODULE, CONFIG_ITEM_DIRECTORY,
+        CONFIG_ITEM_KEY, CONFIG_ITEM_MODULE_CAT, CONFIG_ITEM_PASSWORD,
+        CONFIG_ITEM_MODULE_LIST, CONFIG_ITEM_MODULE_LIST_CAT,
+        CONFIG_ITEM_FONT, CONFIG_ITEM_LOADFILE, CONFIG_ITEM_SAVEFILE,
     };
 
     /* NOTE: this needs to be changed if we ever get more than 255 types */
@@ -60,7 +63,7 @@ int IsConfigIntegerType (int type)
 {
     static const unsigned char config_types[] =
     {
-        CONFIG_ITEM_INTEGER, CONFIG_ITEM_KEY, CONFIG_ITEM_BOOL,
+        CONFIG_ITEM_INTEGER, CONFIG_ITEM_BOOL,
         CONFIG_CATEGORY, CONFIG_SUBCATEGORY
     };
 
@@ -94,7 +97,6 @@ int config_GetType( vlc_object_t *p_this, const char *psz_name )
         break;
 
     case CONFIG_ITEM_INTEGER:
-    case CONFIG_ITEM_KEY:
         i_type = VLC_VAR_INTEGER;
         break;
 
@@ -106,23 +108,13 @@ int config_GetType( vlc_object_t *p_this, const char *psz_name )
     case CONFIG_ITEM_MODULE_CAT:
     case CONFIG_ITEM_MODULE_LIST:
     case CONFIG_ITEM_MODULE_LIST_CAT:
-        i_type = VLC_VAR_MODULE;
-        break;
-
     case CONFIG_ITEM_STRING:
-        i_type = VLC_VAR_STRING;
-        break;
-
     case CONFIG_ITEM_PASSWORD:
-        i_type = VLC_VAR_STRING;
-        break;
-
-    case CONFIG_ITEM_FILE:
-        i_type = VLC_VAR_FILE;
-        break;
-
+    case CONFIG_ITEM_LOADFILE:
+    case CONFIG_ITEM_SAVEFILE:
     case CONFIG_ITEM_DIRECTORY:
-        i_type = VLC_VAR_DIRECTORY;
+    case CONFIG_ITEM_KEY:
+        i_type = VLC_VAR_STRING;
         break;
 
     default:
@@ -141,7 +133,7 @@ int config_GetType( vlc_object_t *p_this, const char *psz_name )
  * represented by an integer (CONFIG_ITEM_INTEGER and
  * CONFIG_ITEM_BOOL).
  *****************************************************************************/
-int config_GetInt( vlc_object_t *p_this, const char *psz_name )
+int64_t config_GetInt( vlc_object_t *p_this, const char *psz_name )
 {
     module_config_t *p_config;
 
@@ -160,7 +152,7 @@ int config_GetInt( vlc_object_t *p_this, const char *psz_name )
         return -1;
     }
 
-    int val;
+    int64_t val;
 
     vlc_rwlock_rdlock (&config_lock);
     val = p_config->value.i;
@@ -207,7 +199,7 @@ float config_GetFloat( vlc_object_t *p_this, const char *psz_name )
  * config_GetPsz: get the string value of a string variable
  *****************************************************************************
  * This function is used to get the value of variables which are internally
- * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE,
+ * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_*FILE,
  * CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_PASSWORD, and CONFIG_ITEM_MODULE).
  *
  * Important note: remember to free() the returned char* because it's a
@@ -246,14 +238,13 @@ char * config_GetPsz( vlc_object_t *p_this, const char *psz_name )
  * config_PutPsz: set the string value of a string variable
  *****************************************************************************
  * This function is used to set the value of variables which are internally
- * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE,
+ * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_*FILE,
  * CONFIG_ITEM_DIRECTORY, CONFIG_ITEM_PASSWORD, and CONFIG_ITEM_MODULE).
  *****************************************************************************/
 void config_PutPsz( vlc_object_t *p_this,
                       const char *psz_name, const char *psz_value )
 {
     module_config_t *p_config;
-    vlc_value_t oldval, val;
 
     p_config = config_FindConfig( p_this, psz_name );
 
@@ -271,31 +262,19 @@ void config_PutPsz( vlc_object_t *p_this,
         return;
     }
 
-    char *str;
+    char *str, *oldstr;
     if ((psz_value != NULL) && *psz_value)
         str = strdup (psz_value);
     else
         str = NULL;
 
     vlc_rwlock_wrlock (&config_lock);
-    /* backup old value */
-    oldval.psz_string = (char *)p_config->value.psz;
-
+    oldstr = (char *)p_config->value.psz;
     p_config->value.psz = str;
     p_config->b_dirty = true;
-
-    val.psz_string = (char *)p_config->value.psz;
-
     vlc_rwlock_unlock (&config_lock);
 
-    if( p_config->pf_callback )
-    {
-        p_config->pf_callback( p_this, psz_name, oldval, val,
-                               p_config->p_callback_data );
-    }
-
-    /* free old string */
-    free( oldval.psz_string );
+    free (oldstr);
 }
 
 #undef config_PutInt
@@ -306,10 +285,10 @@ void config_PutPsz( vlc_object_t *p_this,
  * represented by an integer (CONFIG_ITEM_INTEGER and
  * CONFIG_ITEM_BOOL).
  *****************************************************************************/
-void config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value )
+void config_PutInt( vlc_object_t *p_this, const char *psz_name,
+                    int64_t i_value )
 {
     module_config_t *p_config;
-    vlc_value_t oldval;
 
     p_config = config_FindConfig( p_this, psz_name );
 
@@ -326,30 +305,15 @@ void config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value )
         return;
     }
 
-    /* if i_min == i_max == 0, then do not use them */
-    if ((p_config->min.i == 0) && (p_config->max.i == 0))
-        ;
-    else if (i_value < p_config->min.i)
+    if (i_value < p_config->min.i)
         i_value = p_config->min.i;
-    else if (i_value > p_config->max.i)
+    if (i_value > p_config->max.i)
         i_value = p_config->max.i;
 
     vlc_rwlock_wrlock (&config_lock);
-    /* backup old value */
-    oldval.i_int = p_config->value.i;
-
     p_config->value.i = i_value;
     p_config->b_dirty = true;
     vlc_rwlock_unlock (&config_lock);
-
-    if( p_config->pf_callback )
-    {
-        vlc_value_t val;
-
-        val.i_int = i_value;
-        p_config->pf_callback( p_this, psz_name, oldval, val,
-                               p_config->p_callback_data );
-    }
 }
 
 #undef config_PutFloat
@@ -363,7 +327,6 @@ void config_PutFloat( vlc_object_t *p_this,
                       const char *psz_name, float f_value )
 {
     module_config_t *p_config;
-    vlc_value_t oldval;
 
     p_config = config_FindConfig( p_this, psz_name );
 
@@ -389,21 +352,9 @@ void config_PutFloat( vlc_object_t *p_this,
         f_value = p_config->max.f;
 
     vlc_rwlock_wrlock (&config_lock);
-    /* backup old value */
-    oldval.f_float = p_config->value.f;
-
     p_config->value.f = f_value;
     p_config->b_dirty = true;
     vlc_rwlock_unlock (&config_lock);
-
-    if( p_config->pf_callback )
-    {
-        vlc_value_t val;
-
-        val.f_float = f_value;
-        p_config->pf_callback( p_this, psz_name, oldval, val,
-                               p_config->p_callback_data );
-    }
 }
 
 static int confcmp (const void *a, const void *b)