From: Andre Noll <maan@systemlinux.org>
Date: Sat, 19 Dec 2009 12:15:39 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.1~5^2~16
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=f113a41a633c0541f0d8418baf40205f4553c885;hp=ba20c3fc5022b456e40acec90591e143a0c8c089;p=paraslash.git

Merge branch 'maint'

Conflicts:
	osx_write.c
---

diff --git a/http_send.c b/http_send.c
index 3959cad4..6ededb27 100644
--- a/http_send.c
+++ b/http_send.c
@@ -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);
 	}
 }
 
diff --git a/osx_write.c b/osx_write.c
index bc11e61a..97a7ccf4 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -14,7 +14,6 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
-#include <CoreAudio/CoreAudio.h>
 
 #include "para.h"
 #include "fd.h"
@@ -26,10 +25,9 @@
 #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 {