Commit 7b5a2833 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

EffectsEngine: rework includes path

parent 719cfc49
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include "Effect.h" #include "EffectsEngine/Effect.h"
#include "EffectInstance.h" #include "EffectsEngine/EffectInstance.h"
#include "VlmcDebug.h" #include "VlmcDebug.h"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <QLibrary> #include <QLibrary>
#include "frei0r.h" #include <frei0r.h>
class EffectInstance; class EffectInstance;
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include "EffectHelper.h" #include "EffectsEngine/EffectHelper.h"
#include "EffectUser.h" #include "EffectsEngine/EffectUser.h"
#include "MainWorkflow.h" #include "Workflow/MainWorkflow.h"
EffectHelper::EffectHelper( EffectInstance *effectInstance, qint64 begin, qint64 end, EffectHelper::EffectHelper( EffectInstance *effectInstance, qint64 begin, qint64 end,
const QString &uuid ) : const QString &uuid ) :
......
...@@ -26,12 +26,13 @@ ...@@ -26,12 +26,13 @@
class EffectInstance; class EffectInstance;
class EffectUser; class EffectUser;
#include "Helper.h"
#include <QObject> #include <QObject>
#include <QUuid> #include <QUuid>
#include <QMetaType> #include <QMetaType>
#include "Workflow/Helper.h"
class EffectHelper : public Workflow::Helper class EffectHelper : public Workflow::Helper
{ {
Q_OBJECT Q_OBJECT
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include "EffectInstance.h" #include "EffectsEngine/EffectInstance.h"
#include "EffectSettingValue.h" #include "EffectsEngine/EffectSettingValue.h"
#include "Effect.h" #include "EffectsEngine/Effect.h"
EffectInstance::EffectInstance( Effect *effect ) : EffectInstance::EffectInstance( Effect *effect ) :
m_effect( effect ), m_effect( effect ),
......
...@@ -25,10 +25,12 @@ ...@@ -25,10 +25,12 @@
class EffectSettingValue; class EffectSettingValue;
#include "Effect.h"
#include <QHash> #include <QHash>
#include "frei0r.h"
#include <frei0r.h>
#include "EffectsEngine/Effect.h"
class EffectInstance class EffectInstance
{ {
......
...@@ -20,14 +20,14 @@ ...@@ -20,14 +20,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include "Effect.h"
#include "EffectSettingValue.h"
#include "EffectInstance.h"
#include "VlmcDebug.h"
#include <QColor> #include <QColor>
#include <QPoint> #include <QPoint>
#include "EffectsEngine/Effect.h"
#include "EffectsEngine/EffectSettingValue.h"
#include "EffectsEngine/EffectInstance.h"
#include "Tools/VlmcDebug.h"
EffectSettingValue::EffectSettingValue( const QString& key, Type type, EffectInstance* instance, quint32 index, EffectSettingValue::EffectSettingValue( const QString& key, Type type, EffectInstance* instance, quint32 index,
const char *name, const char *desc, Flags flags ) : const char *name, const char *desc, Flags flags ) :
SettingValue( key, type, QVariant(), name, desc, flags ), SettingValue( key, type, QVariant(), name, desc, flags ),
......
...@@ -23,8 +23,9 @@ ...@@ -23,8 +23,9 @@
#ifndef EFFECTSETTINGVALUE_H #ifndef EFFECTSETTINGVALUE_H
#define EFFECTSETTINGVALUE_H #define EFFECTSETTINGVALUE_H
#include "SettingValue.h" #include <frei0r.h>
#include "frei0r.h"
#include "Settings/SettingValue.h"
class EffectInstance; class EffectInstance;
......
...@@ -20,16 +20,16 @@ ...@@ -20,16 +20,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include "EffectUser.h"
#include "EffectHelper.h"
#include "EffectInstance.h"
#include "Types.h"
#include "VlmcDebug.h"
#include <QDomElement> #include <QDomElement>
#include <QReadWriteLock> #include <QReadWriteLock>
#include "EffectsEngine/EffectUser.h"
#include "EffectsEngine/EffectHelper.h"
#include "EffectsEngine/EffectInstance.h"
#include "Workflow/Types.h"
#include "Tools/VlmcDebug.h"
EffectUser::EffectUser() : EffectUser::EffectUser() :
m_isRendering( false ), m_isRendering( false ),
m_width( 0 ), m_width( 0 ),
......
...@@ -23,12 +23,11 @@ ...@@ -23,12 +23,11 @@
#ifndef EFFECTUSER_H #ifndef EFFECTUSER_H
#define EFFECTUSER_H #define EFFECTUSER_H
#include "EffectsEngine.h"
#include <QObject> #include <QObject>
#include <QList>
#include <QXmlStreamWriter> #include <QXmlStreamWriter>
#include "EffectsEngine/EffectsEngine.h"
class QDomElement; class QDomElement;
class QReadWriteLock; class QReadWriteLock;
......
...@@ -20,15 +20,11 @@ ...@@ -20,15 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include "EffectsEngine.h"
#include "Effect.h"
#include "EffectInstance.h"
#include "Types.h"
#include "VlmcDebug.h"
#include <QApplication> #include <QApplication>
#include <QDir>
#include <QProcess>
#include <QSettings>
#include <QXmlStreamWriter>
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
# include <QStandardPaths> # include <QStandardPaths>
...@@ -36,15 +32,17 @@ ...@@ -36,15 +32,17 @@
# include <QDesktopServices> # include <QDesktopServices>
#endif #endif
#include <QDir>
#include <QProcess>
#include <QSettings>
#include <QXmlStreamWriter>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <windows.h> # include <windows.h>
#endif #endif
#include "EffectsEngine/EffectsEngine.h"
#include "EffectsEngine/Effect.h"
#include "EffectsEngine/EffectInstance.h"
#include "Workflow/Types.h"
#include "Tools/VlmcDebug.h"
EffectsEngine::EffectsEngine() EffectsEngine::EffectsEngine()
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
......
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#ifndef EFFECTSENGINE_H #ifndef EFFECTSENGINE_H
#define EFFECTSENGINE_H #define EFFECTSENGINE_H
#include "Singleton.hpp"
#include "Effect.h"
namespace Workflow namespace Workflow
{ {
...@@ -44,6 +42,9 @@ class QXmlStreamWriter; ...@@ -44,6 +42,9 @@ class QXmlStreamWriter;
#include <QUuid> #include <QUuid>
#include <QMetaType> #include <QMetaType>
#include "Tools/Singleton.hpp"
#include "EffectsEngine/Effect.h"
class QSettings; class QSettings;
class EffectsEngine : public QObject, public Singleton<EffectsEngine> class EffectsEngine : public QObject, public Singleton<EffectsEngine>
......
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