From 268f8cbc4c80ea390782fa5a9a5cd1d3ff52820b Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Mon, 9 Feb 2009 01:21:01 +0100 Subject: [PATCH] refactor interfaceproxy.cpp to rather include the definitions this allows to put the proxy definitions alongside with the actually implementing service, which makes much more sense than having all in one huge interfaceproxy.cpp file --- src/common/interfaceproxy.cpp | 173 ++---------------- src/gui/display-interface-proxy.hpp | 94 ++++++++++ src/gui/notification-interface-proxy.hpp | 81 ++++++++ .../play/dummy-player-interface-proxy.hpp | 99 ++++++++++ 4 files changed, 287 insertions(+), 160 deletions(-) create mode 100644 src/gui/display-interface-proxy.hpp create mode 100644 src/gui/notification-interface-proxy.hpp create mode 100644 src/proc/play/dummy-player-interface-proxy.hpp diff --git a/src/common/interfaceproxy.cpp b/src/common/interfaceproxy.cpp index 20ec00218..1970cce21 100644 --- a/src/common/interfaceproxy.cpp +++ b/src/common/interfaceproxy.cpp @@ -100,172 +100,25 @@ namespace lumiera { - /* ==================== GuiNotification =================================== */ + + /* ===================================================================== */ + /* including explicit Proxy-Definitions for all facade interfaces */ + /* ===================================================================== */ + + + + /* ==================== GuiNotification ================================ */ -#include "include/guinotification-facade.h" - -namespace gui { - - /** storage for the facade proxy factory - * used by client code to invoke through the interface */ - lumiera::facade::Accessor GuiNotification::facade; - -} // namespace gui +#include "gui/notification-interface-proxy.hpp" - -namespace lumiera { - namespace facade { + /* ==================== gui::Display =================================== */ - typedef InstanceHandle< LUMIERA_INTERFACE_INAME(lumieraorg_GuiNotification, 0) - , gui::GuiNotification - > IHandle_GuiNotification; - - - template<> - class Proxy - : public Holder - { - //----Proxy-Implementation-of-GuiNotification-------- - - void displayInfo (string const& text) { _i_.displayInfo (cStr(text)); } - void triggerGuiShutdown (string const& cause) { _i_.triggerGuiShutdown (cStr(cause)); } - - - public: - Proxy (IHandle const& iha) : THolder(iha) {} - }; - - - template void openProxy (IHandle_GuiNotification const&); - template void closeProxy (void); - - } // namespace facade - -} // namespace lumiera +#include "gui/display-interface-proxy.hpp" - - - - /* ==================== gui::Display ====================================== */ + /* ==================== DummyPlayer ==================================== */ -#include "include/display-facade.h" - -namespace lumiera { - - /** storage for the facade proxy factory - * used by client code to invoke through the interface */ - lumiera::facade::Accessor Display::facade; - - /// emit the vtable here into this translation unit within liblumieracommon.so... - Display::~Display() { } - -} // namespace lumiera +#include "proc/play/dummy-player-interface-proxy.hpp" - -namespace lumiera { - namespace facade { - - typedef InstanceHandle< LUMIERA_INTERFACE_INAME(lumieraorg_Display, 0) - , lumiera::Display - > IHandle_Display; - - - template<> - class Proxy - : public Holder - { - //----Proxy-Implementation-of-lumiera::Display-------- - - Display::Sink - getHandle (LumieraDisplaySlot display) - { - _i_.allocate (display); - Sink sinkHandle; - sinkHandle.activate (display, _i_.release); - if (lumiera_error_peek() || !sinkHandle) - throw lumiera::error::State("failed to allocate output DisplayerSlot", - lumiera_error()); - return sinkHandle; - } - - - public: - Proxy (IHandle const& iha) : THolder(iha) {} - }; - - - template void openProxy (IHandle_Display const&); - template void closeProxy (void); - - } // namespace facade - -} // namespace lumiera - - - - - - - /* ==================== DummyPlayer ======================================= */ - -#include "proc/play/dummy-player-service.hpp" - -namespace proc { - namespace play { - - /** storage for the DummyPlayer facade proxy factory... */ - lumiera::facade::Accessor DummyPlayer::facade; - -} } - - -namespace lumiera { - namespace facade { - - typedef lumiera::InstanceHandle< LUMIERA_INTERFACE_INAME(lumieraorg_DummyPlayer, 0) - , proc::play::DummyPlayer - > IHandle_DummyPlayer; - - - template<> - class Proxy - : public Holder - { - //----Proxy-Implementation-of-DummyPlayer-------- - typedef proc::play::DummyPlayer::Process Process; - typedef proc::play::ProcessImpl ProcessImpl; - - /** @note as an optimisation we hand out a direct reference - * to the implementing process object. While this ref could - * still be passed as handle to the C Language interface, using - * it directly within the client (=GUI) bypasses the C interface - * and thus leaves us only with one level of indirection, - * irrespective if using the C or C++ interface. - */ - Process start(LumieraDisplaySlot viewerHandle) - { - ProcessImpl* pP = static_cast (_i_.startPlay (viewerHandle)); - - if (!pP) - throw lumiera::error::State("failed to start DummyPlayer", lumiera_error()); - - return pP->createHandle(); - } - - - - public: - Proxy (IHandle const& iha) : THolder(iha) {} - }; - - - template void openProxy (IHandle_DummyPlayer const&); - template void closeProxy (void); - - - } // namespace facade - -} // namespace lumiera diff --git a/src/gui/display-interface-proxy.hpp b/src/gui/display-interface-proxy.hpp new file mode 100644 index 000000000..8ae035124 --- /dev/null +++ b/src/gui/display-interface-proxy.hpp @@ -0,0 +1,94 @@ +/* + Display(Proxy) - service providing access to a display for outputting frames + + Copyright (C) Lumiera.org + 2009, Hermann Vosseler + + 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 the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + + +/** @file display-interface-proxy.hpp + ** This is an implementation fragment, intended to be included into common/interfaceproxy.cpp + ** + ** The purpose is to define a proxy implementation of lumiera::Display, in order to + ** redirect any calls through the associated C Language Interface "lumieraorg_Display" + ** + ** @see display-facade.hpp + ** @see display-service.hpp actual implementation within the GUI + */ + + + + + + + /* ==================== gui::Display ====================================== */ + +#include "include/display-facade.h" + +namespace lumiera { + + /** storage for the facade proxy factory + * used by client code to invoke through the interface */ + lumiera::facade::Accessor Display::facade; + + /// emit the vtable here into this translation unit within liblumieracommon.so... + Display::~Display() { } + +} // namespace lumiera + + + +namespace lumiera { + namespace facade { + + typedef InstanceHandle< LUMIERA_INTERFACE_INAME(lumieraorg_Display, 0) + , lumiera::Display + > IHandle_Display; + + + template<> + class Proxy + : public Holder + { + //----Proxy-Implementation-of-lumiera::Display-------- + + Display::Sink + getHandle (LumieraDisplaySlot display) + { + _i_.allocate (display); + Sink sinkHandle; + sinkHandle.activate (display, _i_.release); + if (lumiera_error_peek() || !sinkHandle) + throw lumiera::error::State("failed to allocate output DisplayerSlot", + lumiera_error()); + return sinkHandle; + } + + + public: + Proxy (IHandle const& iha) : THolder(iha) {} + }; + + + template void openProxy (IHandle_Display const&); + template void closeProxy (void); + + } // namespace facade + +} // namespace lumiera diff --git a/src/gui/notification-interface-proxy.hpp b/src/gui/notification-interface-proxy.hpp new file mode 100644 index 000000000..361e01865 --- /dev/null +++ b/src/gui/notification-interface-proxy.hpp @@ -0,0 +1,81 @@ +/* + Notification(Proxy) - public service allowing to push informations into the GUI + + Copyright (C) Lumiera.org + 2008, Hermann Vosseler + + 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 the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + + +/** @file notification-interface-proxy.hpp + ** This is an implementation fragment, intended to be included into common/interfaceproxy.cpp + ** + ** The purpose is to define a proxy implementation of gui::GuiNotification, in order to + ** redirect any calls through the associated C Language Interface "lumieraorg_GuiNotification" + ** + ** @see guinotification-facade.hpp + ** @see notification-service.hpp actual implementation within the GUI + */ + + + + + + /* ==================== GuiNotification =================================== */ + +#include "include/guinotification-facade.h" + +namespace gui { + + /** storage for the facade proxy factory + * used by client code to invoke through the interface */ + lumiera::facade::Accessor GuiNotification::facade; + +} // namespace gui + + + +namespace lumiera { + namespace facade { + + typedef InstanceHandle< LUMIERA_INTERFACE_INAME(lumieraorg_GuiNotification, 0) + , gui::GuiNotification + > IHandle_GuiNotification; + + + template<> + class Proxy + : public Holder + { + //----Proxy-Implementation-of-GuiNotification-------- + + void displayInfo (string const& text) { _i_.displayInfo (cStr(text)); } + void triggerGuiShutdown (string const& cause) { _i_.triggerGuiShutdown (cStr(cause)); } + + + public: + Proxy (IHandle const& iha) : THolder(iha) {} + }; + + + template void openProxy (IHandle_GuiNotification const&); + template void closeProxy (void); + + } // namespace facade + +} // namespace lumiera diff --git a/src/proc/play/dummy-player-interface-proxy.hpp b/src/proc/play/dummy-player-interface-proxy.hpp new file mode 100644 index 000000000..9726357b4 --- /dev/null +++ b/src/proc/play/dummy-player-interface-proxy.hpp @@ -0,0 +1,99 @@ +/* + DummyPlayer(Proxy) - access point and service implementing a dummy test player + + Copyright (C) Lumiera.org + 2009, Hermann Vosseler + + 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 the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +* *****************************************************/ + + + +/** @file dummy-player-interface-proxy.hpp + ** This is an implementation fragment, intended to be included into common/interfaceproxy.cpp + ** + ** The purpose is to define a proxy implementation of lumiera::DummyPlayer, in order to + ** redirect any calls through the associated C Language Interface "lumieraorg_DummyPlayer" + ** + ** @see dummy-player-facade.hpp + ** @see dummy-player-service.hpp actual implementation within the Proc-Layer + */ + + + + + + + /* ==================== DummyPlayer ======================================= */ + +#include "proc/play/dummy-player-service.hpp" + +namespace proc { + namespace play { + + /** storage for the DummyPlayer facade proxy factory... */ + lumiera::facade::Accessor DummyPlayer::facade; + +} } + + +namespace lumiera { + namespace facade { + + typedef lumiera::InstanceHandle< LUMIERA_INTERFACE_INAME(lumieraorg_DummyPlayer, 0) + , proc::play::DummyPlayer + > IHandle_DummyPlayer; + + + template<> + class Proxy + : public Holder + { + //----Proxy-Implementation-of-DummyPlayer-------- + typedef proc::play::DummyPlayer::Process Process; + typedef proc::play::ProcessImpl ProcessImpl; + + /** @note as an optimisation we hand out a direct reference + * to the implementing process object. While this ref could + * still be passed as handle to the C Language interface, using + * it directly within the client (=GUI) bypasses the C interface + * and thus leaves us only with one level of indirection, + * irrespective if using the C or C++ interface. + */ + Process start(LumieraDisplaySlot viewerHandle) + { + ProcessImpl* pP = static_cast (_i_.startPlay (viewerHandle)); + + if (!pP) + throw lumiera::error::State("failed to start DummyPlayer", lumiera_error()); + + return pP->createHandle(); + } + + + + public: + Proxy (IHandle const& iha) : THolder(iha) {} + }; + + + template void openProxy (IHandle_DummyPlayer const&); + template void closeProxy (void); + + + } // namespace facade + +} // namespace lumiera