New scripts/setup which interactively sets up a DisOrder configuration

[disorder] / server / speaker.c

diff --git a/server/speaker.c b/server/speaker.c
index 8a3eb06cc91a897c39d4a8880c4d28c502ec19a5..407b1d7a6f37000e9d1334eadf8d5c0333dc881a 100644 (file)
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -563,8 +563,11 @@ static void mainloop(void) {
              playing = 0;
             }
            destroy(t);
-         } else
+         } else {
+            sm.type = SM_UNKNOWN;
+            speaker_send(1, &sm);
            error(0, "SM_CANCEL for unknown track %s", sm.id);
+          }
           report();
          break;
        case SM_RELOAD:
@@ -635,10 +638,10 @@ int main(int argc, char **argv) {
   if(getuid() == 0 || geteuid() == 0) fatal(0, "do not run as root");
   /* identify the backend used to play */
   for(n = 0; backends[n]; ++n)
-    if(backends[n]->backend == config->speaker_backend)
+    if(backends[n]->backend == config->api)
       break;
   if(!backends[n])
-    fatal(0, "unsupported backend %d", config->speaker_backend);
+    fatal(0, "unsupported api %d", config->api);
   backend = backends[n];
   /* backend-specific initialization */
   backend->init();