summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/configfile.c77
-rw-r--r--src/xine-engine/configfile.h13
-rw-r--r--src/xine-engine/xine_interface.c8
3 files changed, 47 insertions, 51 deletions
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 64ea3198f..5b918c458 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: configfile.c,v 1.64 2004/03/16 21:32:23 siggi Exp $
+ * $Id: configfile.c,v 1.65 2004/05/07 14:38:14 mroi Exp $
*
* config object (was: file) management - implementation
*
@@ -156,7 +156,7 @@ static cfg_entry_t *__config_add (config_values_t *this, const char *key, int ex
entry = (cfg_entry_t *) xine_xmalloc (sizeof (cfg_entry_t));
entry->config = this;
entry->key = strdup(key);
- entry->type = CONFIG_TYPE_UNKNOWN;
+ entry->type = XINE_CONFIG_TYPE_UNKNOWN;
entry->unknown_value = NULL;
entry->str_value = NULL;
entry->exp_level = exp_level;
@@ -232,8 +232,8 @@ static char *__config_register_string (config_values_t *this,
/* convert entry to string type if necessary */
- if (entry->type != CONFIG_TYPE_STRING) {
- entry->type = CONFIG_TYPE_STRING;
+ if (entry->type != XINE_CONFIG_TYPE_STRING) {
+ entry->type = XINE_CONFIG_TYPE_STRING;
/*
* if there is no unknown_value (made with register_empty) set
* it to default value
@@ -294,14 +294,14 @@ static int __config_register_num (config_values_t *this,
/* convert entry to num type if necessary */
- if (entry->type != CONFIG_TYPE_NUM) {
+ if (entry->type != XINE_CONFIG_TYPE_NUM) {
- if (entry->type == CONFIG_TYPE_STRING) {
+ if (entry->type == XINE_CONFIG_TYPE_STRING) {
free (entry->str_value);
free (entry->str_default);
}
- entry->type = CONFIG_TYPE_NUM;
+ entry->type = XINE_CONFIG_TYPE_NUM;
if (entry->unknown_value)
sscanf (entry->unknown_value, "%d", &entry->num_value);
@@ -359,14 +359,14 @@ static int __config_register_bool (config_values_t *this,
/* convert entry to bool type if necessary */
- if (entry->type != CONFIG_TYPE_BOOL) {
+ if (entry->type != XINE_CONFIG_TYPE_BOOL) {
- if (entry->type == CONFIG_TYPE_STRING) {
+ if (entry->type == XINE_CONFIG_TYPE_STRING) {
free (entry->str_value);
free (entry->str_default);
}
- entry->type = CONFIG_TYPE_BOOL;
+ entry->type = XINE_CONFIG_TYPE_BOOL;
if (entry->unknown_value)
sscanf (entry->unknown_value, "%d", &entry->num_value);
@@ -425,14 +425,14 @@ static int __config_register_range (config_values_t *this,
/* convert entry to range type if necessary */
- if (entry->type != CONFIG_TYPE_RANGE) {
+ if (entry->type != XINE_CONFIG_TYPE_RANGE) {
- if (entry->type == CONFIG_TYPE_STRING) {
+ if (entry->type == XINE_CONFIG_TYPE_STRING) {
free (entry->str_value);
free (entry->str_default);
}
- entry->type = CONFIG_TYPE_RANGE;
+ entry->type = XINE_CONFIG_TYPE_RANGE;
if (entry->unknown_value)
sscanf (entry->unknown_value, "%d", &entry->num_value);
@@ -518,14 +518,14 @@ static int __config_register_enum (config_values_t *this,
/* convert entry to enum type if necessary */
- if (entry->type != CONFIG_TYPE_ENUM) {
+ if (entry->type != XINE_CONFIG_TYPE_ENUM) {
- if (entry->type == CONFIG_TYPE_STRING) {
+ if (entry->type == XINE_CONFIG_TYPE_STRING) {
free (entry->str_value);
free (entry->str_default);
}
- entry->type = CONFIG_TYPE_ENUM;
+ entry->type = XINE_CONFIG_TYPE_ENUM;
if (entry->unknown_value)
entry->num_value = __config_parse_enum (entry->unknown_value, values);
@@ -584,8 +584,8 @@ static void __config_update_num (config_values_t *this,
}
- if ((entry->type == CONFIG_TYPE_UNKNOWN)
- || (entry->type == CONFIG_TYPE_STRING)) {
+ if ((entry->type == XINE_CONFIG_TYPE_UNKNOWN)
+ || (entry->type == XINE_CONFIG_TYPE_STRING)) {
printf ("configfile: error - tried to update non-num type %d (key %s, value %d)\n",
entry->type, entry->key, value);
return;
@@ -622,8 +622,15 @@ static void __config_update_string (config_values_t *this,
return;
}
+
+ /* if an enum is updated with a string, we convert the string to
+ * its index and use update number */
+ if (entry->type == XINE_CONFIG_TYPE_ENUM) {
+ __config_update_num(this, key, __config_parse_enum(value, entry->enum_values));
+ return;
+ }
- if (entry->type != CONFIG_TYPE_STRING) {
+ if (entry->type != XINE_CONFIG_TYPE_STRING) {
printf ("configfile: error - tried to update non-string type %d (key %s, value %s)\n",
entry->type, entry->key, value);
return;
@@ -695,15 +702,15 @@ void xine_config_load (xine_t *xine, const char *filename) {
} else {
switch (entry->type) {
case XINE_CONFIG_TYPE_RANGE:
- case XINE_CONFIG_TYPE_ENUM:
case XINE_CONFIG_TYPE_NUM:
case XINE_CONFIG_TYPE_BOOL:
__config_update_num (this, entry->key, atoi(value));
break;
+ case XINE_CONFIG_TYPE_ENUM:
case XINE_CONFIG_TYPE_STRING:
__config_update_string (this, entry->key, value);
break;
- case CONFIG_TYPE_UNKNOWN:
+ case XINE_CONFIG_TYPE_UNKNOWN:
pthread_mutex_lock(&this->config_lock);
free(entry->unknown_value);
entry->unknown_value = strdup(value);
@@ -802,7 +809,7 @@ void xine_config_save (xine_t *xine, const char *filename) {
fprintf (f_config, "# %s\n", entry->description);
switch (entry->type) {
- case CONFIG_TYPE_UNKNOWN:
+ case XINE_CONFIG_TYPE_UNKNOWN:
/*#if 0*/
/* discard unclaimed values */
@@ -812,21 +819,21 @@ void xine_config_save (xine_t *xine, const char *filename) {
/*#endif*/
break;
- case CONFIG_TYPE_RANGE:
+ case XINE_CONFIG_TYPE_RANGE:
fprintf (f_config, "# [%d..%d], default: %d\n",
entry->range_min, entry->range_max, entry->num_default);
if (entry->num_value == entry->num_default) fprintf (f_config, "#");
fprintf (f_config, "%s:%d\n", entry->key, entry->num_value);
fprintf (f_config, "\n");
break;
- case CONFIG_TYPE_STRING:
+ case XINE_CONFIG_TYPE_STRING:
fprintf (f_config, "# string, default: %s\n",
entry->str_default);
if (strcmp(entry->str_value, entry->str_default) == 0) fprintf (f_config, "#");
fprintf (f_config, "%s:%s\n", entry->key, entry->str_value);
fprintf (f_config, "\n");
break;
- case CONFIG_TYPE_ENUM: {
+ case XINE_CONFIG_TYPE_ENUM: {
char **value;
fprintf (f_config, "# {");
@@ -848,14 +855,14 @@ void xine_config_save (xine_t *xine, const char *filename) {
fprintf (f_config, "\n");
break;
}
- case CONFIG_TYPE_NUM:
+ case XINE_CONFIG_TYPE_NUM:
fprintf (f_config, "# numeric, default: %d\n",
entry->num_default);
if (entry->num_value == entry->num_default) fprintf (f_config, "#");
fprintf (f_config, "%s:%d\n", entry->key, entry->num_value);
fprintf (f_config, "\n");
break;
- case CONFIG_TYPE_BOOL:
+ case XINE_CONFIG_TYPE_BOOL:
fprintf (f_config, "# bool, default: %d\n",
entry->num_default);
if (entry->num_value == entry->num_default) fprintf (f_config, "#");
@@ -901,7 +908,7 @@ static void __config_dispose (config_values_t *this) {
if (last->unknown_value)
free (last->unknown_value);
- if (last->type == CONFIG_TYPE_STRING) {
+ if (last->type == XINE_CONFIG_TYPE_STRING) {
free (last->str_value);
free (last->str_default);
}
@@ -973,7 +980,7 @@ int _x_config_change_opt(config_values_t *config, const char *opt) {
lprintf ("change_opt '%s'\n", opt);
if ((entry = config->lookup_entry(config, "misc.implicit_config")) &&
- entry->type == CONFIG_TYPE_BOOL) {
+ entry->type == XINE_CONFIG_TYPE_BOOL) {
if (!entry->num_value)
/* changing config entries implicitly is denied */
return -1;
@@ -1003,20 +1010,20 @@ int _x_config_change_opt(config_values_t *config, const char *opt) {
switch(entry->type) {
- case CONFIG_TYPE_STRING:
+ case XINE_CONFIG_TYPE_STRING:
config->update_string(config, key, value);
handled = 1;
break;
- case CONFIG_TYPE_RANGE:
- case CONFIG_TYPE_ENUM:
- case CONFIG_TYPE_NUM:
- case CONFIG_TYPE_BOOL:
+ case XINE_CONFIG_TYPE_RANGE:
+ case XINE_CONFIG_TYPE_ENUM:
+ case XINE_CONFIG_TYPE_NUM:
+ case XINE_CONFIG_TYPE_BOOL:
config->update_num(config, key, (atoi(value)));
handled = 1;
break;
- case CONFIG_TYPE_UNKNOWN:
+ case XINE_CONFIG_TYPE_UNKNOWN:
entry->unknown_value = strdup(value);
handled = 1;
break;
diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h
index 8376730f5..781cf14af 100644
--- a/src/xine-engine/configfile.h
+++ b/src/xine-engine/configfile.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: configfile.h,v 1.33 2003/12/09 00:02:36 f1rmb Exp $
+ * $Id: configfile.h,v 1.34 2004/05/07 14:38:14 mroi Exp $
*
* config file management
*
@@ -89,17 +89,6 @@ struct cfg_entry_s {
void *callback_data;
};
-/*
- * config entry data types
- */
-
-#define CONFIG_TYPE_UNKNOWN 0
-#define CONFIG_TYPE_RANGE 1
-#define CONFIG_TYPE_STRING 2
-#define CONFIG_TYPE_ENUM 3
-#define CONFIG_TYPE_NUM 4
-#define CONFIG_TYPE_BOOL 5
-
struct config_values_s {
/*
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index ad426580e..a04eec7e7 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_interface.c,v 1.81 2004/04/10 17:41:44 valtri Exp $
+ * $Id: xine_interface.c,v 1.82 2004/05/07 14:38:14 mroi Exp $
*
* convenience/abstraction layer, functions to implement
* libxine's public interface
@@ -207,7 +207,7 @@ int xine_config_get_first_entry (xine_t *this, xine_cfg_entry_t *entry) {
config->cur = config->first;
/* do not hand out unclaimed entries */
- while (config->cur && config->cur->type == CONFIG_TYPE_UNKNOWN)
+ while (config->cur && config->cur->type == XINE_CONFIG_TYPE_UNKNOWN)
config->cur = config->cur->next;
result = __config_get_current_entry (this, entry);
pthread_mutex_unlock(&config->config_lock);
@@ -234,7 +234,7 @@ int xine_config_get_next_entry (xine_t *this, xine_cfg_entry_t *entry) {
/* do not hand out unclaimed entries */
do {
config->cur = config->cur->next;
- } while (config->cur && config->cur->type == CONFIG_TYPE_UNKNOWN);
+ } while (config->cur && config->cur->type == XINE_CONFIG_TYPE_UNKNOWN);
result = __config_get_current_entry (this, entry);
pthread_mutex_unlock(&config->config_lock);
@@ -254,7 +254,7 @@ int xine_config_lookup_entry (xine_t *this, const char *key,
config->cur = config->lookup_entry (config, key);
pthread_mutex_lock(&config->config_lock);
/* do not hand out unclaimed entries */
- if (config->cur && config->cur->type == CONFIG_TYPE_UNKNOWN)
+ if (config->cur && config->cur->type == XINE_CONFIG_TYPE_UNKNOWN)
config->cur = NULL;
result = __config_get_current_entry (this, entry);
pthread_mutex_unlock(&config->config_lock);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 11:37:43 +0000