X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fcrossthread.win.cc;h=69d744e81d19f2a8794cf09cc5611bff4cdded8b;hb=4dc63966f0872efe768dad61eb9b8785d06b92d1;hp=7f4967fe0abe8e46ae89f0a7960b1c753ea1f0d1;hpb=f72b87b44841b38f1046619b1a607b6a525a8d25;p=ardour.git

diff --git a/libs/pbd/crossthread.win.cc b/libs/pbd/crossthread.win.cc
index 7f4967fe0a..69d744e81d 100644
--- a/libs/pbd/crossthread.win.cc
+++ b/libs/pbd/crossthread.win.cc
@@ -1,51 +1,43 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+  Copyright (C) 2009 Paul Davis
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
 
 CrossThreadChannel::CrossThreadChannel (bool non_blocking)
-	: receive_channel (0) 
+	: receive_channel (0)
 	, receive_source (0)
 	, receive_slot ()
 	, send_socket()
 	, receive_socket()
 	, recv_address()
 {
-	WSADATA	wsaData;
-
-    if(WSAStartup(MAKEWORD(1,1),&wsaData) != 0)
-    {
-		std::cerr << "CrossThreadChannel::CrossThreadChannel() Winsock initialization failed with error: " << WSAGetLastError() << std::endl;
-        return;
-    }
-
 	struct sockaddr_in send_address;
 
 	// Create Send Socket
-    send_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    send_address.sin_family = AF_INET;
-    send_address.sin_addr.s_addr = inet_addr("127.0.0.1");
-    send_address.sin_port = htons(0);
-    int status = bind(send_socket, (SOCKADDR*)&send_address,   
-                  sizeof(send_address));
+	send_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+	send_address.sin_family = AF_INET;
+	send_address.sin_addr.s_addr = inet_addr("127.0.0.1");
+	send_address.sin_port = htons(0);
+	int status = bind(send_socket, (SOCKADDR*)&send_address,
+			  sizeof(send_address));
 
 	if (status != 0) {
 		std::cerr << "CrossThreadChannel::CrossThreadChannel() Send socket binding failed with error: " << WSAGetLastError() << std::endl;
-        return;
+		return;
 	}
 
 	// make the socket non-blockable if required
@@ -58,27 +50,27 @@ CrossThreadChannel::CrossThreadChannel (bool non_blocking)
 	}
 
 	// Create Receive Socket, this socket will be set to unblockable mode by IO channel
-    receive_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    recv_address.sin_family = AF_INET;
-    recv_address.sin_addr.s_addr = inet_addr("127.0.0.1");
-    recv_address.sin_port = htons(0);
-    status = bind(receive_socket, (SOCKADDR*)&recv_address, 
-                    sizeof(recv_address));
-    
+	receive_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+	recv_address.sin_family = AF_INET;
+	recv_address.sin_addr.s_addr = inet_addr("127.0.0.1");
+	recv_address.sin_port = htons(0);
+	status = bind(receive_socket, (SOCKADDR*)&recv_address,
+		      sizeof(recv_address));
+
 	if (status != 0) {
 		std::cerr << "CrossThreadChannel::CrossThreadChannel() Receive socket binding failed with error: " << WSAGetLastError() << std::endl;
-        return;
+		return;
 	}
 
 	// recieve socket will be made non-blocking by GSource which will use it
 
 	// get assigned port number for Receive Socket
 	int recv_addr_len = sizeof(recv_address);
-    status = getsockname(receive_socket, (SOCKADDR*)&recv_address, &recv_addr_len);
-    
+	status = getsockname(receive_socket, (SOCKADDR*)&recv_address, &recv_addr_len);
+
 	if (status != 0) {
 		std::cerr << "CrossThreadChannel::CrossThreadChannel() Setting receive socket address to local failed with error: " << WSAGetLastError() << std::endl;
-        return;
+		return;
 	}
 	
 	// construct IOChannel
@@ -101,11 +93,10 @@ CrossThreadChannel::~CrossThreadChannel ()
 
 	if (receive_channel) {
 		g_io_channel_unref (receive_channel);
-    }
+	}
 
 	closesocket(send_socket);
 	closesocket(receive_socket);
-	WSACleanup();
 }
 
 void
@@ -161,11 +152,38 @@ CrossThreadChannel::deliver (char msg)
 	return status;
 }
 
-int 
-CrossThreadChannel::receive (char& msg)
+bool
+CrossThreadChannel::poll_for_request()
+{
+	// windows before Vista has no poll
+	while(true) {
+		fd_set rfds;
+		FD_ZERO(&rfds);
+		FD_SET(receive_socket, &rfds);
+		if ((select(receive_socket+1, &rfds, NULL, NULL, NULL)) < 0) {
+			if (errno == EINTR) {
+				continue;
+			}
+			break;
+		}
+		if(FD_ISSET(receive_socket, &rfds)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+int
+CrossThreadChannel::receive (char& msg, bool wait)
 {
 	gsize read = 0;
 	GError *g_error = 0;
+
+	if (wait) {
+		if (!poll_for_request ()) {
+			return -1;
+		}
+	}
 	
 	// fetch the message from the channel.
 	GIOStatus g_status = g_io_channel_read_chars (receive_channel, &msg, sizeof(msg), &read, &g_error);