Skip to content
Snippets Groups Projects
Commit 467a97a7 authored by luyikei's avatar luyikei Committed by Hugo Beauzée-Luyssen
Browse files

GenericRenderer: Don't inherit EffectUser


Signed-off-by: default avatarHugo Beauzée-Luyssen <hugo@beauzee.fr>
parent 079ba600
No related branches found
No related tags found
No related merge requests found
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
GenericRenderer::GenericRenderer() GenericRenderer::GenericRenderer()
: m_sourceRenderer( nullptr ) : m_sourceRenderer( nullptr )
, m_paused( false ) , m_paused( false )
, m_isRendering( false )
{ {
m_eventWatcher = new RendererEventWatcher; m_eventWatcher = new RendererEventWatcher;
} }
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <QObject> #include <QObject>
#include "EffectsEngine/EffectUser.h"
#include "Workflow/Types.h" #include "Workflow/Types.h"
#include "Tools/RendererEventWatcher.h" #include "Tools/RendererEventWatcher.h"
...@@ -37,7 +36,7 @@ class Media; ...@@ -37,7 +36,7 @@ class Media;
/** /**
* \class Common base for every renderer. * \class Common base for every renderer.
*/ */
class GenericRenderer : public EffectUser class GenericRenderer : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY( GenericRenderer ) Q_DISABLE_COPY( GenericRenderer )
...@@ -142,13 +141,8 @@ public: ...@@ -142,13 +141,8 @@ public:
return m_isRendering; return m_isRendering;
} }
EffectUser::Type effectType() const
{
return EffectUser::GlobalEffectUser;
}
RendererEventWatcher* eventWatcher(); RendererEventWatcher* eventWatcher();
protected: protected:
Backend::ISourceRenderer* m_sourceRenderer; Backend::ISourceRenderer* m_sourceRenderer;
RendererEventWatcher* m_eventWatcher; RendererEventWatcher* m_eventWatcher;
...@@ -161,6 +155,7 @@ protected: ...@@ -161,6 +155,7 @@ protected:
* \sa isPaused() * \sa isPaused()
*/ */
bool m_paused; bool m_paused;
bool m_isRendering;
public slots: public slots:
/** /**
......
...@@ -230,6 +230,10 @@ class WorkflowRenderer : public GenericRenderer ...@@ -230,6 +230,10 @@ class WorkflowRenderer : public GenericRenderer
qint64 m_audioPts; qint64 m_audioPts;
private: private:
quint32 m_width;
quint32 m_height;
/** /**
* \brief When there's no sound to play, this is the buffer that'll * \brief When there's no sound to play, this is the buffer that'll
* be injected * be injected
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment