speaker process is now more consistent about whether it's using ALSA

or writing to a subprocess.

diff --git a/server/speaker.c b/server/speaker.c
index 055b08a7d7f3fd53aa57bfef1fb75bc67f7d392b..8d6629dee28f2abfde4c086a936caffd831fb071 100644 (file)
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -394,6 +394,8 @@ static int activate(void) {
     }
     return 0;
   }
     }
     return 0;
   }

+  if(config->speaker_command)
+    return -1;

 #if API_ALSA
   /* If we need to change format then close the current device. */
   if(pcm && !formats_equal(&playing->format, &pcm_format))
 #if API_ALSA
   /* If we need to change format then close the current device. */
   if(pcm && !formats_equal(&playing->format, &pcm_format))


@@ -555,7 +557,7 @@ static void play(size_t frames) {
   else
     avail_bytes = playing->used;
 
   else
     avail_bytes = playing->used;
 

-  if(kidfd == -1) {
+  if(!config->speaker_command) {

 #if API_ALSA
     snd_pcm_sframes_t pcm_written_frames;
     size_t avail_frames;
 #if API_ALSA
     snd_pcm_sframes_t pcm_written_frames;
     size_t avail_frames;


@@ -715,9 +717,10 @@ int main(int argc, char **argv) {
     alsa_slots = -1;
     kid_slot = -1;
     if(ready && !forceplay) {
     alsa_slots = -1;
     kid_slot = -1;
     if(ready && !forceplay) {

-      if(kidfd >= 0)
-        kid_slot = addfd(kidfd, POLLOUT);
-      else {
+      if(config->speaker_command) {
+        if(kidfd >= 0)
+          kid_slot = addfd(kidfd, POLLOUT);
+      } else {

 #if API_ALSA
         int retry = 3;
         
 #if API_ALSA
         int retry = 3;