diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-05-07 14:38:14 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-05-07 14:38:14 +0000 |
| commit | 4b58b17a2aa8818482a44e057301448057e31d05 (patch) | |
| tree | 3b9a26cc6f30cffc976a9609298b5fc8c9aeea4b /src/xine-engine/xine_interface.c | |
| parent | 7b0f0295ef02cfe9dcf9218d5563d251afc16847 (diff) | |
| download | xine-lib-4b58b17a2aa8818482a44e057301448057e31d05.tar.gz xine-lib-4b58b17a2aa8818482a44e057301448057e31d05.tar.bz2 | |
* fix config file loading: enums are read as numbers, although written as strings
-> read and update them as strings
* remove the obsolete CONFIG_TYPE_* constants and replace them with
XINE_CONFIG_TYPE_* from xine.h
CVS patchset: 6496
CVS date: 2004/05/07 14:38:14
Diffstat (limited to 'src/xine-engine/xine_interface.c')
| -rw-r--r-- | src/xine-engine/xine_interface.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); |