Merge branch 'master' of https://github.com/olive-editor/olive

app/render/memorymanager.cpp

@@ -39,11 +39,15 @@ bool MemoryManager::ShouldFreeMemory()
   return (GetAvailableMemory() < minimum_available_memory_);
 }
 
-void MemoryManager::ConsumedMemory()
+bool MemoryManager::RegisterMemory()
 {
   if (ShouldFreeMemory()) {
     emit FreeMemory();
+
+    return true;
   }
+
+  return false;
 }
 
 uint64_t MemoryManager::GetAvailableMemory()

app/render/memorymanager.h

@@ -15,8 +15,7 @@ public:
 
   static bool ShouldFreeMemory();
 
-public slots:
-  void ConsumedMemory();
+  bool RegisterMemory();
 
 signals:
   void FreeMemory();