diff --git a/src/CacheBase.h b/src/CacheBase.h index 2c31c9be..043f4b82 100644 --- a/src/CacheBase.h +++ b/src/CacheBase.h @@ -93,6 +93,10 @@ namespace openshot { /// @param end_frame_number The ending frame number of the cached frame virtual void Remove(int64_t start_frame_number, int64_t end_frame_number) = 0; + /// @brief Move frame to front of queue (so it lasts longer) + /// @param frame_number The frame number of the cached frame + virtual void Touch(int64_t frame_number) = 0; + /// Gets the maximum bytes value int64_t GetMaxBytes() { return max_bytes; }; diff --git a/src/CacheDisk.cpp b/src/CacheDisk.cpp index f969899b..960744fa 100644 --- a/src/CacheDisk.cpp +++ b/src/CacheDisk.cpp @@ -94,7 +94,7 @@ void CacheDisk::Add(std::shared_ptr frame) // Freshen frame if it already exists if (frames.count(frame_number)) // Move frame to front of queue - MoveToFront(frame_number); + Touch(frame_number); else { @@ -334,7 +334,7 @@ void CacheDisk::Remove(int64_t start_frame_number, int64_t end_frame_number) } // Move frame to front of queue (so it lasts longer) -void CacheDisk::MoveToFront(int64_t frame_number) +void CacheDisk::Touch(int64_t frame_number) { // Does frame exists in cache? if (frames.count(frame_number)) diff --git a/src/CacheDisk.h b/src/CacheDisk.h index 50a2dc67..2658ef29 100644 --- a/src/CacheDisk.h +++ b/src/CacheDisk.h @@ -91,7 +91,7 @@ namespace openshot { /// @brief Move frame to front of queue (so it lasts longer) /// @param frame_number The frame number of the cached frame - void MoveToFront(int64_t frame_number); + void Touch(int64_t frame_number); /// @brief Remove a specific frame /// @param frame_number The frame number of the cached frame diff --git a/src/CacheMemory.cpp b/src/CacheMemory.cpp index ce30c077..b768c12f 100644 --- a/src/CacheMemory.cpp +++ b/src/CacheMemory.cpp @@ -52,7 +52,7 @@ void CacheMemory::Add(std::shared_ptr frame) // Freshen frame if it already exists if (frames.count(frame_number)) // Move frame to front of queue - MoveToFront(frame_number); + Touch(frame_number); else { @@ -192,7 +192,7 @@ void CacheMemory::Remove(int64_t start_frame_number, int64_t end_frame_number) } // Move frame to front of queue (so it lasts longer) -void CacheMemory::MoveToFront(int64_t frame_number) +void CacheMemory::Touch(int64_t frame_number) { // Create a scoped lock, to protect the cache from multiple threads const std::lock_guard lock(*cacheMutex); diff --git a/src/CacheMemory.h b/src/CacheMemory.h index 03d3a415..e35fdb11 100644 --- a/src/CacheMemory.h +++ b/src/CacheMemory.h @@ -74,7 +74,7 @@ namespace openshot { /// @brief Move frame to front of queue (so it lasts longer) /// @param frame_number The frame number of the cached frame - void MoveToFront(int64_t frame_number); + void Touch(int64_t frame_number); /// @brief Remove a specific frame /// @param frame_number The frame number of the cached frame