Improving cache settings and mark XBMSP as a streaming protocol when …

…over the Internet
plexinc · Jun 10, 2008 · 3924771 · 3924771
1 parent 788c2ae
commit 3924771
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
@@ -557,11 +557,14 @@ bool CFileItem::IsInternetStream() const
   if (strProtocol.size() == 0)
     return false;
 
+  if (IsOnLAN())
+    return false;
+
   if (strProtocol == "shout" || strProtocol == "mms" ||
-      strProtocol == "http" || strProtocol == "ftp" ||
+      strProtocol == "http"  || strProtocol == "ftp" ||
-      strProtocol == "rtsp" || strProtocol == "rtp" ||
+      strProtocol == "rtsp"  || strProtocol == "rtp" ||
-      strProtocol == "udp"  || strProtocol == "lastfm" ||
+      strProtocol == "udp"   || strProtocol == "lastfm" ||
-      strProtocol == "https")
+      strProtocol == "https" || strProtocol == "xbms")
     return true;
 
   return false;

diff --git a/xbmc/GUISettings.cpp b/xbmc/GUISettings.cpp
@@ -406,17 +406,17 @@ CGUISettings::CGUISettings(void)
   AddInt(1, "cache.harddisk", 14025, 256, 0, 256, 4096, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
   AddSeparator(2, "cache.sep1");
   AddInt(3, "cachevideo.dvdrom", 14026, 2048, 0, 256, 16384, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
-  AddInt(4, "cachevideo.lan", 14027, 2048, 0, 256, 16384, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
+  AddInt(4, "cachevideo.lan", 14027, 2048, 0, 256, 32768, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
-  AddInt(5, "cachevideo.internet", 14028, 4096, 0, 256, 16384, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
+  AddInt(5, "cachevideo.internet", 14028, 4096, 0, 256, 32768, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
   AddSeparator(6, "cache.sep2");
   AddInt(7, "cacheaudio.dvdrom", 14030, 256, 0, 256, 4096, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
-  AddInt(8, "cacheaudio.lan", 14031, 256, 0, 256, 4096, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
+  AddInt(8, "cacheaudio.lan", 14031, 256, 0, 256, 16384, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
-  AddInt(9, "cacheaudio.internet", 14032, 256, 0, 256, 4096, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
+  AddInt(9, "cacheaudio.internet", 14032, 256, 0, 256, 32768, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
   AddSeparator(10, "cache.sep3");
   AddInt(11, "cachedvd.dvdrom", 14034, 2048, 0, 256, 16384, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
   AddInt(12, "cachedvd.lan", 14035, 2048, 0, 256, 16384, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
   AddSeparator(13, "cache.sep4");
-  AddInt(14, "cacheunknown.internet", 14060, 4096, 0, 256, 16384, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
+  AddInt(14, "cacheunknown.internet", 14060, 4096, 0, 256, 32768, SPIN_CONTROL_INT_PLUS, MASK_KB, TEXT_OFF);
 
   AddCategory(4, "audiooutput", 772);
   AddInt(3, "audiooutput.mode", 337, AUDIO_ANALOG, AUDIO_ANALOG, 1, AUDIO_DIGITAL, SPIN_CONTROL_TEXT);