Commit da24c9b9 authored by Vincent Carrubba's avatar Vincent Carrubba
Browse files

Oops forgot conflict solve into GreenFilterEffect.h

parent 99888066
...@@ -23,14 +23,8 @@ ...@@ -23,14 +23,8 @@
#ifndef GREENFILTEREFFECTPLUGIN_H_ #ifndef GREENFILTEREFFECTPLUGIN_H_
#define GREENFILTEREFFECTPLUGIN_H_ #define GREENFILTEREFFECTPLUGIN_H_
<<<<<<< HEAD:src/EffectsEngine/Plugins/src/GreenFilterEffect/GreenFilterEffectPlugin.h
#include "IEffectNode.h" #include "IEffectNode.h"
#include "IEffectPlugin.h" #include "IEffectPlugin.h"
=======
#include "GenericEffect.h"
#include <QPainter>
#include <QImage>
>>>>>>> master:src/EffectsEngine/GreenFilterEffect.h
class GreenFilterEffectPlugin : public QObject, public IEffectPlugin class GreenFilterEffectPlugin : public QObject, public IEffectPlugin
{ {
...@@ -51,16 +45,7 @@ class GreenFilterEffectPlugin : public QObject, public IEffectPlugin ...@@ -51,16 +45,7 @@ class GreenFilterEffectPlugin : public QObject, public IEffectPlugin
private: private:
<<<<<<< HEAD:src/EffectsEngine/Plugins/src/GreenFilterEffect/GreenFilterEffectPlugin.h
IEffectNode* m_ien; IEffectNode* m_ien;
=======
QImage m_logo;
bool m_enabled;
static quint32 const m_nbVideoInputs = 1;
static quint32 const m_nbVideoOutputs = 1;
static char const * m_videoInputsNames[m_nbVideoInputs];
static char const * m_videoOutputsNames[m_nbVideoOutputs];
>>>>>>> master:src/EffectsEngine/GreenFilterEffect.h
}; };
#endif // GREENFILTEREFFECTPLUGIN_H_ #endif // GREENFILTEREFFECTPLUGIN_H_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment