X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpbd%2Fcrossthread.h;h=e87879e4a31bb9a36698b1f71cc9548919be8c43;hb=569167a603ef812a234d3c02f6a94976571a70ea;hp=d172c9c60f65933df348e3130ab8ea74210b5d75;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git

diff --git a/libs/pbd/pbd/crossthread.h b/libs/pbd/pbd/crossthread.h
index d172c9c60f..e87879e4a3 100644
--- a/libs/pbd/pbd/crossthread.h
+++ b/libs/pbd/pbd/crossthread.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 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
@@ -28,28 +28,33 @@
 
 #include "pbd/libpbd_visibility.h"
 
+#ifdef PLATFORM_WINDOWS
+#include <windows.h>
+#endif // PLATFORM_WINDOWS
+
+
 /** A simple abstraction of a mechanism of signalling one thread from another.
  * The signaller calls ::wakeup() to tell the signalled thread to check for
- * work to be done. 
+ * work to be done.
  *
  * This implementation provides both ::selectable() for use in direct
  * poll/select-based event loops, and a Glib::IOSource via ::ios() for use
- * in Glib main loop based situations. 
+ * in Glib main loop based situations.
  */
 
-class LIBPBD_API CrossThreadChannel { 
-  public:
+class LIBPBD_API CrossThreadChannel {
+public:
 	/** if @a non_blocking is true, the channel will not cause blocking
 	 * when used in an event loop based on poll/select or the glib main
 	 * loop.
 	 */
 	CrossThreadChannel(bool non_blocking);
 	~CrossThreadChannel();
-	
+
 	/** Tell the listening thread that is has work to do.
 	 */
 	void wakeup();
-	
+
 	/* if the listening thread cares about the precise message
 	 * it is being sent, then ::deliver() can be used to send
 	 * a single byte message rather than a simple wakeup. These
@@ -57,49 +62,47 @@ class LIBPBD_API CrossThreadChannel {
 	 * because there is no way to know which byte value will be used
 	 * for ::wakeup()
 	 */
-        int deliver (char msg);
+	int deliver (char msg);
 
 	/** if using ::deliver() to wakeup the listening thread, then
 	 * the listener should call ::receive() to fetch the message
 	 * type from the channel.
+	 *
+	 * wait = true only make sense for non_blocking channels,
+	 * it polls for data to become available.
 	 */
-        int receive (char& msg);
+	int receive (char& msg, bool wait = false);
 
 	/** empty the channel of all requests.
-	 * Typically this is done as soon as input 
+	 * Typically this is done as soon as input
 	 * is noticed on the channel, because the
 	 * handler will look at a separately managed work
 	 * queue. The actual number of queued "wakeups"
 	 * in the channel will not be important.
 	 */
 	void drain ();
-	static void drain (int fd);
 
-	/** File descriptor that can be used with poll/select to
-	 * detect when wakeup() has been called on this channel.
-	 * It be marked as readable/input-ready when this condition
-	 * is true. It has already been marked non-blocking.
-	 */
-	int selectable() const { return fds[0]; }
-
-	/* glibmm 2.22 and earlier has a terrifying bug that will
-	   cause crashes whenever a Source is removed from
-	   a MainContext (including the destruction of the MainContext),
-	   because the Source is destroyed "out from under the nose of" 
-	   the RefPtr. I (Paul) have fixed this (https://bugzilla.gnome.org/show_bug.cgi?id=561885)
-	   but in the meantime, we need a hack to get around the issue.
-	*/
-	Glib::RefPtr<Glib::IOSource> ios();
-	void drop_ios ();
-
-	/** returns true if the CrossThreadChannel was
-	 * correctly constructed.
-	 */
-	bool ok() const { return fds[0] >= 0 && fds[1] >= 0; }
+	void set_receive_handler (sigc::slot<bool,Glib::IOCondition> s);
+	void attach (Glib::RefPtr<Glib::MainContext>);
 
-  private:
-	Glib::RefPtr<Glib::IOSource>* _ios; // lazily constructed
+private:
+	friend gboolean cross_thread_channel_call_receive_slot (GIOChannel*, GIOCondition condition, void *data);
+
+	GIOChannel* receive_channel;
+	GSource*    receive_source;
+	sigc::slot<bool,Glib::IOCondition> receive_slot;
+
+	bool poll_for_request();
+
+#ifndef PLATFORM_WINDOWS
 	int fds[2]; // current implementation uses a pipe/fifo
+#else
+
+	SOCKET send_socket;
+	SOCKET receive_socket;
+	struct sockaddr_in recv_address;
+#endif
+
 };
 
 #endif /* __pbd__crossthread_h__ */