From abd2597d0fb6c26dade0ab6efd119449b4686649 Mon Sep 17 00:00:00 2001
From: Karl Blomster <kalle.blomster@gmail.com>
Date: Sun, 29 Nov 2009 19:07:53 +0000
Subject: [PATCH] Change GetDesiredCacheSize() to WantsCaching() since video
 providers aren't setting number of frames to cache anymore.

Originally committed to SVN as r3831.
---
 aegisub/src/include/aegisub/video_provider.h | 2 +-
 aegisub/src/video_provider_cache.cpp         | 2 +-
 aegisub/src/video_provider_ffmpegsource.h    | 2 +-
 aegisub/src/video_provider_manager.cpp       | 2 +-
 aegisub/src/video_provider_quicktime.h       | 2 +-
 aegisub/src/video_provider_yuv4mpeg.h        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aegisub/src/include/aegisub/video_provider.h b/aegisub/src/include/aegisub/video_provider.h
index 18648ab4a..b34832eec 100644
--- a/aegisub/src/include/aegisub/video_provider.h
+++ b/aegisub/src/include/aegisub/video_provider.h
@@ -87,7 +87,7 @@ public:
 	/// @brief // How many frames does this provider want Aegisub to cache? Set to 0 if it doesn't require caching.
 	/// @return 
 	///
-	virtual int GetDesiredCacheSize() { return 0; }
+	virtual bool WantsCaching() { return false; }
 
 
 	/// @brief // For "special" providers that don't deal well with VFR (i.e. Avisynth)
diff --git a/aegisub/src/video_provider_cache.cpp b/aegisub/src/video_provider_cache.cpp
index 3236f3213..6c018af43 100644
--- a/aegisub/src/video_provider_cache.cpp
+++ b/aegisub/src/video_provider_cache.cpp
@@ -49,7 +49,7 @@
 VideoProviderCache::VideoProviderCache(VideoProvider *parent) {
 	master = parent;
 	cacheMax = 0;
-	SetCacheMax(parent->GetDesiredCacheSize());
+	parent->WantsCaching() ? SetCacheMax(1) : SetCacheMax(0);
 }
 
 
diff --git a/aegisub/src/video_provider_ffmpegsource.h b/aegisub/src/video_provider_ffmpegsource.h
index 6a2f60699..4e1304c4e 100644
--- a/aegisub/src/video_provider_ffmpegsource.h
+++ b/aegisub/src/video_provider_ffmpegsource.h
@@ -100,7 +100,7 @@ public:
 	wxString GetDecoderName() { return L"FFmpegSource"; }
 	/// @brief Gets the number of frames to cache.
 	/// @return Returns 8.
-	int GetDesiredCacheSize() { return 8; }
+	bool WantsCaching() { return true; }
 };
 
 
diff --git a/aegisub/src/video_provider_manager.cpp b/aegisub/src/video_provider_manager.cpp
index 6c598d2f1..884027196 100644
--- a/aegisub/src/video_provider_manager.cpp
+++ b/aegisub/src/video_provider_manager.cpp
@@ -93,7 +93,7 @@ VideoProvider *VideoProviderFactoryManager::GetProvider(wxString video) {
 			VideoProvider *provider = GetFactory(list[i])->CreateProvider(video.wc_str());
 			if (provider) {
 				// Cache if necessary
-				if (provider->GetDesiredCacheSize()) {
+				if (provider->WantsCaching()) {
 					provider = new VideoProviderCache(provider);
 				}
 				return provider;
diff --git a/aegisub/src/video_provider_quicktime.h b/aegisub/src/video_provider_quicktime.h
index c88309dca..2a8b45d9a 100644
--- a/aegisub/src/video_provider_quicktime.h
+++ b/aegisub/src/video_provider_quicktime.h
@@ -132,7 +132,7 @@ public:
 	/// @brief DOCME
 	/// @return 
 	///
-	int GetDesiredCacheSize() { return 8; };
+	bool WantsCaching() { return true; };
 };
 
 
diff --git a/aegisub/src/video_provider_yuv4mpeg.h b/aegisub/src/video_provider_yuv4mpeg.h
index 8e8023769..33a178049 100644
--- a/aegisub/src/video_provider_yuv4mpeg.h
+++ b/aegisub/src/video_provider_yuv4mpeg.h
@@ -163,7 +163,7 @@ public:
 	bool IsVFR() { return false; };
 	FrameRate GetTrueFrameRate() { return FrameRate(); }
 	wxString GetDecoderName() { return L"YUV4MPEG"; }
-	int GetDesiredCacheSize() { return 8; }
+	bool WantsCaching() { return true; }
 };