From 813c2e411aef7e82c45932639b144448a736fd0e Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 23 Feb 2020 11:46:30 +1100 Subject: [PATCH] rendercache/decodercache: moved qmutex that was only used by decodercache into decodercache's derived class --- app/render/backend/decodercache.h | 12 +++++++++++- app/render/backend/rendercache.h | 8 -------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/render/backend/decodercache.h b/app/render/backend/decodercache.h index de02bcf09..a747cec2d 100644 --- a/app/render/backend/decodercache.h +++ b/app/render/backend/decodercache.h @@ -5,6 +5,16 @@ #include "project/item/footage/stream.h" #include "rendercache.h" -using DecoderCache = RenderCache; +class DecoderCache : public RenderCache +{ +public: + DecoderCache() = default; + + QMutex* lock() {return &lock_;} + +private: + QMutex lock_; + +}; #endif // DECODERCACHE_H diff --git a/app/render/backend/rendercache.h b/app/render/backend/rendercache.h index 9194cb926..7372e19be 100644 --- a/app/render/backend/rendercache.h +++ b/app/render/backend/rendercache.h @@ -18,17 +18,9 @@ public: bool Has(K key) const {return values_.contains(key);} - void Lock() { lock_.lock(); } - - void Unlock() { lock_.unlock(); } - - QMutex* lock() { return &lock_; } - private: QHash values_; - QMutex lock_; - }; #endif // RENDERCACHE_H