[vlmc-devel] MainWorkflow: Have its own MediaContainer
Yikai Lu
git at videolan.org
Wed Jun 1 18:15:08 CEST 2016
vlmc | branch: master | Yikai Lu <luyikei.qmltu at gmail.com> | Tue May 10 17:30:55 2016 +0900| [4e21dcf9a9cc94ab2f503e5d70bfc2fc91f50053] | committer: Hugo Beauzée-Luyssen
MainWorkflow: Have its own MediaContainer
We have to manage subclips that only are used in a timeline.
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
> https://code.videolan.org/videolan/vlmc/commit/4e21dcf9a9cc94ab2f503e5d70bfc2fc91f50053
---
src/Workflow/MainWorkflow.cpp | 2 ++
src/Workflow/MainWorkflow.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/Workflow/MainWorkflow.cpp b/src/Workflow/MainWorkflow.cpp
index bb73f1e..c0407fe 100644
--- a/src/Workflow/MainWorkflow.cpp
+++ b/src/Workflow/MainWorkflow.cpp
@@ -36,6 +36,7 @@
#include <QMutex>
MainWorkflow::MainWorkflow( Settings* projectSettings, int trackCount ) :
+ m_mediaContainer( new MediaContainer ),
m_blackOutput( nullptr ),
m_lengthFrame( 0 ),
m_renderStarted( false ),
@@ -72,6 +73,7 @@ MainWorkflow::~MainWorkflow()
delete m_currentFrameLock;
delete m_blackOutput;
delete m_settings;
+ delete m_mediaContainer;
}
void
diff --git a/src/Workflow/MainWorkflow.h b/src/Workflow/MainWorkflow.h
index 9e56cc2..fce06ab 100644
--- a/src/Workflow/MainWorkflow.h
+++ b/src/Workflow/MainWorkflow.h
@@ -45,6 +45,7 @@ namespace Workflow
class Settings;
class QMutex;
class QReadWriteLock;
+class MediaContainer;
#include <QObject>
#include <QUuid>
@@ -278,6 +279,7 @@ class MainWorkflow : public QObject
void postLoad();
private:
+ MediaContainer* m_mediaContainer;
QList<Toggleable<TrackWorkflow*>> m_tracks;
/// Pre-filled buffer used when there's nothing to render
Workflow::Frame *m_blackOutput;
More information about the Vlmc-devel
mailing list