Mercurial > hg > orthanc-stone

diff Framework/Viewport/SdlViewport.h @ 1215:9efa66d8d3f8 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed ViewportBase, and removed dependency of ViewportController on IViewport
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 04 Dec 2019 20:12:15 +0100
parents 86a8266b8888
children 5147277850cf
line wrap: on
line diff
--- a/Framework/Viewport/SdlViewport.h	Wed Dec 04 19:12:08 2019 +0100
+++ b/Framework/Viewport/SdlViewport.h	Wed Dec 04 20:12:15 2019 +0100
@@ -39,13 +39,13 @@
 #include "../OpenGL/SdlOpenGLContext.h"
 #include "../Scene2D/OpenGLCompositor.h"
 #include "../Scene2D/CairoCompositor.h"
-#include "ViewportBase.h"
+#include "IViewport.h"
 
 #include <SDL_events.h>
 
 namespace OrthancStone
 {
-  class SdlViewport : public ViewportBase
+  class SdlViewport : public IViewport
   {
   private:
     uint32_t  refreshEvent_;
@@ -75,7 +75,7 @@
     SdlOpenGLContext                 context_;
     std::auto_ptr<OpenGLCompositor>  compositor_;
 
-    class SdlLock : public LockBase
+    class SdlLock : public ILock
     {
     private:
       SdlOpenGLViewport&         that_;
@@ -83,7 +83,6 @@
       
     public:
       SdlLock(SdlOpenGLViewport& viewport) :
-        LockBase(viewport),
         that_(viewport),
         lock_(viewport.mutex_)
       {
@@ -131,7 +130,7 @@
   class SdlCairoViewport : public SdlViewport
   {
   private:
-    class SdlLock : public LockBase
+    class SdlLock : public ILock
     {
     private:
       SdlCairoViewport&          that_;
@@ -139,7 +138,6 @@
       
     public:
       SdlLock(SdlCairoViewport& viewport) :
-        LockBase(viewport),
         that_(viewport),
         lock_(viewport.mutex_)
       {