[vlmc-devel] GenericRenderer: Don't inherit EffectUser

[Yikai Lu]

vlmc | branch: master | Yikai Lu <luyikei.qmltu at gmail.com> | Mon Apr 18 17:32:22 2016 +0900| [467a97a7822c85a56b64bd58e6d983a56050a333] | committer: Hugo Beauzée-Luyssen

GenericRenderer: Don't inherit EffectUser

Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> https://code.videolan.org/videolan/vlmc/commit/467a97a7822c85a56b64bd58e6d983a56050a333
---

 src/Renderer/GenericRenderer.cpp | 1 +
 src/Renderer/GenericRenderer.h   | 9 ++-------
 src/Renderer/WorkflowRenderer.h  | 4 ++++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Renderer/GenericRenderer.cpp b/src/Renderer/GenericRenderer.cpp
index df16cf5..bbe0259 100644
--- a/src/Renderer/GenericRenderer.cpp
+++ b/src/Renderer/GenericRenderer.cpp
@@ -27,6 +27,7 @@
 GenericRenderer::GenericRenderer()
     : m_sourceRenderer( nullptr )
     , m_paused( false )
+    , m_isRendering( false )
 {
     m_eventWatcher = new RendererEventWatcher;
 }
diff --git a/src/Renderer/GenericRenderer.h b/src/Renderer/GenericRenderer.h
index 3ed1cb4..6ffe670 100644
--- a/src/Renderer/GenericRenderer.h
+++ b/src/Renderer/GenericRenderer.h
@@ -27,7 +27,6 @@
 
 #include <QObject>
 
-#include "EffectsEngine/EffectUser.h"
 #include "Workflow/Types.h"
 #include "Tools/RendererEventWatcher.h"
 
@@ -37,7 +36,7 @@ class   Media;
 /**
  *  \class  Common base for every renderer.
  */
-class   GenericRenderer : public EffectUser
+class   GenericRenderer : public QObject
 {
     Q_OBJECT
     Q_DISABLE_COPY( GenericRenderer )
@@ -142,13 +141,8 @@ public:
         return m_isRendering;
     }
 
-    EffectUser::Type                effectType() const
-    {
-        return EffectUser::GlobalEffectUser;
-    }
 
     RendererEventWatcher*           eventWatcher();
-
 protected:
     Backend::ISourceRenderer*       m_sourceRenderer;
     RendererEventWatcher*           m_eventWatcher;
@@ -161,6 +155,7 @@ protected:
      *  \sa         isPaused()
      */
     bool                            m_paused;
+    bool                            m_isRendering;
 
 public slots:
     /**
diff --git a/src/Renderer/WorkflowRenderer.h b/src/Renderer/WorkflowRenderer.h
index a44ddd1..5e846b6 100644
--- a/src/Renderer/WorkflowRenderer.h
+++ b/src/Renderer/WorkflowRenderer.h
@@ -230,6 +230,10 @@ class   WorkflowRenderer : public GenericRenderer
         qint64              m_audioPts;
 
     private:
+
+        quint32             m_width;
+        quint32             m_height;
+
         /**
          *  \brief          When there's no sound to play, this is the buffer that'll
          *                  be injected