Merge pull request #4630 from Red-F/gotham-resume-pvr-lastplayedposition

[vuplus_xbmc] / xbmc / MediaSource.cpp

diff --git a/xbmc/MediaSource.cpp b/xbmc/MediaSource.cpp
index eb1b804..cfdea55 100644 (file)
--- a/xbmc/MediaSource.cpp
+++ b/xbmc/MediaSource.cpp
@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://www.xbmc.org
+ *      http://xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 #include "URL.h"
 #include "filesystem/MultiPathDirectory.h"
 #include "utils/URIUtils.h"
+#include "utils/StringUtils.h"
 
 using namespace std;
 using namespace XFILE;
@@ -38,7 +39,7 @@ void CMediaSource::FromNameAndPaths(const CStdString &category, const CStdString
   vecPaths = paths;
   if (paths.size() == 0)
   { // no paths - return
-    strPath.Empty();
+    strPath.clear();
   }
   else if (paths.size() == 1)
   { // only one valid path? make it the strPath
@@ -58,7 +59,7 @@ void CMediaSource::FromNameAndPaths(const CStdString &category, const CStdString
 
   if (URIUtils::IsMultiPath(strPath))
     m_iDriveType = SOURCE_TYPE_VPATH;
-  else if (strPath.Left(4).Equals("udf:"))
+  else if (StringUtils::StartsWithNoCase(strPath, "udf:"))
   {
     m_iDriveType = SOURCE_TYPE_VIRTUAL_DVD;
     strPath = "D:\\";