X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/4dac3d2aee45debf137b1dfaa8751b406337ba68..6e2c9f5f8b0b75d89c750dd1a2d8a4fb9d1d3952:/server/speaker.c?ds=sidebyside diff --git a/server/speaker.c b/server/speaker.c index 8d6629d..be783af 100644 --- a/server/speaker.c +++ b/server/speaker.c @@ -247,7 +247,7 @@ static int formats_equal(const ao_sample_format *a, static void idle(void) { D(("idle")); #if API_ALSA - if(pcm) { + if(!config->speaker_command && pcm) { int err; if((err = snd_pcm_nonblock(pcm, 0)) < 0) @@ -663,7 +663,6 @@ int main(int argc, char **argv) { #endif set_progname(argv); - mem_init(0); if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); while((n = getopt_long(argc, argv, "hVc:dD", options, 0)) >= 0) { switch(n) {