X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/937be4c02816d026de3063f32d82fafda1f3c512..083bdba5eac4e283f6f492ed99ecbbb673f2567e:/lib/configuration.c diff --git a/lib/configuration.c b/lib/configuration.c index 448a8ab..34f8d53 100644 --- a/lib/configuration.c +++ b/lib/configuration.c @@ -439,7 +439,7 @@ static int set_backend(const struct config_state *cs, return -1; } if(!strcmp(vec[0], "alsa")) { -#if API_ALSA +#if HAVE_ALSA_ASOUNDLIB_H *valuep = BACKEND_ALSA; #else error(0, "%s:%d: ALSA is not available on this platform", @@ -458,6 +458,14 @@ static int set_backend(const struct config_state *cs, cs->path, cs->line); return -1; #endif + } else if(!strcmp(vec[0], "oss")) { +#if HAVE_SYS_SOUNDCARD_H + *valuep = BACKEND_OSS; +#else + error(0, "%s:%d: OSS is not available on this platform", + cs->path, cs->line); + return -1; +#endif } else { error(0, "%s:%d: invalid '%s' value '%s'", cs->path, cs->line, whoami->name, vec[0]); @@ -585,6 +593,19 @@ static const struct conftype } \ } while(0) +static int validate_isabspath(const struct config_state *cs, + int nvec, char **vec) { + int n; + + for(n = 0; n < nvec; ++n) + if(vec[n][0] != '/') { + error(errno, "%s:%d: %s: not an absolute path", + cs->path, cs->line, vec[n]); + return -1; + } + return 0; +} + static int validate_isdir(const struct config_state *cs, int nvec, char **vec) { VALIDATE_FILE(S_ISDIR, "directory"); @@ -855,7 +876,7 @@ static const struct conf conf[] = { { C(device), &type_string, validate_any }, { C(gap), &type_integer, validate_non_negative }, { C(history), &type_integer, validate_positive }, - { C(home), &type_string, validate_isdir }, + { C(home), &type_string, validate_isabspath }, { C(listen), &type_stringlist, validate_port }, { C(lock), &type_boolean, validate_any }, { C(mixer), &type_string, validate_ischr }, @@ -875,6 +896,7 @@ static const struct conf conf[] = { { C2(restrict, restrictions), &type_restrict, validate_any }, { C(sample_format), &type_sample_format, validate_sample_format }, { C(scratch), &type_string_accum, validate_isreg }, + { C(short_display), &type_integer, validate_positive }, { C(signal), &type_signal, validate_any }, { C(sox_generation), &type_integer, validate_non_negative }, { C(speaker_backend), &type_backend, validate_any }, @@ -1002,6 +1024,7 @@ static struct config *config_default(void) { c->multicast_ttl = 1; c->authorization_algorithm = xstrdup("sha1"); c->noticed_history = 31; + c->short_display = 32; return c; } @@ -1076,8 +1099,10 @@ static void config_postdefaults(struct config *c, else if(c->broadcast.n) c->speaker_backend = BACKEND_NETWORK; else { -#if API_ALSA +#if HAVE_ALSA_ASOUNDLIB_H c->speaker_backend = BACKEND_ALSA; +#elif HAVE_SYS_SOUNDCARD_H + c->speaker_backend = BACKEND_OSS; #elif HAVE_COREAUDIO_AUDIOHARDWARE_H c->speaker_backend = BACKEND_COREAUDIO; #else @@ -1091,20 +1116,21 @@ static void config_postdefaults(struct config *c, if(c->speaker_backend == BACKEND_NETWORK && !c->broadcast.n) fatal(0, "speaker_backend is network but broadcast is not set"); } - if(c->speaker_backend == BACKEND_NETWORK) { - /* Override sample format */ + /* Override sample format */ + switch(c->speaker_backend) { + case BACKEND_NETWORK: c->sample_format.rate = 44100; c->sample_format.channels = 2; c->sample_format.bits = 16; c->sample_format.endian = ENDIAN_BIG; - } - if(c->speaker_backend == BACKEND_COREAUDIO) { - /* Override sample format */ + break; + case BACKEND_COREAUDIO: c->sample_format.rate = 44100; c->sample_format.channels = 2; c->sample_format.bits = 16; c->sample_format.endian = ENDIAN_NATIVE; - } + break; + } } /** @brief (Re-)read the config file @@ -1162,6 +1188,8 @@ char *config_private(void) { char *config_userconf(const char *home, const struct passwd *pw) { char *s; + if(!home && !pw && !(pw = getpwuid(getuid()))) + fatal(0, "cannot determine our username"); byte_xasprintf(&s, "%s/.disorder/passwd", home ? home : pw->pw_dir); return s; }