Commit 45e99e69 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

Avoid including AudioClipWorkflow.h when useless.

parent a6642d2f
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "Clip.h" #include "Clip.h"
#include "Commands.h" #include "Commands.h"
#include "MainWorkflow.h" #include "MainWorkflow.h"
#include "ClipHelper.h"
#ifdef WITH_GUI #ifdef WITH_GUI
# include "UndoStack.h" # include "UndoStack.h"
......
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
#include <QTime> #include <QTime>
#include <QTimer> #include <QTimer>
#include <QtDebug>
ImportController::ImportController(QWidget *parent) : ImportController::ImportController(QWidget *parent) :
QDialog(parent), QDialog(parent),
m_ui(new Ui::ImportController), m_ui(new Ui::ImportController),
......
...@@ -20,18 +20,20 @@ ...@@ -20,18 +20,20 @@
* 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 <QMenu>
#include <QColorDialog>
#include <QGraphicsSceneContextMenuEvent>
#include "AbstractGraphicsMediaItem.h" #include "AbstractGraphicsMediaItem.h"
#include "TracksView.h" #include "TracksView.h"
#include "TracksScene.h" #include "TracksScene.h"
#include "GraphicsTrack.h" #include "GraphicsTrack.h"
#include "Clip.h" #include "Clip.h"
#include "ClipHelper.h"
#include "Commands.h" #include "Commands.h"
#include "Media.h" #include "Media.h"
#include <QMenu>
#include <QColorDialog>
#include <QGraphicsSceneContextMenuEvent>
AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( Clip* clip ) : AbstractGraphicsMediaItem::AbstractGraphicsMediaItem( Clip* clip ) :
oldTrackNumber( -1 ), oldTrackNumber( -1 ),
oldPosition( -1 ), oldPosition( -1 ),
...@@ -359,3 +361,9 @@ AbstractGraphicsMediaItem::clipHelper() ...@@ -359,3 +361,9 @@ AbstractGraphicsMediaItem::clipHelper()
{ {
return m_clipHelper; return m_clipHelper;
} }
const QUuid&
AbstractGraphicsMediaItem::uuid() const
{
return m_clipHelper->uuid();
}
...@@ -70,10 +70,7 @@ public: ...@@ -70,10 +70,7 @@ public:
virtual bool moveable() const = 0; virtual bool moveable() const = 0;
/// Should return the unique uid of the contained media. /// Should return the unique uid of the contained media.
virtual const QUuid& uuid() const virtual const QUuid& uuid() const;
{
return m_clipHelper->uuid();
}
/// Return a pointer to the TracksScene /// Return a pointer to the TracksScene
TracksScene* scene(); TracksScene* scene();
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
*****************************************************************************/ *****************************************************************************/
#include "GraphicsAudioItem.h" #include "GraphicsAudioItem.h"
#include "ClipHelper.h"
#include "Media.h" #include "Media.h"
#include "TracksView.h" #include "TracksView.h"
#include "Timeline.h" #include "Timeline.h"
......
...@@ -20,6 +20,13 @@ ...@@ -20,6 +20,13 @@
* 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 "Clip.h"
#include "ClipHelper.h"
#include "GraphicsMovieItem.h"
#include "Media.h"
#include "TracksView.h"
#include "Timeline.h"
#include <QPainter> #include <QPainter>
#include <QLinearGradient> #include <QLinearGradient>
#include <QDebug> #include <QDebug>
...@@ -27,12 +34,6 @@ ...@@ -27,12 +34,6 @@
#include <QFontMetrics> #include <QFontMetrics>
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
#include "Clip.h"
#include "GraphicsMovieItem.h"
#include "Media.h"
#include "TracksView.h"
#include "Timeline.h"
GraphicsMovieItem::GraphicsMovieItem( Clip* clip ) : GraphicsMovieItem::GraphicsMovieItem( Clip* clip ) :
AbstractGraphicsMediaItem( clip ) AbstractGraphicsMediaItem( clip )
{ {
......
...@@ -21,12 +21,14 @@ ...@@ -21,12 +21,14 @@
*****************************************************************************/ *****************************************************************************/
#include "Timeline.h" #include "Timeline.h"
#include "Clip.h"
#include "ClipHelper.h"
#include "TracksView.h" #include "TracksView.h"
#include "TracksScene.h" #include "TracksScene.h"
#include "TracksControls.h" #include "TracksControls.h"
#include "TracksRuler.h" #include "TracksRuler.h"
#include "WorkflowRenderer.h" #include "WorkflowRenderer.h"
#include "Clip.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QDomElement> #include <QDomElement>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "TracksView.h" #include "TracksView.h"
#include "ClipHelper.h"
#include "Commands.h" #include "Commands.h"
#include "Library.h" #include "Library.h"
#include "GraphicsMovieItem.h" #include "GraphicsMovieItem.h"
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#include <inttypes.h> #include <inttypes.h>
#include "AudioClipWorkflow.h"
#include "Clip.h" #include "Clip.h"
#include "GenericRenderer.h" #include "GenericRenderer.h"
#include "MainWorkflow.h" #include "MainWorkflow.h"
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#ifndef WORKFLOWRENDERER_H #ifndef WORKFLOWRENDERER_H
#define WORKFLOWRENDERER_H #define WORKFLOWRENDERER_H
#include "AudioClipWorkflow.h"
#include "GenericRenderer.h" #include "GenericRenderer.h"
#include "MainWorkflow.h" #include "MainWorkflow.h"
...@@ -36,6 +35,11 @@ class QWaitCondition; ...@@ -36,6 +35,11 @@ class QWaitCondition;
class QMutex; class QMutex;
class QUuid; class QUuid;
namespace LibVLCpp
{
class Media;
}
class WorkflowRenderer : public GenericRenderer class WorkflowRenderer : public GenericRenderer
{ {
Q_OBJECT Q_OBJECT
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "vlmc.h" #include "vlmc.h"
#include "Clip.h" #include "Clip.h"
#include "ClipHelper.h"
#include "Library.h" #include "Library.h"
#include "MainWorkflow.h" #include "MainWorkflow.h"
#include "TrackWorkflow.h" #include "TrackWorkflow.h"
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#define MAINWORKFLOW_H #define MAINWORKFLOW_H
#include "Singleton.hpp" #include "Singleton.hpp"
#include "AudioClipWorkflow.h"
#include <QXmlStreamWriter> #include <QXmlStreamWriter>
class QDomDocument; class QDomDocument;
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include "TrackWorkflow.h" #include "TrackWorkflow.h"
#include "AudioClipWorkflow.h"
#include "Clip.h" #include "Clip.h"
#include "ClipHelper.h" #include "ClipHelper.h"
#include "AudioClipWorkflow.h"
#include "ImageClipWorkflow.h" #include "ImageClipWorkflow.h"
#include "Media.h" #include "Media.h"
#include "VideoClipWorkflow.h" #include "VideoClipWorkflow.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