diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-12-12 10:55:40 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-12-12 11:12:10 -0500 |
| commit | f369f339555e5700c5edd13b351c22fa1a91bb4b (patch) | |
| tree | e2b09f9f43d05d37a25f85f6416882e3724259ff /libs/pbd/pbd | |
| parent | 6b00ff6198210ac3f7e11d9758f4af1962961f1d (diff) | |
move BaseUI::_name into EventLoop; rename access method in EventLoop as event_loop_name() to clarify usage
Diffstat (limited to 'libs/pbd/pbd')
| -rw-r--r-- | libs/pbd/pbd/base_ui.h | 3 | ||||
| -rw-r--r-- | libs/pbd/pbd/event_loop.h | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/pbd/pbd/base_ui.h b/libs/pbd/pbd/base_ui.h index ec2cf33678..029d8223ea 100644 --- a/libs/pbd/pbd/base_ui.h +++ b/libs/pbd/pbd/base_ui.h @@ -54,8 +54,6 @@ class LIBPBD_API BaseUI : public sigc::trackable, public PBD::EventLoop Glib::Threads::Thread* event_loop_thread() const { return run_loop_thread; } bool caller_is_self () const { return Glib::Threads::Thread::self() == run_loop_thread; } - std::string name() const { return _name; } - bool ok() const { return _ok; } static RequestType new_request_type(); @@ -107,7 +105,6 @@ class LIBPBD_API BaseUI : public sigc::trackable, public PBD::EventLoop virtual void handle_ui_requests () = 0; private: - std::string _name; BaseUI* base_ui_instance; CrossThreadChannel request_channel; diff --git a/libs/pbd/pbd/event_loop.h b/libs/pbd/pbd/event_loop.h index a100365497..3ea6388f3f 100644 --- a/libs/pbd/pbd/event_loop.h +++ b/libs/pbd/pbd/event_loop.h @@ -20,6 +20,7 @@ #ifndef __pbd_event_loop_h__ #define __pbd_event_loop_h__ +#include <string> #include <boost/function.hpp> #include <boost/bind.hpp> /* we don't need this here, but anything calling call_slot() probably will, so this is convenient */ #include <glibmm/threads.h> @@ -41,7 +42,7 @@ namespace PBD class LIBPBD_API EventLoop { public: - EventLoop() {} + EventLoop (std::string const&); virtual ~EventLoop() {} enum RequestType { @@ -73,12 +74,14 @@ class LIBPBD_API EventLoop virtual void call_slot (InvalidationRecord*, const boost::function<void()>&) = 0; virtual Glib::Threads::Mutex& slot_invalidation_mutex() = 0; + std::string event_loop_name() const { return _name; } + static EventLoop* get_event_loop_for_thread(); static void set_event_loop_for_thread (EventLoop* ui); private: static Glib::Threads::Private<EventLoop> thread_event_loop; - + std::string _name; }; } |