changed: CFileItem::IsInternetStream() should also have the StrictCheck option like...

changed: Cosmetics

diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
index 4475aa4..2ef8cbc 100644 (file)
--- a/xbmc/FileItem.cpp
+++ b/xbmc/FileItem.cpp
@@ -428,6 +428,7 @@ void CFileItem::Archive(CArchive& ar)
     SetInvalid();
   }
 }
+
 void CFileItem::Serialize(CVariant& value)
 {
   //CGUIListItem::Serialize(value["CGUIListItem"]);
@@ -449,6 +450,7 @@ void CFileItem::Serialize(CVariant& value)
   if (m_pictureInfoTag)
     (*m_pictureInfoTag).Serialize(value["pictureInfoTag"]);
 }
+
 bool CFileItem::Exists(bool bUseCache /* = true */) const
 {
   if (m_strPath.IsEmpty()
@@ -595,12 +597,12 @@ bool CFileItem::IsLastFM() const
   return URIUtils::IsLastFM(m_strPath);
 }
 
-bool CFileItem::IsInternetStream() const
+bool CFileItem::IsInternetStream(const bool bStrictCheck /* = false */) const
 {
   if (HasProperty("IsHTTPDirectory"))
     return false;
 
-  return URIUtils::IsInternetStream(m_strPath);
+  return URIUtils::IsInternetStream(m_strPath, bStrictCheck);
 }
 
 bool CFileItem::IsFileFolder() const
@@ -2022,8 +2024,7 @@ void CFileItemList::StackFolders()
   }
 
   // stack folders
-  int i = 0;
-  for (i = 0; i < Size(); ++i)
+  for (int i = 0; i < Size(); i++)
   {
     CFileItemPtr item = Get(i);
     // combined the folder checks

diff --git a/xbmc/FileItem.h b/xbmc/FileItem.h
index 162ad6f..d621880 100644 (file)
--- a/xbmc/FileItem.h
+++ b/xbmc/FileItem.h
@@ -96,7 +96,7 @@ public:
   bool IsKaraoke() const;
   bool IsCUESheet() const;
   bool IsLastFM() const;
-  bool IsInternetStream() const;
+  bool IsInternetStream(const bool bStrictCheck = false) const;
   bool IsPlayList() const;
   bool IsSmartPlayList() const;
   bool IsPythonScript() const;