From: Mike Brady Date: Fri, 8 Feb 2019 09:40:51 +0000 (+0000) Subject: fix a few minor compilation errors X-Git-Tag: 3.3RC0~66^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b589879be8a3587ea9a8c80b4896b473f3e8f75;p=thirdparty%2Fshairport-sync.git fix a few minor compilation errors --- diff --git a/audio_alsa.c b/audio_alsa.c index 4cb187b2..ef65a345 100644 --- a/audio_alsa.c +++ b/audio_alsa.c @@ -27,8 +27,6 @@ #define ALSA_PCM_NEW_HW_PARAMS_API -#include "audio.h" -#include "common.h" #include #include #include @@ -37,6 +35,12 @@ #include #include +#include "config.h" + +#include "common.h" +#include "activity_monitor.h" +#include "audio.h" + enum alsa_backend_mode { abm_disconnected, abm_connected, @@ -983,7 +987,7 @@ static int init(int argc, char **argv) { if ((strcasecmp(str, "no") == 0) || (strcasecmp(str, "off") == 0) || (strcasecmp(str, "never") == 0)) config.disable_standby_mode = disable_standby_off; else if ((strcasecmp(str, "yes") == 0) || (strcasecmp(str, "on") == 0) || (strcasecmp(str, "always") == 0)) { - config.disable_standby_mode = disable_standby_on; + config.disable_standby_mode = disable_standby_always; config.keep_dac_busy = 1; } else if (strcasecmp(str, "while active") == 0) config.disable_standby_mode = disable_standby_while_active; diff --git a/common.h b/common.h index e13ebf9e..6fdf38c1 100644 --- a/common.h +++ b/common.h @@ -66,7 +66,7 @@ enum disable_standby_mode_type { disable_standby_off = 0, disable_standby_while_active, disable_standby_always -} +}; // the following enum is for the formats recognised -- currently only S16LE is recognised for input, // so these are output only for the present