Change GetDesiredCacheSize() to WantsCaching() since video providers aren't setting number of frames to cache anymore.

Originally committed to SVN as r3831.
This commit is contained in:
Karl Blomster 2009-11-29 19:07:53 +00:00
parent ed3b47b250
commit abd2597d0f
6 changed files with 6 additions and 6 deletions

View file

@ -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. /// @brief // How many frames does this provider want Aegisub to cache? Set to 0 if it doesn't require caching.
/// @return /// @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) /// @brief // For "special" providers that don't deal well with VFR (i.e. Avisynth)

View file

@ -49,7 +49,7 @@
VideoProviderCache::VideoProviderCache(VideoProvider *parent) { VideoProviderCache::VideoProviderCache(VideoProvider *parent) {
master = parent; master = parent;
cacheMax = 0; cacheMax = 0;
SetCacheMax(parent->GetDesiredCacheSize()); parent->WantsCaching() ? SetCacheMax(1) : SetCacheMax(0);
} }

View file

@ -100,7 +100,7 @@ public:
wxString GetDecoderName() { return L"FFmpegSource"; } wxString GetDecoderName() { return L"FFmpegSource"; }
/// @brief Gets the number of frames to cache. /// @brief Gets the number of frames to cache.
/// @return Returns 8. /// @return Returns 8.
int GetDesiredCacheSize() { return 8; } bool WantsCaching() { return true; }
}; };

View file

@ -93,7 +93,7 @@ VideoProvider *VideoProviderFactoryManager::GetProvider(wxString video) {
VideoProvider *provider = GetFactory(list[i])->CreateProvider(video.wc_str()); VideoProvider *provider = GetFactory(list[i])->CreateProvider(video.wc_str());
if (provider) { if (provider) {
// Cache if necessary // Cache if necessary
if (provider->GetDesiredCacheSize()) { if (provider->WantsCaching()) {
provider = new VideoProviderCache(provider); provider = new VideoProviderCache(provider);
} }
return provider; return provider;

View file

@ -132,7 +132,7 @@ public:
/// @brief DOCME /// @brief DOCME
/// @return /// @return
/// ///
int GetDesiredCacheSize() { return 8; }; bool WantsCaching() { return true; };
}; };

View file

@ -163,7 +163,7 @@ public:
bool IsVFR() { return false; }; bool IsVFR() { return false; };
FrameRate GetTrueFrameRate() { return FrameRate(); } FrameRate GetTrueFrameRate() { return FrameRate(); }
wxString GetDecoderName() { return L"YUV4MPEG"; } wxString GetDecoderName() { return L"YUV4MPEG"; }
int GetDesiredCacheSize() { return 8; } bool WantsCaching() { return true; }
}; };