uaudio: more sophisticated choice of default playback API

[disorder] / lib / uaudio-command.c

diff --git a/lib/uaudio-command.c b/lib/uaudio-command.c
index 812a3f26a2c2678220ccccb48178549c4f54497b..f93454a10210dddcf4bfbb7ca83595aff77f2ca5 100644 (file)
--- a/lib/uaudio-command.c
+++ b/lib/uaudio-command.c
@@ -42,6 +42,9 @@ static int command_fd;
 /** @brief Child process ID */
 static pid_t command_pid;
 
+/** @brief Whether to suspend on pause */
+static int command_suspend_on_pause;
+
 static const char *const command_options[] = {
   "command",
   "pause-mode",
@@ -58,10 +61,10 @@ static void command_wait(void) {
   while((rc = waitpid(command_pid, &w, 0) < 0 && errno == EINTR))
     ;
   if(rc < 0)
-    fatal(errno, "waitpid");
+    disorder_fatal(errno, "waitpid");
   if(w) {
     ws = wstat(w);
-    error(0, "command subprocess %s", ws);
+    disorder_error(0, "command subprocess %s", ws);
     xfree(ws);
   }
 }
@@ -72,7 +75,7 @@ static void command_open(void) {
   const char *command;
 
   if(!(command = uaudio_get("command", NULL)))
-    fatal(0, "'command' not set");
+    disorder_fatal(0, "'command' not set");
   xpipe(pfd);
   command_pid = xfork();
   if(!command_pid) {
@@ -85,15 +88,19 @@ static void command_open(void) {
      * format.  The original intended model is that you adapt DisOrder to the
      * command you run but it'd be nice to support the opposite. */
     execl("/bin/sh", "sh", "-c", command, (char *)0);
-    fatal(errno, "error executing /bin/sh");
+    disorder_fatal(errno, "error executing /bin/sh");
   }
   close(pfd[0]);
   command_fd = pfd[1];
 }
 
 /** @brief Send audio data to subprocess */
-static size_t command_play(void *buffer, size_t nsamples) {
-  uaudio_schedule_synchronize();
+static size_t command_play(void *buffer, size_t nsamples, unsigned flags) {
+  uaudio_schedule_sync();
+  /* If we're pausing and want that to be represented by stopping writing, we
+   * just pretend */
+  if((flags & UAUDIO_PAUSED) && command_suspend_on_pause)
+    return nsamples;
   const size_t bytes = nsamples * uaudio_sample_size;
   int written = write(command_fd, buffer, bytes);
   if(written < 0) {
@@ -101,30 +108,33 @@ static size_t command_play(void *buffer, size_t nsamples) {
     case EINTR:
       return 0;                        /* will retry */
     case EPIPE:
-      error(0, "audio command subprocess terminated");
+      disorder_error(0, "audio command subprocess terminated");
       command_wait();
       command_open();
       return 0;                        /* will retry */
     default:
-      fatal(errno, "error writing to audio command subprocess");
+      disorder_fatal(errno, "error writing to audio command subprocess");
     }
   }
+  /* TODO what if we write a partial sample? Actually reasonably unlikely but
+   * not impossible.  Maybe someone who actually uses this backend should sort
+   * it out. */
   const size_t written_samples = written / uaudio_sample_size;
-  uaudio_schedule_update(written_samples);
+  uaudio_schedule_sent(written_samples);
   return written_samples;
 }
 
 static void command_start(uaudio_callback *callback,
-                      void *userdata) {
+                          void *userdata) {
   const char *pausemode = uaudio_get("pause-mode", "silence");
   unsigned flags = 0;
 
   if(!strcmp(pausemode, "silence"))
-    flags |= UAUDIO_THREAD_FAKE_PAUSE;
+    command_suspend_on_pause = 0;
   else if(!strcmp(pausemode, "suspend"))
-    ;
+    command_suspend_on_pause = 1;
   else
-    fatal(0, "unknown pause mode '%s'", pausemode);
+    disorder_fatal(0, "unknown pause mode '%s'", pausemode);
   command_open();
   uaudio_schedule_init();
   uaudio_thread_start(callback,
@@ -140,17 +150,9 @@ static void command_stop(void) {
   command_wait();
 }
 
-static void command_activate(void) {
-  uaudio_schedule_reactivated = 1;
-  uaudio_thread_activate();
-}
-
-static void command_deactivate(void) {
-  uaudio_thread_deactivate();
-}
-
 static void command_configure(void) {
   uaudio_set("command", config->speaker_command);
+  uaudio_set("pause-mode", config->pause_mode);
 }
 
 const struct uaudio uaudio_command = {
@@ -158,9 +160,10 @@ const struct uaudio uaudio_command = {
   .options = command_options,
   .start = command_start,
   .stop = command_stop,
-  .activate = command_activate,
-  .deactivate = command_deactivate,
+  .activate = uaudio_thread_activate,
+  .deactivate = uaudio_thread_deactivate,
   .configure = command_configure,
+  .flags = UAUDIO_API_CLIENT | UAUDIO_API_SERVER,
 };
 
 /*