Commit 5ddf09ad authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Using forward declarations in ClipRenderer.h WorkflowRenderer.h TrackWorkflow.h

Re-enabled preview for Clip preview widget
parent f66cb245
......@@ -25,6 +25,7 @@
#include "PreviewWidget.h"
#include "ui_PreviewWidget.h"
#include "ClipRenderer.h"
#include "Clip.h"
PreviewWidget::PreviewWidget( GenericRenderer* genericRenderer, QWidget *parent ) :
QWidget( parent ),
......
......@@ -25,6 +25,7 @@
#include <QtGlobal>
#include "ClipRenderer.h"
#include "Media.h"
#include "MainWorkflow.h"
ClipRenderer::ClipRenderer() :
......
......@@ -23,12 +23,14 @@
#ifndef CLIPRENDERER_H
#define CLIPRENDERER_H
#include <QWidget>
#include <QObject>
class Clip;
class Media;
class QUuid;
#include "VLCMediaPlayer.h"
#include "Clip.h"
#include "GenericRenderer.h"
#include "VLCMediaPlayer.h"
#include <QObject>
class ClipRenderer : public GenericRenderer
{
......
......@@ -23,18 +23,17 @@
#ifndef WORKFLOWRENDERER_H
#define WORKFLOWRENDERER_H
class QWaitCondition;
class QWidget;
#include <QObject>
#include <QWidget>
#include <QStack>
#include "Workflow/MainWorkflow.h"
#include "GenericRenderer.h"
#include "StackedAction.hpp"
#include "ActionStack.h"
#include "AudioClipWorkflow.h"
#include "GenericRenderer.h"
#include "StackedAction.hpp"
#include "MainWorkflow.h"
class QWaitCondition;
#include <QObject>
#include <QStack>
class WorkflowRenderer : public GenericRenderer
{
......
......@@ -21,6 +21,7 @@
*****************************************************************************/
#include "ImageClipWorkflow.h"
#include "Clip.h"
#define IMAGE_DURATION 10000
......
......@@ -23,6 +23,9 @@
#include "TrackHandler.h"
#include "TrackWorkflow.h"
#include <QDomDocument>
#include <QDomElement>
LightVideoFrame* TrackHandler::nullOutput = NULL;
TrackHandler::TrackHandler( unsigned int nbTracks, MainWorkflow::TrackType trackType, EffectsEngine* effectsEngine ) :
......
......@@ -27,6 +27,11 @@
#include "VideoClipWorkflow.h"
#include "ImageClipWorkflow.h"
#include "AudioClipWorkflow.h"
#include "Clip.h"
#include "Media.h"
#include <QReadWriteLock>
#include <QDomDocument>
#include <QDomElement>
TrackWorkflow::TrackWorkflow( unsigned int trackId, MainWorkflow::TrackType type ) :
m_trackId( trackId ),
......
......@@ -23,19 +23,26 @@
#ifndef TRACKWORKFLOW_H
#define TRACKWORKFLOW_H
#include <QObject>
#include <QMutex>
#include <QWaitCondition>
#include <QMap>
#include <QList>
#include <QReadWriteLock>
#include <QDomElement>
#include "ClipWorkflow.h"
#include "LightVideoFrame.h"
#include "MainWorkflow.h"
#include "StackedBuffer.hpp"
#include <QObject>
class AudioClipWorkflow;
class ClipWorkflow;
class LightVideoFrame;
class VideoClipWorkflow;
class QDomElement;
class QDomElement;
template <typename T>
class QList;
template <typename T, typename U>
class QMap;
class QMutex;
class QReadWriteLock;
class QWaitCondition;
//TODO: REMOVE THIS
#ifndef FPS
#define FPS 30
......@@ -45,9 +52,6 @@
#define MAX_TRACKS 64
#endif
class VideoClipWorkflow;
class AudioClipWorkflow;
class TrackWorkflow : public QObject
{
Q_OBJECT
......
......@@ -25,6 +25,7 @@
#include "MainWorkflow.h"
#include "StackedBuffer.hpp"
#include "LightVideoFrame.h"
#include "Clip.h"
VideoClipWorkflow::VideoClipWorkflow( Clip* clip ) : ClipWorkflow( clip )
{
......
......@@ -24,10 +24,11 @@
#define VIDEOCLIPWORKFLOW_H
#include "ClipWorkflow.h"
#include "Clip.h"
#include "StackedBuffer.hpp"
#include "Pool.hpp"
class Clip;
class VideoClipWorkflow : public ClipWorkflow
{
public:
......
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