From 379ec7a126723ef13d0cfcc3394d2905f9ffc2ca Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 9 Feb 2009 01:42:28 +0100
Subject: [PATCH] refactor the dummy player facade to be in namespace lumiera

---
 src/gui/controller/playback-controller.cpp    |  2 +-
 src/gui/controller/playback-controller.hpp    |  2 +-
 src/include/dummy-player-facade.h             | 15 +++---
 src/lumiera/main.cpp                          |  2 +-
 .../play/dummy-player-interface-proxy.hpp     | 11 ++---
 src/proc/play/dummy-player-service.cpp        | 46 +++++++++++--------
 src/proc/play/dummy-player-service.hpp        |  1 +
 7 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/gui/controller/playback-controller.cpp b/src/gui/controller/playback-controller.cpp
index 88925415c..bfb623860 100644
--- a/src/gui/controller/playback-controller.cpp
+++ b/src/gui/controller/playback-controller.cpp
@@ -49,7 +49,7 @@ PlaybackController::play()
   else if (viewerHandle_)
     try
       {
-        playHandle =  proc::play::DummyPlayer::facade().start (viewerHandle_);
+        playHandle =  lumiera::DummyPlayer::facade().start (viewerHandle_);
         playing = true;
       }
     catch (lumiera::error::State& err)
diff --git a/src/gui/controller/playback-controller.hpp b/src/gui/controller/playback-controller.hpp
index bf0eeff94..7ef5ce4fb 100644
--- a/src/gui/controller/playback-controller.hpp
+++ b/src/gui/controller/playback-controller.hpp
@@ -63,7 +63,7 @@ private:
 
   volatile bool playing;
   
-  proc::play::DummyPlayer::Process playHandle;
+  lumiera::DummyPlayer::Process playHandle;
   
   LumieraDisplaySlot viewerHandle_;
   
diff --git a/src/include/dummy-player-facade.h b/src/include/dummy-player-facade.h
index fcecb234f..3cbca54eb 100644
--- a/src/include/dummy-player-facade.h
+++ b/src/include/dummy-player-facade.h
@@ -44,15 +44,18 @@ typedef lumiera_playprocess* LumieraPlayProcess;
 
 
 
-namespace proc {
+namespace proc   {
   namespace play {
     
-    
     class ProcessImpl;
+} }
+
+
+namespace lumiera {
     
     
     /******************************************************************
-     * Interface Proc-Layer (or maybe the backend?): 
+     * Experimental Interface Proc-Layer (or maybe the backend?): 
      * Global access point for starting a dummy playback, generating
      * some test image data for the GUI to display in a viewer window.
      * 
@@ -85,7 +88,7 @@ namespace proc {
          * @see dummy-player-service.cpp implementation
          */
         class Process
-          : public lib::Handle<ProcessImpl>
+          : public lib::Handle<proc::play::ProcessImpl>
           {
           public:
             void        play(bool);
@@ -102,10 +105,8 @@ namespace proc {
       };
     
     
+} // namespace lumiera
 
-  } // namespace play
-  
-} // namespace proc
 
 
 
diff --git a/src/lumiera/main.cpp b/src/lumiera/main.cpp
index 94a133e11..002961de4 100644
--- a/src/lumiera/main.cpp
+++ b/src/lumiera/main.cpp
@@ -43,7 +43,7 @@ namespace {
   Subsys& engine  = backend::EngineFacade::getDescriptor();
   Subsys& netNode = backend::NetNodeFacade::getDescriptor();
   Subsys& script  = backend::ScriptRunnerFacade::getDescriptor();
-  Subsys& player  = proc::play::DummyPlayer::getDescriptor();
+  Subsys& player  = lumiera::DummyPlayer::getDescriptor();
   Subsys& builder = proc::Facade::getBuilderDescriptor();
   Subsys& session = proc::Facade::getSessionDescriptor();
   Subsys& lumigui = gui::GuiFacade::getDescriptor();
diff --git a/src/proc/play/dummy-player-interface-proxy.hpp b/src/proc/play/dummy-player-interface-proxy.hpp
index 9726357b4..05319dc27 100644
--- a/src/proc/play/dummy-player-interface-proxy.hpp
+++ b/src/proc/play/dummy-player-interface-proxy.hpp
@@ -41,16 +41,15 @@
     
 #include "proc/play/dummy-player-service.hpp"
 
-namespace proc {
-  namespace play {
+namespace lumiera {
   
   /** storage for the DummyPlayer facade proxy factory... */
   lumiera::facade::Accessor<DummyPlayer> DummyPlayer::facade;
   
-} }
-
-
-namespace lumiera {
+  
+  
+  
+  
   namespace facade {
     
     typedef lumiera::InstanceHandle< LUMIERA_INTERFACE_INAME(lumieraorg_DummyPlayer, 0)
diff --git a/src/proc/play/dummy-player-service.cpp b/src/proc/play/dummy-player-service.cpp
index 52125c7bb..d34288de0 100644
--- a/src/proc/play/dummy-player-service.cpp
+++ b/src/proc/play/dummy-player-service.cpp
@@ -94,7 +94,7 @@ namespace proc  {
             }
         };
       
-      lumiera::Singleton<DummyPlayerSubsysDescriptor> theDescriptor;
+      lumiera::Singleton<DummyPlayerSubsysDescriptor> theDummyPlayerDescriptor;
       
       
       
@@ -271,10 +271,6 @@ namespace proc  {
       }
     
     
-    /* === Forwarding function(s) on the Process handle === */
-    
-    void DummyPlayer::Process::play(bool yes)    { impl().doPlay(yes);       }
-    
     
     
     
@@ -356,24 +352,34 @@ namespace proc  {
         else
           display_(imageGen_->current());
       }
-    
-    
-    
-  
-  
-  
-    /** @internal intended for use by main(). */
-    lumiera::Subsys&
-    DummyPlayer::getDescriptor()
-    {
-      return play::theDescriptor();
-    }
-    
-    // emit the vtable here into this translation unit within liblumieraproc.so ...
-    DummyPlayer::~DummyPlayer()      { }
   
   
   
   } // namespace play
   
 } // namespace proc
+
+
+
+
+
+namespace lumiera { /* === Forwarding function(s) on the Process handle === */
+  
+  void DummyPlayer::Process::play(bool yes)  { impl().doPlay(yes); }
+  
+  
+  
+  
+  
+  /** @internal intended for use by main(). */
+  lumiera::Subsys&
+  DummyPlayer::getDescriptor()
+  {
+    return proc::play::theDummyPlayerDescriptor();
+  }
+  
+  // emit the vtable here into this translation unit within liblumieraproc.so ...
+  DummyPlayer::~DummyPlayer()      { }
+  
+  
+} // namespace lumiera
diff --git a/src/proc/play/dummy-player-service.hpp b/src/proc/play/dummy-player-service.hpp
index 55c07e430..2512f38bc 100644
--- a/src/proc/play/dummy-player-service.hpp
+++ b/src/proc/play/dummy-player-service.hpp
@@ -55,6 +55,7 @@ namespace proc {
     using std::string;
     using lumiera::Subsys;
     using lumiera::Display;
+    using lumiera::DummyPlayer;
     
     
     class DummyImageGenerator;