Merge branch 'master' into windows

[ardour.git] / libs / pbd / pbd / abstract_ui.h

diff --git a/libs/pbd/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h
index 88c27aa0bce7c3787db8106bf2eee9a97d8983c6..905074c474bba983547f076619ff3fb5543e0efc 100644 (file)
--- a/libs/pbd/pbd/abstract_ui.h
+++ b/libs/pbd/pbd/abstract_ui.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1998-99 Paul Barton-Davis 
+    Copyright (C) 1998-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
@@ -24,53 +24,67 @@
 #include <string>
 #include <pthread.h>
 
-#include <sigc++/sigc++.h>
+#include <glibmm/threads.h>
 
-#include <glibmm/thread.h>
-
-#include <pbd/receiver.h>
-#include <pbd/ringbufferNPT.h>
-#include <pbd/base_ui.h>
+#include "pbd/receiver.h"
+#include "pbd/ringbufferNPT.h"
+#include "pbd/signals.h"
+#include "pbd/base_ui.h"
 
 class Touchable;
 
-template <class RequestObject>
+template<typename RequestObject>
 class AbstractUI : public BaseUI
 {
   public:
-       AbstractUI (std::string name, bool with_signal_pipe);
+       AbstractUI (const std::string& name);
        virtual ~AbstractUI() {}
 
-       virtual bool caller_is_ui_thread() = 0;
-
-       void call_slot (sigc::slot<void> el_slot) {
-               RequestObject *req = get_request (BaseUI::CallSlot);
-               
-               if (req == 0) {
-                       return;
-               }
-               
-               req->slot = el_slot;
-               send_request (req);
-       }       
+       void register_thread (std::string, pthread_t, std::string, uint32_t num_requests);
+       void call_slot (EventLoop::InvalidationRecord*, const boost::function<void()>&);
+        Glib::Threads::Mutex& slot_invalidation_mutex() { return request_buffer_map_lock; }
 
-       void register_thread (pthread_t, std::string);
-       void register_thread_with_request_count (pthread_t, std::string, uint32_t num_requests);
+       Glib::Threads::Mutex request_buffer_map_lock;
 
   protected:
-       typedef RingBufferNPT<RequestObject> RequestBuffer;
+       struct RequestBuffer : public PBD::RingBufferNPT<RequestObject> {
+                bool dead;
+                AbstractUI<RequestObject>& ui;
+                RequestBuffer (uint32_t size, AbstractUI<RequestObject>& uir) 
+                        : PBD::RingBufferNPT<RequestObject> (size)
+                        , dead (false) 
+                        , ui (uir) {}
+        };
        typedef typename RequestBuffer::rw_vector RequestBufferVector;
-       typedef typename std::map<pthread_t,RequestBuffer*>::iterator RequestBufferMapIterator;
 
-    Glib::Mutex request_buffer_map_lock;
+#if defined(__MINGW32__)
+
+       struct pthread_cmp
+       {
+               bool operator() (const ptw32_handle_t& thread1, const ptw32_handle_t& thread2)
+               {
+                       return thread1.p < thread2.p;
+               }
+       };
+       typedef typename std::map<pthread_t,RequestBuffer*, pthread_cmp>::iterator RequestBufferMapIterator;
+       typedef std::map<pthread_t,RequestBuffer*, pthread_cmp> RequestBufferMap;
+#else
+       typedef typename std::map<pthread_t,RequestBuffer*>::iterator RequestBufferMapIterator;
        typedef std::map<pthread_t,RequestBuffer*> RequestBufferMap;
+#endif
+
        RequestBufferMap request_buffers;
-       pthread_key_t thread_request_buffer_key;
+        static Glib::Threads::Private<RequestBuffer> per_thread_request_buffer;
+       
+       Glib::Threads::Mutex               request_list_lock;
+       std::list<RequestObject*> request_list;
+       
        RequestObject* get_request (RequestType);
        void handle_ui_requests ();
        void send_request (RequestObject *);
 
        virtual void do_request (RequestObject *) = 0;
+       PBD::ScopedConnection new_thread_connection;
 };
 
 #endif /* __pbd_abstract_ui_h__ */