oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactored so sequence is again a derivative of viewer

Browse Source
This commit is contained in:
itsmattkc
2021-04-05 14:41:59 +10:00
parent 748f45b7b8
commit 9be014c0b6
38 changed files with 600 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/render/render.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
namespace olive {
RenderTask::RenderTask(Sequence* viewer, const VideoParams &vparams, const AudioParams &aparams) :
RenderTask::RenderTask(ViewerOutput *viewer, const VideoParams &vparams, const AudioParams &aparams) :
viewer_(viewer),
video_params_(vparams),
audio_params_(aparams),
app/task/render/render.h
+3 -3
View File
@@ -35,7 +35,7 @@ class RenderTask : public Task
{
Q_OBJECT
public:
RenderTask(Sequence* viewer, const VideoParams &vparams, const AudioParams &aparams);
RenderTask(ViewerOutput* viewer, const VideoParams &vparams, const AudioParams &aparams);
virtual ~RenderTask() override;
@@ -53,7 +53,7 @@ protected:
virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples, qint64 job_time) = 0;
Sequence* viewer() const
ViewerOutput* viewer() const
{
return viewer_;
}
@@ -87,7 +87,7 @@ private:
void StartTicket(const QByteArray &hash, QThread *watcher_thread, ColorManager *manager, const rational &time, RenderMode::Mode mode, FrameHashCache *cache, const QSize &force_size, const QMatrix4x4 &force_matrix, VideoParams::Format force_format, ColorProcessorPtr force_color_output);
Sequence* viewer_;
ViewerOutput* viewer_;
VideoParams video_params_;