diff --git a/src/backend/thread-wrapper.hpp b/src/backend/thread-wrapper.hpp index 635602a97..e7e83ca57 100644 --- a/src/backend/thread-wrapper.hpp +++ b/src/backend/thread-wrapper.hpp @@ -41,6 +41,8 @@ namespace backend { using std::tr1::bind; using std::tr1::function; using lumiera::Literal; + using lib::Sync; + using lib::NonrecursiveLock_Waitable; typedef struct nobug_flag* NoBugFlag; diff --git a/src/common/instancehandle.hpp b/src/common/instancehandle.hpp index 6de4fbde9..9b9a12bd9 100644 --- a/src/common/instancehandle.hpp +++ b/src/common/instancehandle.hpp @@ -177,7 +177,7 @@ namespace lumiera { : private boost::noncopyable { LumieraInterface desc_; - I* instance_; + I* instance_; facade::Link facadeLink_; typedef InstanceHandle _ThisType; diff --git a/src/common/interfaceproxy.cpp b/src/common/interfaceproxy.cpp index f62330d65..ee6b854d3 100644 --- a/src/common/interfaceproxy.cpp +++ b/src/common/interfaceproxy.cpp @@ -106,7 +106,8 @@ namespace lumiera { namespace gui { - /** storage for the facade proxy factory used by client code to invoke through the interface */ + /** storage for the facade proxy factory + * used by client code to invoke through the interface */ lumiera::facade::Accessor GuiNotification::facade; } // namespace gui @@ -118,12 +119,12 @@ namespace lumiera { typedef InstanceHandle< LUMIERA_INTERFACE_INAME(lumieraorg_GuiNotification, 0) , gui::GuiNotification - > Handle_GuiNotification; + > IHandle_GuiNotification; template<> - class Proxy - : public Holder + class Proxy + : public Holder { //----Proxy-Implementation-of-GuiNotification-------- @@ -136,8 +137,8 @@ namespace lumiera { }; - template void openProxy (Handle_GuiNotification const&); - template void closeProxy (void); + template void openProxy (IHandle_GuiNotification const&); + template void closeProxy (void); } // namespace facade @@ -212,12 +213,12 @@ namespace lumiera { typedef lumiera::InstanceHandle< LUMIERA_INTERFACE_INAME(lumieraorg_DummyPlayer, 0) , proc::play::DummyPlayer - > Handle_DummyPlayer; + > IHandle_DummyPlayer; template<> - class Proxy - : public Holder + class Proxy + : public Holder { //----Proxy-Implementation-of-DummyPlayer-------- typedef proc::play::DummyPlayer::Process Process; @@ -247,8 +248,8 @@ namespace lumiera { }; - template void openProxy (Handle_DummyPlayer const&); - template void closeProxy (void); + template void openProxy (IHandle_DummyPlayer const&); + template void closeProxy (void); } // namespace facade diff --git a/src/gui/controller/playback-controller.hpp b/src/gui/controller/playback-controller.hpp index 97a6fca44..bf0eeff94 100644 --- a/src/gui/controller/playback-controller.hpp +++ b/src/gui/controller/playback-controller.hpp @@ -38,7 +38,7 @@ namespace controller { class PlaybackController - : boost::noncopyable, + : boost::noncopyable { public: diff --git a/src/include/dummy-player-facade.h b/src/include/dummy-player-facade.h index 547124468..fcecb234f 100644 --- a/src/include/dummy-player-facade.h +++ b/src/include/dummy-player-facade.h @@ -89,8 +89,6 @@ namespace proc { { public: void play(bool); - void* const getFrame(); - }; @@ -98,6 +96,8 @@ namespace proc { virtual Process start(LumieraDisplaySlot viewerHandle) =0; + + protected: virtual ~DummyPlayer(); }; @@ -119,7 +119,6 @@ LUMIERA_INTERFACE_DECLARE (lumieraorg_DummyPlayer, 0 , LUMIERA_INTERFACE_SLOT (LumieraPlayProcess, startPlay, (LumieraDisplaySlot) ) , LUMIERA_INTERFACE_SLOT (void, togglePlay,(LumieraPlayProcess, bool)) , LUMIERA_INTERFACE_SLOT (void, terminate, (LumieraPlayProcess) ) - , LUMIERA_INTERFACE_SLOT (void *, getFrame, (LumieraPlayProcess) ) ); diff --git a/src/include/guinotification-facade.h b/src/include/guinotification-facade.h index dd07ad68c..c28f47d85 100644 --- a/src/include/guinotification-facade.h +++ b/src/include/guinotification-facade.h @@ -70,6 +70,7 @@ namespace gui { * reason causing this shutdown */ virtual void triggerGuiShutdown (string const& cause) =0; + protected: virtual ~GuiNotification() {} }; diff --git a/src/lib/handle.hpp b/src/lib/handle.hpp index 30bbca52f..3c15296a2 100644 --- a/src/lib/handle.hpp +++ b/src/lib/handle.hpp @@ -82,10 +82,10 @@ namespace lib { : smPtr_() { } - Handle (Handle const& r) : smPtr_(r.smPtr_) { } - template Handle (shared_ptr const& r) : smPtr_(r) { } - template explicit Handle (weak_ptr const& wr) : smPtr_(wr) { } - template explicit Handle (std::auto_ptr & ar) : smPtr_(ar) { } + Handle (Handle const& r) : smPtr_(r.smPtr_) { } + template explicit Handle (shared_ptr const& r) : smPtr_(r) { } + template explicit Handle (weak_ptr const& wr) : smPtr_(wr) { } + template explicit Handle (std::auto_ptr & ar) : smPtr_(ar) { } Handle& operator=(Handle const& r) { smPtr_ = r.smPtr_; return *this; } template Handle& operator=(shared_ptr const& sr) { smPtr_ = sr; return *this; }