From 15ac7f0e9df14fcff00a1fdcf9bea24d07bb7397 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 28 Feb 2020 15:49:02 +1100 Subject: [PATCH] renderer: removed old signal that isn't used anymore --- app/render/backend/videorenderbackend.cpp | 17 ----------------- app/render/backend/videorenderbackend.h | 1 - app/render/backend/videorenderworker.cpp | 3 --- app/render/backend/videorenderworker.h | 8 +++----- 4 files changed, 3 insertions(+), 26 deletions(-) diff --git a/app/render/backend/videorenderbackend.cpp b/app/render/backend/videorenderbackend.cpp index 6a7fe2e7a..964243e91 100644 --- a/app/render/backend/videorenderbackend.cpp +++ b/app/render/backend/videorenderbackend.cpp @@ -140,7 +140,6 @@ void VideoRenderBackend::ConnectWorkerToThis(RenderWorker *processor) video_processor->SetOperatingMode(operating_mode_); - connect(video_processor, &VideoRenderWorker::CompletedFrame, this, &VideoRenderBackend::ThreadCompletedFrame, Qt::QueuedConnection); connect(video_processor, &VideoRenderWorker::HashAlreadyBeingCached, this, &VideoRenderBackend::ThreadSkippedFrame, Qt::QueuedConnection); connect(video_processor, &VideoRenderWorker::CompletedDownload, this, &VideoRenderBackend::ThreadCompletedDownload, Qt::QueuedConnection); connect(video_processor, &VideoRenderWorker::HashAlreadyExists, this, &VideoRenderBackend::ThreadHashAlreadyExists, Qt::QueuedConnection); @@ -262,22 +261,6 @@ TimeRange VideoRenderBackend::PopNextFrameFromQueue() return TimeRange(frame_range.in(), frame_range.in()); } -void VideoRenderBackend::ThreadCompletedFrame(NodeDependency path, qint64 job_time, QByteArray hash, QVariant value) -{ - if (!only_signal_last_frame_requested_ || last_time_requested_ == path.in() || frame_cache_.TimeToHash(last_time_requested_) == hash) { - Q_UNUSED(job_time) - Q_UNUSED(value) - //EmitCachedFrameReady(path.in(), value, job_time); - } - - if (!(operating_mode_ & VideoRenderWorker::kDownloadOnly)) { - // If we're not downloading, the worker is done here - SetWorkerBusyState(static_cast(sender()), false); - - CacheNext(); - } -} - void VideoRenderBackend::ThreadCompletedDownload(NodeDependency dep, qint64 job_time, QByteArray hash, bool texture_existed) { SetWorkerBusyState(static_cast(sender()), false); diff --git a/app/render/backend/videorenderbackend.h b/app/render/backend/videorenderbackend.h index 517232782..bd2b823c1 100644 --- a/app/render/backend/videorenderbackend.h +++ b/app/render/backend/videorenderbackend.h @@ -128,7 +128,6 @@ private: bool limit_caching_; private slots: - void ThreadCompletedFrame(NodeDependency path, qint64 job_time, QByteArray hash, QVariant value); void ThreadCompletedDownload(NodeDependency dep, qint64 job_time, QByteArray hash, bool texture_existed); void ThreadSkippedFrame(NodeDependency dep, qint64 job_time, QByteArray hash); void ThreadHashAlreadyExists(NodeDependency dep, qint64 job_time, QByteArray hash); diff --git a/app/render/backend/videorenderworker.cpp b/app/render/backend/videorenderworker.cpp index b7d386deb..1859f9cca 100644 --- a/app/render/backend/videorenderworker.cpp +++ b/app/render/backend/videorenderworker.cpp @@ -62,9 +62,6 @@ NodeValueTable VideoRenderWorker::RenderInternal(const NodeDependency& path, con // Find texture in hash QVariant texture = value.Get(NodeParam::kTexture); - // Signal that we have a frame in memory that could be shown right now - emit CompletedFrame(path, job_time, hash, texture); - // If we actually have a texture, download it into the disk cache if (!texture.isNull()) { Download(path.in(), texture, frame_cache_->CachePathName(hash, video_params_.format())); diff --git a/app/render/backend/videorenderworker.h b/app/render/backend/videorenderworker.h index 0520f8412..b9ec19169 100644 --- a/app/render/backend/videorenderworker.h +++ b/app/render/backend/videorenderworker.h @@ -48,13 +48,11 @@ public: void SetOperatingMode(const OperatingMode& mode); signals: - void CompletedFrame(NodeDependency CurrentPath, qint64 job_time, QByteArray hash, QVariant value); + void CompletedDownload(NodeDependency path, qint64 job_time, QByteArray hash, bool texture_existed); - void CompletedDownload(NodeDependency CurrentPath, qint64 job_time, QByteArray hash, bool texture_existed); + void HashAlreadyBeingCached(NodeDependency path, qint64 job_time, QByteArray hash); - void HashAlreadyBeingCached(NodeDependency CurrentPath, qint64 job_time, QByteArray hash); - - void HashAlreadyExists(NodeDependency CurrentPath, qint64 job_time, QByteArray hash); + void HashAlreadyExists(NodeDependency path, qint64 job_time, QByteArray hash); void GeneratedFrame(const rational &time, FramePtr frame);