Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sat, 19 Dec 2009 12:15:39 +0000 (13:15 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 19 Dec 2009 12:15:39 +0000 (13:15 +0100)
Conflicts:
osx_write.c

http_send.c
osx_write.c

index 3959cad..6ededb2 100644 (file)
@@ -135,7 +135,7 @@ static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
        phsd->status = HTTP_CONNECTED;
 }
 
-static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
 {
        struct sender_client *sc, *tmp;
 
@@ -146,6 +146,9 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wf
                struct private_http_sender_data *phsd = sc->private_data;
                if (phsd->status == HTTP_CONNECTED) /* need to recv get request */
                        para_fd_set(sc->fd, rfds, max_fileno);
+               if (phsd->status == HTTP_GOT_GET_REQUEST ||
+                               phsd->status == HTTP_INVALID_GET_REQUEST)
+                       para_fd_set(sc->fd, wfds, max_fileno);
        }
 }
 
index bc11e61..97a7ccf 100644 (file)
@@ -14,7 +14,6 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <CoreAudio/CoreAudio.h>
 
 #include "para.h"
 #include "fd.h"
 #include "osx_write.cmdline.h"
 #include "error.h"
 
-
-#include <CoreAudio/CoreAudio.h>
+#include <CoreServices/CoreServices.h>
 #include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/DefaultAudioOutput.h>
+#include <AudioToolbox/AudioToolbox.h>
 
 /** describes one input buffer for the osx writer */
 struct osx_buffer {