[vlmc-devel] commit: Avoid including AudioClipWorkflow.h when useless. ( Hugo Beauzée-Luyssen )
git at videolan.org
git at videolan.org
Wed Jun 9 00:34:01 CEST 2010
vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Wed Jun 9 00:30:34 2010 +0200| [45e99e6939482126952584e1c95f44d784ea46f4] | committer: Hugo Beauzée-Luyssen
Avoid including AudioClipWorkflow.h when useless.
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=45e99e6939482126952584e1c95f44d784ea46f4
---
src/Commands/Commands.cpp | 1 +
src/Gui/import/ImportController.cpp | 2 ++
src/Gui/timeline/AbstractGraphicsMediaItem.cpp | 14 +++++++++++---
src/Gui/timeline/AbstractGraphicsMediaItem.h | 5 +----
src/Gui/timeline/GraphicsAudioItem.cpp | 2 ++
src/Gui/timeline/GraphicsMovieItem.cpp | 13 +++++++------
src/Gui/timeline/Timeline.cpp | 4 +++-
src/Gui/timeline/TracksView.cpp | 1 +
src/Renderer/WorkflowRenderer.cpp | 1 -
src/Renderer/WorkflowRenderer.h | 6 +++++-
src/Workflow/MainWorkflow.cpp | 1 +
src/Workflow/MainWorkflow.h | 1 -
src/Workflow/TrackWorkflow.cpp | 2 +-
13 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/src/Commands/Commands.cpp b/src/Commands/Commands.cpp
index fe0bbbe..ddefe43 100644
--- a/src/Commands/Commands.cpp
+++ b/src/Commands/Commands.cpp
@@ -25,6 +25,7 @@
#include "Clip.h"
#include "Commands.h"
#include "MainWorkflow.h"
+#include "ClipHelper.h"
#ifdef WITH_GUI
# include "UndoStack.h"
diff --git a/src/Gui/import/ImportController.cpp b/src/Gui/import/ImportController.cpp
index 0326d2c..a72033a 100644
--- a/src/Gui/import/ImportController.cpp
+++ b/src/Gui/import/ImportController.cpp
@@ -42,6 +42,8 @@
#include <QTime>
#include <QTimer>
+#include <QtDebug>
+
ImportController::ImportController(QWidget *parent) :
QDialog(parent),
m_ui(new Ui::ImportController),
diff --git a/src/Gui/timeline/AbstractGraphicsMediaItem.cpp b/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
index 64f7764..99344ec 100644
--- a/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
+++ b/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
@@ -20,18 +20,20 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <QMenu>
-#include <QColorDialog>
-#include <QGraphicsSceneContextMenuEvent>
#include "AbstractGraphicsMediaItem.h"
#include "TracksView.h"
#include "TracksScene.h"
#include "GraphicsTrack.h"
#include "Clip.h"
+#include "ClipHelper.h"
#include "Commands.h"
#include "Media.h"
+#include <QMenu>
+#include <QColorDialog>
+#include <QGraphicsSceneContextMenuEvent>
+
AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( Clip* clip ) :
oldTrackNumber( -1 ),
oldPosition( -1 ),
@@ -359,3 +361,9 @@ AbstractGraphicsMediaItem::clipHelper()
{
return m_clipHelper;
}
+
+const QUuid&
+AbstractGraphicsMediaItem::uuid() const
+{
+ return m_clipHelper->uuid();
+}
diff --git a/src/Gui/timeline/AbstractGraphicsMediaItem.h b/src/Gui/timeline/AbstractGraphicsMediaItem.h
index c71d52a..a853881 100644
--- a/src/Gui/timeline/AbstractGraphicsMediaItem.h
+++ b/src/Gui/timeline/AbstractGraphicsMediaItem.h
@@ -70,10 +70,7 @@ public:
virtual bool moveable() const = 0;
/// Should return the unique uid of the contained media.
- virtual const QUuid& uuid() const
- {
- return m_clipHelper->uuid();
- }
+ virtual const QUuid& uuid() const;
/// Return a pointer to the TracksScene
TracksScene* scene();
diff --git a/src/Gui/timeline/GraphicsAudioItem.cpp b/src/Gui/timeline/GraphicsAudioItem.cpp
index fe579e2..f09cf07 100644
--- a/src/Gui/timeline/GraphicsAudioItem.cpp
+++ b/src/Gui/timeline/GraphicsAudioItem.cpp
@@ -22,6 +22,8 @@
*****************************************************************************/
#include "GraphicsAudioItem.h"
+
+#include "ClipHelper.h"
#include "Media.h"
#include "TracksView.h"
#include "Timeline.h"
diff --git a/src/Gui/timeline/GraphicsMovieItem.cpp b/src/Gui/timeline/GraphicsMovieItem.cpp
index 5575e0a..41194d2 100644
--- a/src/Gui/timeline/GraphicsMovieItem.cpp
+++ b/src/Gui/timeline/GraphicsMovieItem.cpp
@@ -20,6 +20,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#include "Clip.h"
+#include "ClipHelper.h"
+#include "GraphicsMovieItem.h"
+#include "Media.h"
+#include "TracksView.h"
+#include "Timeline.h"
+
#include <QPainter>
#include <QLinearGradient>
#include <QDebug>
@@ -27,12 +34,6 @@
#include <QFontMetrics>
#include <QGraphicsSceneMouseEvent>
-#include "Clip.h"
-#include "GraphicsMovieItem.h"
-#include "Media.h"
-#include "TracksView.h"
-#include "Timeline.h"
-
GraphicsMovieItem::GraphicsMovieItem( Clip* clip ) :
AbstractGraphicsMediaItem( clip )
{
diff --git a/src/Gui/timeline/Timeline.cpp b/src/Gui/timeline/Timeline.cpp
index 8614d2d..a404791 100644
--- a/src/Gui/timeline/Timeline.cpp
+++ b/src/Gui/timeline/Timeline.cpp
@@ -21,12 +21,14 @@
*****************************************************************************/
#include "Timeline.h"
+
+#include "Clip.h"
+#include "ClipHelper.h"
#include "TracksView.h"
#include "TracksScene.h"
#include "TracksControls.h"
#include "TracksRuler.h"
#include "WorkflowRenderer.h"
-#include "Clip.h"
#include <QHBoxLayout>
#include <QDomElement>
diff --git a/src/Gui/timeline/TracksView.cpp b/src/Gui/timeline/TracksView.cpp
index e1928af..7ea3c83 100644
--- a/src/Gui/timeline/TracksView.cpp
+++ b/src/Gui/timeline/TracksView.cpp
@@ -22,6 +22,7 @@
#include "TracksView.h"
+#include "ClipHelper.h"
#include "Commands.h"
#include "Library.h"
#include "GraphicsMovieItem.h"
diff --git a/src/Renderer/WorkflowRenderer.cpp b/src/Renderer/WorkflowRenderer.cpp
index b8effc6..e392f6e 100644
--- a/src/Renderer/WorkflowRenderer.cpp
+++ b/src/Renderer/WorkflowRenderer.cpp
@@ -27,7 +27,6 @@
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
-#include "AudioClipWorkflow.h"
#include "Clip.h"
#include "GenericRenderer.h"
#include "MainWorkflow.h"
diff --git a/src/Renderer/WorkflowRenderer.h b/src/Renderer/WorkflowRenderer.h
index 20213bc..45cadf6 100644
--- a/src/Renderer/WorkflowRenderer.h
+++ b/src/Renderer/WorkflowRenderer.h
@@ -23,7 +23,6 @@
#ifndef WORKFLOWRENDERER_H
#define WORKFLOWRENDERER_H
-#include "AudioClipWorkflow.h"
#include "GenericRenderer.h"
#include "MainWorkflow.h"
@@ -36,6 +35,11 @@ class QWaitCondition;
class QMutex;
class QUuid;
+namespace LibVLCpp
+{
+ class Media;
+}
+
class WorkflowRenderer : public GenericRenderer
{
Q_OBJECT
diff --git a/src/Workflow/MainWorkflow.cpp b/src/Workflow/MainWorkflow.cpp
index 09acfd7..ecf0fcb 100644
--- a/src/Workflow/MainWorkflow.cpp
+++ b/src/Workflow/MainWorkflow.cpp
@@ -25,6 +25,7 @@
#include "vlmc.h"
#include "Clip.h"
+#include "ClipHelper.h"
#include "Library.h"
#include "MainWorkflow.h"
#include "TrackWorkflow.h"
diff --git a/src/Workflow/MainWorkflow.h b/src/Workflow/MainWorkflow.h
index 3142901..495e639 100644
--- a/src/Workflow/MainWorkflow.h
+++ b/src/Workflow/MainWorkflow.h
@@ -25,7 +25,6 @@
#define MAINWORKFLOW_H
#include "Singleton.hpp"
-#include "AudioClipWorkflow.h"
#include <QXmlStreamWriter>
class QDomDocument;
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index 52a2e1b..76b7375 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -23,9 +23,9 @@
#include "TrackWorkflow.h"
-#include "AudioClipWorkflow.h"
#include "Clip.h"
#include "ClipHelper.h"
+#include "AudioClipWorkflow.h"
#include "ImageClipWorkflow.h"
#include "Media.h"
#include "VideoClipWorkflow.h"
More information about the Vlmc-devel
mailing list