[vlmc-devel] Workflow: rework includes folders
Jean-Baptiste Kempf
git at videolan.org
Sat Mar 1 16:59:55 CET 2014
vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar 1 16:52:00 2014 +0100| [6550cbdf5ce2ec7fd02a3baafa25d71d0047d53b] | committer: Jean-Baptiste Kempf
Workflow: rework includes folders
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=6550cbdf5ce2ec7fd02a3baafa25d71d0047d53b
---
src/Workflow/AudioClipWorkflow.cpp | 4 ++--
src/Workflow/ClipHelper.cpp | 2 +-
src/Workflow/ClipWorkflow.cpp | 10 +++++-----
src/Workflow/ClipWorkflow.h | 6 +++---
src/Workflow/ImageClipWorkflow.cpp | 10 +++++-----
src/Workflow/MainWorkflow.cpp | 8 ++++----
src/Workflow/MainWorkflow.h | 4 ++--
src/Workflow/TrackHandler.h | 2 +-
src/Workflow/TrackWorkflow.cpp | 12 ++++++------
src/Workflow/TrackWorkflow.h | 2 +-
src/Workflow/VideoClipWorkflow.cpp | 14 +++++++-------
src/Workflow/VideoClipWorkflow.h | 2 +-
12 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/Workflow/AudioClipWorkflow.cpp b/src/Workflow/AudioClipWorkflow.cpp
index b26e517..c22a0f2 100644
--- a/src/Workflow/AudioClipWorkflow.cpp
+++ b/src/Workflow/AudioClipWorkflow.cpp
@@ -22,8 +22,8 @@
#include "AudioClipWorkflow.h"
-#include "VlmcDebug.h"
-#include "ISourceRenderer.h"
+#include "Tools/VlmcDebug.h"
+#include "Backend/ISourceRenderer.h"
#include "Workflow/Types.h"
#include <QMutexLocker>
diff --git a/src/Workflow/ClipHelper.cpp b/src/Workflow/ClipHelper.cpp
index 668e1c7..d6a9fec 100644
--- a/src/Workflow/ClipHelper.cpp
+++ b/src/Workflow/ClipHelper.cpp
@@ -22,7 +22,7 @@
#include "ClipHelper.h"
-#include "Clip.h"
+#include "Media/Clip.h"
ClipHelper::ClipHelper( Clip* clip, qint64 begin /*= -1*/, qint64 end /*= -1*/,
const QString& uuid /*= QString()*/ ) :
diff --git a/src/Workflow/ClipWorkflow.cpp b/src/Workflow/ClipWorkflow.cpp
index cfa2ca7..30a0731 100644
--- a/src/Workflow/ClipWorkflow.cpp
+++ b/src/Workflow/ClipWorkflow.cpp
@@ -26,13 +26,13 @@
#include <QWaitCondition>
#include "vlmc.h"
-#include "Clip.h"
+#include "Media/Clip.h"
#include "ClipHelper.h"
#include "ClipWorkflow.h"
-#include "ISource.h"
-#include "ISourceRenderer.h"
-#include "Media.h"
-#include "RendererEventWatcher.h"
+#include "Backend/ISource.h"
+#include "Backend/ISourceRenderer.h"
+#include "Media/Media.h"
+#include "Tools/RendererEventWatcher.h"
#include "Workflow/Types.h"
ClipWorkflow::ClipWorkflow( ClipHelper* ch )
diff --git a/src/Workflow/ClipWorkflow.h b/src/Workflow/ClipWorkflow.h
index 9799225..63971fd 100644
--- a/src/Workflow/ClipWorkflow.h
+++ b/src/Workflow/ClipWorkflow.h
@@ -23,11 +23,11 @@
#ifndef CLIPWORKFLOW_H
#define CLIPWORKFLOW_H
-#include "mdate.h"
+#include "Tools/mdate.h"
-#include "EffectUser.h"
+#include "EffectsEngine/EffectUser.h"
#include "ClipHelper.h"
-#include "Types.h"
+#include "Workflow/Types.h"
#include <QObject>
#include <QUuid>
diff --git a/src/Workflow/ImageClipWorkflow.cpp b/src/Workflow/ImageClipWorkflow.cpp
index 37cf5e4..3c74173 100644
--- a/src/Workflow/ImageClipWorkflow.cpp
+++ b/src/Workflow/ImageClipWorkflow.cpp
@@ -24,13 +24,13 @@
#include <QReadWriteLock>
#include "ImageClipWorkflow.h"
-#include "Clip.h"
+#include "Media/Clip.h"
#include "ClipHelper.h"
-#include "ISource.h"
-#include "ISourceRenderer.h"
+#include "Backend/ISource.h"
+#include "Backend/ISourceRenderer.h"
#include "MainWorkflow.h"
-#include "Media.h"
-#include "SettingsManager.h"
+#include "Media/Media.h"
+#include "Settings/SettingsManager.h"
#include "Workflow/Types.h"
ImageClipWorkflow::ImageClipWorkflow( ClipHelper *ch ) :
diff --git a/src/Workflow/MainWorkflow.cpp b/src/Workflow/MainWorkflow.cpp
index 8df6c6e..d9efdb8 100644
--- a/src/Workflow/MainWorkflow.cpp
+++ b/src/Workflow/MainWorkflow.cpp
@@ -22,15 +22,15 @@
*****************************************************************************/
#include "vlmc.h"
-#include "Clip.h"
+#include "Media/Clip.h"
#include "ClipHelper.h"
#include "ClipWorkflow.h"
-#include "Library.h"
+#include "Library/Library.h"
#include "MainWorkflow.h"
#include "TrackWorkflow.h"
#include "TrackHandler.h"
-#include "SettingsManager.h"
-#include "VlmcDebug.h"
+#include "Settings/SettingsManager.h"
+#include "Tools/VlmcDebug.h"
#include "Workflow/Types.h"
#include <QDomElement>
diff --git a/src/Workflow/MainWorkflow.h b/src/Workflow/MainWorkflow.h
index d3c88f5..b2fc375 100644
--- a/src/Workflow/MainWorkflow.h
+++ b/src/Workflow/MainWorkflow.h
@@ -24,8 +24,8 @@
#ifndef MAINWORKFLOW_H
#define MAINWORKFLOW_H
-#include "EffectsEngine.h"
-#include "Singleton.hpp"
+#include "EffectsEngine/EffectsEngine.h"
+#include "Tools/Singleton.hpp"
#include <QXmlStreamWriter>
#include "Types.h"
diff --git a/src/Workflow/TrackHandler.h b/src/Workflow/TrackHandler.h
index 46e22a9..3dacfca 100644
--- a/src/Workflow/TrackHandler.h
+++ b/src/Workflow/TrackHandler.h
@@ -25,7 +25,7 @@
#include <QObject>
#include <QXmlStreamWriter>
-#include "Toggleable.hpp"
+#include "Tools/Toggleable.hpp"
#include "MainWorkflow.h"
class ClipHelper;
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index bda7b39..5e34921 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -23,19 +23,19 @@
#include "TrackWorkflow.h"
-#include "Clip.h"
+#include "Media/Clip.h"
#include "ClipHelper.h"
#include "AudioClipWorkflow.h"
-#include "EffectInstance.h"
-#include "EffectHelper.h"
+#include "EffectsEngine/EffectInstance.h"
+#include "EffectsEngine/EffectHelper.h"
#include "ImageClipWorkflow.h"
-#include "ISource.h"
+#include "Backend/ISource.h"
#include "MainWorkflow.h"
-#include "Media.h"
+#include "Media/Media.h"
#include "Types.h"
#include "VideoClipWorkflow.h"
#include "vlmc.h"
-#include "VlmcDebug.h"
+#include "Tools/VlmcDebug.h"
#include <QDomDocument>
#include <QDomElement>
diff --git a/src/Workflow/TrackWorkflow.h b/src/Workflow/TrackWorkflow.h
index 355baf3..ec2e59a 100644
--- a/src/Workflow/TrackWorkflow.h
+++ b/src/Workflow/TrackWorkflow.h
@@ -23,7 +23,7 @@
#ifndef TRACKWORKFLOW_H
#define TRACKWORKFLOW_H
-#include "EffectUser.h"
+#include "EffectsEngine/EffectUser.h"
#include "Types.h"
#include <QObject>
diff --git a/src/Workflow/VideoClipWorkflow.cpp b/src/Workflow/VideoClipWorkflow.cpp
index c50f5ec..8892fba 100644
--- a/src/Workflow/VideoClipWorkflow.cpp
+++ b/src/Workflow/VideoClipWorkflow.cpp
@@ -20,16 +20,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "Clip.h"
-#include "EffectInstance.h"
+#include "Media/Clip.h"
+#include "EffectsEngine/EffectInstance.h"
#include "MainWorkflow.h"
-#include "Media.h"
-#include "ISource.h"
-#include "ISourceRenderer.h"
-#include "SettingsManager.h"
+#include "Media/Media.h"
+#include "Backend/ISource.h"
+#include "Backend/ISourceRenderer.h"
+#include "Settings/SettingsManager.h"
#include "VideoClipWorkflow.h"
#include "VLCMedia.h"
-#include "VlmcDebug.h"
+#include "Tools/VlmcDebug.h"
#include "Workflow/Types.h"
#include <QMutexLocker>
diff --git a/src/Workflow/VideoClipWorkflow.h b/src/Workflow/VideoClipWorkflow.h
index e28ea55..0102d44 100644
--- a/src/Workflow/VideoClipWorkflow.h
+++ b/src/Workflow/VideoClipWorkflow.h
@@ -24,7 +24,7 @@
#define VIDEOCLIPWORKFLOW_H
#include "ClipWorkflow.h"
-#include "EffectsEngine.h"
+#include "EffectsEngine/EffectsEngine.h"
#include <QQueue>
More information about the Vlmc-devel
mailing list