ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup, fixes, comments...

Browse source
This commit is contained in:
Fischlurch 2009-02-06 22:51:39 +01:00
parent 6fb86a2caf
commit 8e5097cbe0
7 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/backend/thread-wrapper.hpp
View file

@ -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;

2
src/common/instancehandle.hpp
View file

@ -177,7 +177,7 @@ namespace lumiera {
: private boost::noncopyable
{
LumieraInterface desc_;
I* instance_;
I* instance_;
facade::Link<I,FA> facadeLink_;
typedef InstanceHandle<I,FA> _ThisType;

23
src/common/interfaceproxy.cpp
View file

@ -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> 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<Handle_GuiNotification>
: public Holder<Handle_GuiNotification>
class Proxy<IHandle_GuiNotification>
: public Holder<IHandle_GuiNotification>
{
//----Proxy-Implementation-of-GuiNotification--------
@ -136,8 +137,8 @@ namespace lumiera {
};
template void openProxy<Handle_GuiNotification> (Handle_GuiNotification const&);
template void closeProxy<Handle_GuiNotification> (void);
template void openProxy<IHandle_GuiNotification> (IHandle_GuiNotification const&);
template void closeProxy<IHandle_GuiNotification> (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<Handle_DummyPlayer>
: public Holder<Handle_DummyPlayer>
class Proxy<IHandle_DummyPlayer>
: public Holder<IHandle_DummyPlayer>
{
//----Proxy-Implementation-of-DummyPlayer--------
typedef proc::play::DummyPlayer::Process Process;
@ -247,8 +248,8 @@ namespace lumiera {
};
template void openProxy<Handle_DummyPlayer> (Handle_DummyPlayer const&);
template void closeProxy<Handle_DummyPlayer> (void);
template void openProxy<IHandle_DummyPlayer> (IHandle_DummyPlayer const&);
template void closeProxy<IHandle_DummyPlayer> (void);
} // namespace facade

2
src/gui/controller/playback-controller.hpp
View file

@ -38,7 +38,7 @@ namespace controller {
class PlaybackController
: boost::noncopyable,
: boost::noncopyable
{
public:

5
src/include/dummy-player-facade.h
View file

@ -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) )
);

1
src/include/guinotification-facade.h
View file

@ -70,6 +70,7 @@ namespace gui {
* reason causing this shutdown */
virtual void triggerGuiShutdown (string const& cause) =0;
protected:
virtual ~GuiNotification() {}
};

8
src/lib/handle.hpp
View file

@ -82,10 +82,10 @@ namespace lib {
: smPtr_()
{ }
Handle (Handle const& r) : smPtr_(r.smPtr_) { }
template<class Y> Handle (shared_ptr<Y> const& r) : smPtr_(r) { }
template<class Y> explicit Handle (weak_ptr<Y> const& wr) : smPtr_(wr) { }
template<class Y> explicit Handle (std::auto_ptr<Y> & ar) : smPtr_(ar) { }
Handle (Handle const& r) : smPtr_(r.smPtr_) { }
template<class Y> explicit Handle (shared_ptr<Y> const& r) : smPtr_(r) { }
template<class Y> explicit Handle (weak_ptr<Y> const& wr) : smPtr_(wr) { }
template<class Y> explicit Handle (std::auto_ptr<Y> & ar) : smPtr_(ar) { }
Handle& operator=(Handle const& r) { smPtr_ = r.smPtr_; return *this; }
template<class Y> Handle& operator=(shared_ptr<Y> const& sr) { smPtr_ = sr; return *this; }