use config_get_positive() instead of manual parsing

Simplify some code by using config_get_positive(), instead of doing
manual parsing and validation each time.
This commit is contained in:
Max Kellermann
2009-01-21 08:48:02 +01:00
parent f11eb14c8a
commit 2362ee4a48
3 changed files with 20 additions and 80 deletions

View File

@@ -71,7 +71,7 @@
static GRand *g_rand;
static Playlist playlist;
static int playlist_state = PLAYLIST_STATE_STOP;
unsigned playlist_max_length = DEFAULT_PLAYLIST_MAX_LENGTH;
unsigned playlist_max_length;
static int playlist_stopOnError;
static unsigned playlist_errorCount;
static int playlist_noGoToNext;
@@ -135,9 +135,6 @@ playlist_tag_event(void)
void initPlaylist(void)
{
char *test;
struct config_param *param;
g_rand = g_rand_new();
playlist.length = 0;
@@ -147,14 +144,8 @@ void initPlaylist(void)
playlist.queued = -1;
playlist.current = -1;
param = config_get_param(CONF_MAX_PLAYLIST_LENGTH);
if (param) {
playlist_max_length = strtol(param->value, &test, 10);
if (*test != '\0')
g_error("max playlist length \"%s\" is not an integer, "
"line %i", param->value, param->line);
}
playlist_max_length = config_get_positive(CONF_MAX_PLAYLIST_LENGTH,
DEFAULT_PLAYLIST_MAX_LENGTH);
playlist_saveAbsolutePaths =
config_get_bool(CONF_SAVE_ABSOLUTE_PATHS,