Commit 04519e16 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Workflow is now fully working with VideoFrame type

parent 3b630cf3
......@@ -107,7 +107,7 @@ void* WorkflowRenderer::lock( void* datas )
void* ret = self->m_mainWorkflow->getSynchroneOutput();
self->m_lastFrame = static_cast<MainWorkflow::OutputBuffers*>( ret );
}
return self->m_lastFrame->video;
return self->m_lastFrame->video->rvf.raw;
}
void WorkflowRenderer::unlock( void* datas )
......
......@@ -42,7 +42,7 @@ class MainWorkflow : public QObject, public Singleton<MainWorkflow>
public:
struct OutputBuffers
{
unsigned char* video;
VideoFrame* video;
unsigned char* audio;
};
void addClip( Clip* clip, unsigned int trackId, qint64 start, TrackWorkflow::TrackType type );
......
......@@ -66,7 +66,7 @@ SOURCES += src/main.cpp \
src/Configuration/SettingsManager.cpp \
src/Workflow/VideoClipWorkflow.cpp \
src/Workflow/TrackHandler.cpp \
src/Workflow/AudioClipWorkflow.cpp
src/Workflow/AudioClipWorkflow.cpp \
src/EffectsEngine/EffectsEngine.cpp \
src/EffectsEngine/VideoFrame.cpp \
src/EffectsEngine/GenericEffect.cpp \
......@@ -131,7 +131,7 @@ HEADERS += src/GUI/MainWindow.h \
src/Configuration/SettingsManager.h \
src/Workflow/VideoClipWorkflow.h \
src/Workflow/TrackHandler.h \
src/Workflow/AudioClipWorkflow.h
src/Workflow/AudioClipWorkflow.h \
src/EffectsEngine/EffectsEngine.h \
src/EffectsEngine/InSlot.hpp \
src/EffectsEngine/OutSlot.hpp \
......
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