aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xbmc/filesystem/FileCache.cpp6
-rw-r--r--xbmc/settings/AdvancedSettings.cpp2
2 files changed, 6 insertions, 2 deletions
diff --git a/xbmc/filesystem/FileCache.cpp b/xbmc/filesystem/FileCache.cpp
index 596e2c262c..0105e6a179 100644
--- a/xbmc/filesystem/FileCache.cpp
+++ b/xbmc/filesystem/FileCache.cpp
@@ -41,7 +41,11 @@ CFileCache::CFileCache()
m_nSeekResult = 0;
m_seekPos = 0;
m_readPos = 0;
- m_pCache = new CCacheCircular(g_advancedSettings.m_cacheMemBufferSize, g_advancedSettings.m_cacheMemBufferSize);
+ if(g_advancedSettings.m_cacheMemBufferSize == 0)
+ m_pCache = new CSimpleFileCache();
+ else
+ m_pCache = new CCacheCircular(std::max<unsigned int>( g_advancedSettings.m_cacheMemBufferSize / 4, 1024 * 1024)
+ , g_advancedSettings.m_cacheMemBufferSize);
m_seekPossible = 0;
}
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index 7b2328fbd3..7a904614ff 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -273,7 +273,7 @@ void CAdvancedSettings::Initialize()
m_measureRefreshrate = false;
- m_cacheMemBufferSize = (1048576 * 5);
+ m_cacheMemBufferSize = 1024 * 1024 * 20;
m_jsonOutputCompact = true;
m_jsonTcpPort = 9090;