aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--XBMC-ATV2.xcodeproj/project.pbxproj6
-rw-r--r--XBMC-IOS.xcodeproj/project.pbxproj6
-rw-r--r--XBMC.xcodeproj/project.pbxproj8
-rw-r--r--project/VS2010Express/XBMC.vcxproj4
-rw-r--r--xbmc/MediaSource.cpp7
-rw-r--r--xbmc/Util.cpp1
-rw-r--r--xbmc/filesystem/FactoryDirectory.cpp2
-rw-r--r--xbmc/filesystem/Makefile.in1
-rw-r--r--xbmc/filesystem/VirtualPathDirectory.cpp185
-rw-r--r--xbmc/filesystem/VirtualPathDirectory.h44
-rw-r--r--xbmc/settings/AdvancedSettings.cpp3
-rw-r--r--xbmc/settings/AdvancedSettings.h3
-rw-r--r--xbmc/settings/Settings.cpp16
-rw-r--r--xbmc/utils/URIUtils.cpp18
-rw-r--r--xbmc/utils/URIUtils.h1
15 files changed, 4 insertions, 301 deletions
diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj
index c85d8b6bad..12a89de9fe 100644
--- a/XBMC-ATV2.xcodeproj/project.pbxproj
+++ b/XBMC-ATV2.xcodeproj/project.pbxproj
@@ -376,7 +376,6 @@
F56C79E8131EC154000AD0F6 /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C748E131EC152000AD0F6 /* QueryParams.cpp */; };
F56C79E9131EC154000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7490131EC152000AD0F6 /* VideoDatabaseDirectory.cpp */; };
F56C79EA131EC154000AD0F6 /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7492131EC152000AD0F6 /* VirtualDirectory.cpp */; };
- F56C79EB131EC154000AD0F6 /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7494131EC152000AD0F6 /* VirtualPathDirectory.cpp */; };
F56C79ED131EC154000AD0F6 /* ZeroconfDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7499131EC152000AD0F6 /* ZeroconfDirectory.cpp */; };
F56C79EE131EC154000AD0F6 /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C749B131EC152000AD0F6 /* ZipDirectory.cpp */; };
F56C79EF131EC154000AD0F6 /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C749D131EC152000AD0F6 /* ZipManager.cpp */; };
@@ -1769,8 +1768,6 @@
F56C7491131EC152000AD0F6 /* VideoDatabaseDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDatabaseDirectory.h; sourceTree = "<group>"; };
F56C7492131EC152000AD0F6 /* VirtualDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualDirectory.cpp; sourceTree = "<group>"; };
F56C7493131EC152000AD0F6 /* VirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualDirectory.h; sourceTree = "<group>"; };
- F56C7494131EC152000AD0F6 /* VirtualPathDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualPathDirectory.cpp; sourceTree = "<group>"; };
- F56C7495131EC152000AD0F6 /* VirtualPathDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualPathDirectory.h; sourceTree = "<group>"; };
F56C7498131EC152000AD0F6 /* ZeroconfDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroconfDirectory.h; sourceTree = "<group>"; };
F56C7499131EC152000AD0F6 /* ZeroconfDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZeroconfDirectory.cpp; sourceTree = "<group>"; };
F56C749A131EC152000AD0F6 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
@@ -4127,8 +4124,6 @@
F56C7491131EC152000AD0F6 /* VideoDatabaseDirectory.h */,
F56C7492131EC152000AD0F6 /* VirtualDirectory.cpp */,
F56C7493131EC152000AD0F6 /* VirtualDirectory.h */,
- F56C7494131EC152000AD0F6 /* VirtualPathDirectory.cpp */,
- F56C7495131EC152000AD0F6 /* VirtualPathDirectory.h */,
F56C7498131EC152000AD0F6 /* ZeroconfDirectory.h */,
F56C7499131EC152000AD0F6 /* ZeroconfDirectory.cpp */,
F56C749A131EC152000AD0F6 /* zconf.h */,
@@ -6233,7 +6228,6 @@
F56C79E8131EC154000AD0F6 /* QueryParams.cpp in Sources */,
F56C79E9131EC154000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */,
F56C79EA131EC154000AD0F6 /* VirtualDirectory.cpp in Sources */,
- F56C79EB131EC154000AD0F6 /* VirtualPathDirectory.cpp in Sources */,
F56C79ED131EC154000AD0F6 /* ZeroconfDirectory.cpp in Sources */,
F56C79EE131EC154000AD0F6 /* ZipDirectory.cpp in Sources */,
F56C79EF131EC154000AD0F6 /* ZipManager.cpp in Sources */,
diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj
index 953e5616d2..7ac23160e7 100644
--- a/XBMC-IOS.xcodeproj/project.pbxproj
+++ b/XBMC-IOS.xcodeproj/project.pbxproj
@@ -467,7 +467,6 @@
F56C89D2131F42ED000AD0F6 /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8471131F42E8000AD0F6 /* QueryParams.cpp */; };
F56C89D3131F42ED000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8473131F42E8000AD0F6 /* VideoDatabaseDirectory.cpp */; };
F56C89D4131F42ED000AD0F6 /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */; };
- F56C89D5131F42ED000AD0F6 /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8477131F42E8000AD0F6 /* VirtualPathDirectory.cpp */; };
F56C89D7131F42ED000AD0F6 /* ZeroconfDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */; };
F56C89D8131F42ED000AD0F6 /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C847E131F42E9000AD0F6 /* ZipDirectory.cpp */; };
F56C89D9131F42ED000AD0F6 /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8480131F42E9000AD0F6 /* ZipManager.cpp */; };
@@ -1967,8 +1966,6 @@
F56C8474131F42E8000AD0F6 /* VideoDatabaseDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDatabaseDirectory.h; sourceTree = "<group>"; };
F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualDirectory.cpp; sourceTree = "<group>"; };
F56C8476131F42E8000AD0F6 /* VirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualDirectory.h; sourceTree = "<group>"; };
- F56C8477131F42E8000AD0F6 /* VirtualPathDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualPathDirectory.cpp; sourceTree = "<group>"; };
- F56C8478131F42E8000AD0F6 /* VirtualPathDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualPathDirectory.h; sourceTree = "<group>"; };
F56C847B131F42E9000AD0F6 /* ZeroconfDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroconfDirectory.h; sourceTree = "<group>"; };
F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZeroconfDirectory.cpp; sourceTree = "<group>"; };
F56C847D131F42E9000AD0F6 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
@@ -4486,8 +4483,6 @@
F56C8474131F42E8000AD0F6 /* VideoDatabaseDirectory.h */,
F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */,
F56C8476131F42E8000AD0F6 /* VirtualDirectory.h */,
- F56C8477131F42E8000AD0F6 /* VirtualPathDirectory.cpp */,
- F56C8478131F42E8000AD0F6 /* VirtualPathDirectory.h */,
F56C847B131F42E9000AD0F6 /* ZeroconfDirectory.h */,
F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */,
F56C847D131F42E9000AD0F6 /* zconf.h */,
@@ -6340,7 +6335,6 @@
F56C89D2131F42ED000AD0F6 /* QueryParams.cpp in Sources */,
F56C89D3131F42ED000AD0F6 /* VideoDatabaseDirectory.cpp in Sources */,
F56C89D4131F42ED000AD0F6 /* VirtualDirectory.cpp in Sources */,
- F56C89D5131F42ED000AD0F6 /* VirtualPathDirectory.cpp in Sources */,
F56C89D7131F42ED000AD0F6 /* ZeroconfDirectory.cpp in Sources */,
F56C89D8131F42ED000AD0F6 /* ZipDirectory.cpp in Sources */,
F56C89D9131F42ED000AD0F6 /* ZipManager.cpp in Sources */,
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index 0bea47daa4..1eeabf7b47 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -797,7 +797,6 @@
E38E20720D25F9FD00618676 /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17880D25F9FA00618676 /* QueryParams.cpp */; };
E38E20730D25F9FD00618676 /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178A0D25F9FA00618676 /* VideoDatabaseDirectory.cpp */; };
E38E20740D25F9FD00618676 /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */; };
- E38E20750D25F9FD00618676 /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */; };
E38E20770D25F9FD00618676 /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17930D25F9FA00618676 /* ZipDirectory.cpp */; };
E38E20780D25F9FD00618676 /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17950D25F9FA00618676 /* ZipManager.cpp */; };
E38E207B0D25F9FD00618676 /* GUIDialogBoxBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E179C0D25F9FA00618676 /* GUIDialogBoxBase.cpp */; };
@@ -1382,7 +1381,6 @@
F5A1C9A10F6B06CF00A96ABD /* QueryParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17880D25F9FA00618676 /* QueryParams.cpp */; };
F5A1C9A20F6B06CF00A96ABD /* VideoDatabaseDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178A0D25F9FA00618676 /* VideoDatabaseDirectory.cpp */; };
F5A1C9A30F6B06CF00A96ABD /* VirtualDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */; };
- F5A1C9A40F6B06CF00A96ABD /* VirtualPathDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */; };
F5A1C9A50F6B06CF00A96ABD /* ZipDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17930D25F9FA00618676 /* ZipDirectory.cpp */; };
F5A1C9A60F6B06CF00A96ABD /* ZipManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17950D25F9FA00618676 /* ZipManager.cpp */; };
F5A1C9A90F6B06CF00A96ABD /* GUIDialogBoxBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E179C0D25F9FA00618676 /* GUIDialogBoxBase.cpp */; };
@@ -2954,8 +2952,6 @@
E38E178B0D25F9FA00618676 /* VideoDatabaseDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDatabaseDirectory.h; sourceTree = "<group>"; };
E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualDirectory.cpp; sourceTree = "<group>"; };
E38E178D0D25F9FA00618676 /* VirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualDirectory.h; sourceTree = "<group>"; };
- E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualPathDirectory.cpp; sourceTree = "<group>"; };
- E38E178F0D25F9FA00618676 /* VirtualPathDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualPathDirectory.h; sourceTree = "<group>"; };
E38E17920D25F9FA00618676 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
E38E17930D25F9FA00618676 /* ZipDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZipDirectory.cpp; sourceTree = "<group>"; };
E38E17940D25F9FA00618676 /* ZipDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipDirectory.h; sourceTree = "<group>"; };
@@ -5654,8 +5650,6 @@
E38E178B0D25F9FA00618676 /* VideoDatabaseDirectory.h */,
E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */,
E38E178D0D25F9FA00618676 /* VirtualDirectory.h */,
- E38E178E0D25F9FA00618676 /* VirtualPathDirectory.cpp */,
- E38E178F0D25F9FA00618676 /* VirtualPathDirectory.h */,
E49ACD8A100745C400A86ECD /* ZeroconfDirectory.h */,
E49ACD8B100745C400A86ECD /* ZeroconfDirectory.cpp */,
E38E17920D25F9FA00618676 /* zconf.h */,
@@ -7340,7 +7334,6 @@
E38E20720D25F9FD00618676 /* QueryParams.cpp in Sources */,
E38E20730D25F9FD00618676 /* VideoDatabaseDirectory.cpp in Sources */,
E38E20740D25F9FD00618676 /* VirtualDirectory.cpp in Sources */,
- E38E20750D25F9FD00618676 /* VirtualPathDirectory.cpp in Sources */,
E38E20770D25F9FD00618676 /* ZipDirectory.cpp in Sources */,
E38E20780D25F9FD00618676 /* ZipManager.cpp in Sources */,
E38E207B0D25F9FD00618676 /* GUIDialogBoxBase.cpp in Sources */,
@@ -8228,7 +8221,6 @@
F5A1C9A10F6B06CF00A96ABD /* QueryParams.cpp in Sources */,
F5A1C9A20F6B06CF00A96ABD /* VideoDatabaseDirectory.cpp in Sources */,
F5A1C9A30F6B06CF00A96ABD /* VirtualDirectory.cpp in Sources */,
- F5A1C9A40F6B06CF00A96ABD /* VirtualPathDirectory.cpp in Sources */,
F5A1C9A50F6B06CF00A96ABD /* ZipDirectory.cpp in Sources */,
F5A1C9A60F6B06CF00A96ABD /* ZipManager.cpp in Sources */,
F5A1C9A90F6B06CF00A96ABD /* GUIDialogBoxBase.cpp in Sources */,
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 8d9b3d8035..e7442b4754 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -1044,7 +1044,6 @@
<ClCompile Include="..\..\xbmc\FileSystem\UPnPDirectory.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\VirtualDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\VirtualPathDirectory.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\VTPDirectory.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\VTPFile.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\VTPSession.cpp" />
@@ -1894,7 +1893,6 @@
<ClInclude Include="..\..\xbmc\FileSystem\SourcesDirectory.h" />
<ClInclude Include="..\..\xbmc\FileSystem\UPnPDirectory.h" />
<ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\VirtualPathDirectory.h" />
<ClInclude Include="..\..\xbmc\FileSystem\VTPDirectory.h" />
<ClInclude Include="..\..\xbmc\FileSystem\VTPFile.h" />
<ClInclude Include="..\..\xbmc\FileSystem\VTPSession.h" />
@@ -2041,4 +2039,4 @@
<UserProperties RESOURCE_FILE="XBMC_PC.rc" />
</VisualStudio>
</ProjectExtensions>
-</Project> \ No newline at end of file
+</Project>
diff --git a/xbmc/MediaSource.cpp b/xbmc/MediaSource.cpp
index 7fa773406c..b895ecd068 100644
--- a/xbmc/MediaSource.cpp
+++ b/xbmc/MediaSource.cpp
@@ -47,10 +47,7 @@ void CMediaSource::FromNameAndPaths(const CStdString &category, const CStdString
}
else
{ // multiple valid paths?
- if (g_advancedSettings.m_useMultipaths) // use new multipath:// protocol
- strPath = CMultiPathDirectory::ConstructMultiPath(vecPaths);
- else // use older virtualpath:// protocol
- strPath.Format("virtualpath://%s/%s/", category.c_str(), name.c_str());
+ strPath = CMultiPathDirectory::ConstructMultiPath(vecPaths);
}
strName = name;
@@ -59,7 +56,7 @@ void CMediaSource::FromNameAndPaths(const CStdString &category, const CStdString
m_iBadPwdCount = 0;
m_iHasLock = 0;
- if (URIUtils::IsVirtualPath(strPath) || URIUtils::IsMultiPath(strPath))
+ if (URIUtils::IsMultiPath(strPath))
m_iDriveType = SOURCE_TYPE_VPATH;
else if (strPath.Left(4).Equals("udf:"))
{
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index d6988fae7b..dff1d9d893 100644
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -43,7 +43,6 @@
#include "addons/Addon.h"
#include "storage/IoSupport.h"
#include "filesystem/StackDirectory.h"
-#include "filesystem/VirtualPathDirectory.h"
#include "filesystem/MultiPathDirectory.h"
#include "filesystem/DirectoryCache.h"
#include "filesystem/SpecialProtocol.h"
diff --git a/xbmc/filesystem/FactoryDirectory.cpp b/xbmc/filesystem/FactoryDirectory.cpp
index 2e5df7089c..cc509520ed 100644
--- a/xbmc/filesystem/FactoryDirectory.cpp
+++ b/xbmc/filesystem/FactoryDirectory.cpp
@@ -26,7 +26,6 @@
#include "FactoryDirectory.h"
#include "HDDirectory.h"
#include "SpecialProtocolDirectory.h"
-#include "VirtualPathDirectory.h"
#include "MultiPathDirectory.h"
#include "StackDirectory.h"
#include "FactoryFileDirectory.h"
@@ -129,7 +128,6 @@ IDirectory* CFactoryDirectory::Create(const CStdString& strPath)
#ifdef HAS_FILESYSTEM_RAR
if (strProtocol == "rar") return new CRarDirectory();
#endif
- if (strProtocol == "virtualpath") return new CVirtualPathDirectory();
if (strProtocol == "multipath") return new CMultiPathDirectory();
if (strProtocol == "stack") return new CStackDirectory();
if (strProtocol == "playlistmusic") return new CPlaylistDirectory();
diff --git a/xbmc/filesystem/Makefile.in b/xbmc/filesystem/Makefile.in
index 7f636f6042..54422d7e5b 100644
--- a/xbmc/filesystem/Makefile.in
+++ b/xbmc/filesystem/Makefile.in
@@ -79,7 +79,6 @@ SRCS=AddonsDirectory.cpp \
UPnPDirectory.cpp \
VideoDatabaseDirectory.cpp \
VirtualDirectory.cpp \
- VirtualPathDirectory.cpp \
VTPDirectory.cpp \
VTPFile.cpp \
VTPSession.cpp \
diff --git a/xbmc/filesystem/VirtualPathDirectory.cpp b/xbmc/filesystem/VirtualPathDirectory.cpp
deleted file mode 100644
index 2f1d3d3cf4..0000000000
--- a/xbmc/filesystem/VirtualPathDirectory.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (C) 2005-2008 Team XBMC
- * http://www.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
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "VirtualPathDirectory.h"
-#include "Directory.h"
-#include "settings/Settings.h"
-#include "Util.h"
-#include "utils/URIUtils.h"
-#include "URL.h"
-#include "guilib/GUIWindowManager.h"
-#include "dialogs/GUIDialogProgress.h"
-#include "FileItem.h"
-#include "utils/log.h"
-#include "utils/TimeUtils.h"
-
-using namespace std;
-using namespace XFILE;
-
-// virtualpath://type/sourcename
-
-CVirtualPathDirectory::CVirtualPathDirectory()
-{}
-
-CVirtualPathDirectory::~CVirtualPathDirectory()
-{}
-
-bool CVirtualPathDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items)
-{
- CLog::Log(LOGDEBUG,"CVirtualPathDirectory::GetDirectory(%s)", strPath.c_str());
-
- CMediaSource share;
- if (!GetMatchingSource(strPath, share))
- return false;
-
- unsigned int progressTime = CTimeUtils::GetTimeMS() + 3000L; // 3 seconds before showing progress bar
- CGUIDialogProgress* dlgProgress = NULL;
-
- unsigned int iFailures = 0;
- for (int i = 0; i < (int)share.vecPaths.size(); ++i)
- {
- // show the progress dialog if we have passed our time limit
- if (CTimeUtils::GetTimeMS() > progressTime && !dlgProgress)
- {
- dlgProgress = (CGUIDialogProgress *)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
- if (dlgProgress)
- {
- dlgProgress->SetHeading(15310);
- dlgProgress->SetLine(0, 15311);
- dlgProgress->SetLine(1, "");
- dlgProgress->SetLine(2, "");
- dlgProgress->StartModal();
- dlgProgress->ShowProgressBar(true);
- dlgProgress->SetProgressMax((int)share.vecPaths.size()*2);
- dlgProgress->Progress();
- }
- }
- if (dlgProgress)
- {
- CURL url(share.vecPaths[i]);
- dlgProgress->SetLine(1, url.GetWithoutUserDetails());
- dlgProgress->SetProgressAdvance();
- dlgProgress->Progress();
- }
-
- CFileItemList tempItems;
- CLog::Log(LOGDEBUG,"Getting Directory (%s)", share.vecPaths[i].c_str());
- if (CDirectory::GetDirectory(share.vecPaths[i], tempItems, m_strFileMask, m_useFileDirectories, m_allowPrompting, m_cacheDirectory, m_extFileInfo, true))
- items.Append(tempItems);
- else
- {
- CLog::Log(LOGERROR,"Error Getting Directory (%s)", share.vecPaths[i].c_str());
- iFailures++;
- }
-
- if (dlgProgress)
- {
- dlgProgress->SetProgressAdvance();
- dlgProgress->Progress();
- }
- }
-
- if (dlgProgress)
- dlgProgress->Close();
-
- if (iFailures == share.vecPaths.size())
- return false;
-
- return true;
-}
-
-bool CVirtualPathDirectory::Exists(const CStdString& strPath)
-{
- CLog::Log(LOGDEBUG,"Testing Existence (%s)", strPath.c_str());
- CMediaSource share;
- if (!GetMatchingSource(strPath, share))
- return false;
-
- unsigned int iFailures = 0;
- for (int i = 0; i < (int)share.vecPaths.size(); ++i)
- {
- CLog::Log(LOGDEBUG,"Testing Existence (%s)", share.vecPaths[i].c_str());
- if (!CDirectory::Exists(share.vecPaths[i]))
- {
- CLog::Log(LOGERROR,"Error Testing Existence (%s)", share.vecPaths[i].c_str());
- iFailures++;
- }
- }
-
- if (iFailures == share.vecPaths.size())
- return false;
-
- return true;
-}
-
-bool CVirtualPathDirectory::GetPathes(const CStdString& strPath, vector<CStdString>& vecPaths)
-{
- CMediaSource share;
- if (!GetMatchingSource(strPath, share))
- return false;
- vecPaths = share.vecPaths;
- return true;
-}
-
-bool CVirtualPathDirectory::GetTypeAndSource(const CStdString& strPath, CStdString& strType, CStdString& strSource)
-{
- // format: virtualpath://type/sourcename
- CStdString strTemp = strPath;
- URIUtils::RemoveSlashAtEnd(strTemp);
- CStdString strTest = "virtualpath://";
- if (strTemp.Left(strTest.length()).Equals(strTest))
- {
- strTemp = strTemp.Mid(strTest.length());
- int iPos = strTemp.Find('/');
- if (iPos < 1)
- return false;
- strType = strTemp.Mid(0, iPos);
- strSource = strTemp.Mid(iPos + 1);
- //CLog::Log(LOGDEBUG,"CVirtualPathDirectory::GetTypeAndSource(%s) = [%s],[%s]", strPath.c_str(), strType.c_str(), strSource.c_str());
- return true;
- }
- return false;
-}
-
-bool CVirtualPathDirectory::GetMatchingSource(const CStdString &strPath, CMediaSource& share)
-{
- CStdString strType, strSource;
- if (!GetTypeAndSource(strPath, strType, strSource))
- return false;
-
- // no support for "files" operation
- if (strType == "files")
- return false;
- VECSOURCES *VECSOURCES = g_settings.GetSourcesFromType(strType);
- if (!VECSOURCES)
- return false;
-
- bool bIsSourceName = false;
- int iIndex = CUtil::GetMatchingSource(strSource, *VECSOURCES, bIsSourceName);
- if (!bIsSourceName)
- return false;
- if (iIndex < 0 || iIndex >= (int)VECSOURCES->size())
- return false;
-
- share = (*VECSOURCES)[iIndex];
- return true;
-}
-
diff --git a/xbmc/filesystem/VirtualPathDirectory.h b/xbmc/filesystem/VirtualPathDirectory.h
deleted file mode 100644
index eae491727d..0000000000
--- a/xbmc/filesystem/VirtualPathDirectory.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-/*
- * Copyright (C) 2005-2008 Team XBMC
- * http://www.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
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "IDirectory.h"
-
-class CMediaSource;
-
-namespace XFILE
-{
-class CVirtualPathDirectory :
- public IDirectory
-{
-public:
- CVirtualPathDirectory(void);
- virtual ~CVirtualPathDirectory(void);
- virtual bool GetDirectory(const CStdString& strPath, CFileItemList &items);
- virtual bool Exists(const CStdString& strPath);
-
- bool GetPathes(const CStdString& strPath, std::vector<CStdString>& vecPaths);
-
-protected:
- bool GetTypeAndSource(const CStdString& strPath, CStdString& strType, CStdString& strSource);
- bool GetMatchingSource(const CStdString &strPath, CMediaSource& share);
-};
-}
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
index 7a904614ff..b296606385 100644
--- a/xbmc/settings/AdvancedSettings.cpp
+++ b/xbmc/settings/AdvancedSettings.cpp
@@ -45,8 +45,6 @@ CAdvancedSettings::CAdvancedSettings()
void CAdvancedSettings::Initialize()
{
- m_useMultipaths = true;
-
m_audioHeadRoom = 0;
m_ac3Gain = 12.0f;
m_audioApplyDrc = true;
@@ -632,7 +630,6 @@ bool CAdvancedSettings::Load()
XMLUtils::GetBoolean(pRootElement, "handlemounting", m_handleMounting);
XMLUtils::GetBoolean(pRootElement, "nodvdrom", m_noDVDROM);
- XMLUtils::GetBoolean(pRootElement, "usemultipaths", m_useMultipaths);
#ifdef HAS_SDL
XMLUtils::GetBoolean(pRootElement, "fullscreen", m_startFullScreen);
#endif
diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
index 571b3ad796..896bdd812d 100644
--- a/xbmc/settings/AdvancedSettings.h
+++ b/xbmc/settings/AdvancedSettings.h
@@ -77,9 +77,6 @@ class CAdvancedSettings
static void GetCustomRegexpReplacers(TiXmlElement *pRootElement, CStdStringArray& settings);
static void GetCustomExtensions(TiXmlElement *pRootElement, CStdString& extensions);
- // multipath testing
- bool m_useMultipaths;
-
int m_audioHeadRoom;
float m_ac3Gain;
CStdString m_audioDefaultPlayer;
diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index 08a46f932f..6720e3356b 100644
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -284,7 +284,7 @@ bool CSettings::GetSource(const CStdString &category, const TiXmlNode *source, C
strPath = CSpecialProtocol::ReplaceOldPath(strPath, pathVersion);
// make sure there are no virtualpaths or stack paths defined in xboxmediacenter.xml
//CLog::Log(LOGDEBUG," Found path: %s", strPath.c_str());
- if (!URIUtils::IsVirtualPath(strPath) && !URIUtils::IsStack(strPath))
+ if (!URIUtils::IsStack(strPath))
{
// translate special tags
if (!strPath.IsEmpty() && strPath.at(0) == '$')
@@ -362,16 +362,6 @@ bool CSettings::GetSource(const CStdString &category, const TiXmlNode *source, C
share.FromNameAndPaths(category, strName, verifiedPaths);
-/* CLog::Log(LOGDEBUG," Adding source:");
- CLog::Log(LOGDEBUG," Name: %s", share.strName.c_str());
- if (URIUtils::IsVirtualPath(share.strPath) || URIUtils::IsMultiPath(share.strPath))
- {
- for (int i = 0; i < (int)share.vecPaths.size(); ++i)
- CLog::Log(LOGDEBUG," Path (%02i): %s", i+1, share.vecPaths.at(i).c_str());
- }
- else
- CLog::Log(LOGDEBUG," Path: %s", share.strPath.c_str());
-*/
share.m_iBadPwdCount = 0;
if (pLockMode)
{
@@ -1170,10 +1160,6 @@ bool CSettings::UpdateSource(const CStdString &strType, const CStdString strOldN
if (!pShares) return false;
- // disallow virtual paths
- if (strUpdateElement.Equals("path") && URIUtils::IsVirtualPath(strUpdateText))
- return false;
-
for (IVECSOURCES it = pShares->begin(); it != pShares->end(); it++)
{
if ((*it).strName == strOldName)
diff --git a/xbmc/utils/URIUtils.cpp b/xbmc/utils/URIUtils.cpp
index 33c3ccb990..33e28fa641 100644
--- a/xbmc/utils/URIUtils.cpp
+++ b/xbmc/utils/URIUtils.cpp
@@ -26,7 +26,6 @@
#include "filesystem/MythDirectory.h"
#include "filesystem/SpecialProtocol.h"
#include "filesystem/StackDirectory.h"
-#include "filesystem/VirtualPathDirectory.h"
#include "network/DNSNameCache.h"
#include "settings/Settings.h"
#include "URL.h"
@@ -328,18 +327,6 @@ bool URIUtils::IsRemote(const CStdString& strFile)
if(IsStack(strFile))
return IsRemote(CStackDirectory::GetFirstStackedFile(strFile));
- if (IsVirtualPath(strFile))
- { // virtual paths need to be checked separately
- CVirtualPathDirectory dir;
- vector<CStdString> paths;
- if (dir.GetPathes(strFile, paths))
- {
- for (unsigned int i = 0; i < paths.size(); i++)
- if (IsRemote(paths[i])) return true;
- }
- return false;
- }
-
if(IsMultiPath(strFile))
{ // virtual paths need to be checked separately
vector<CStdString> paths;
@@ -492,11 +479,6 @@ bool URIUtils::IsDVD(const CStdString& strFile)
return false;
}
-bool URIUtils::IsVirtualPath(const CStdString& strFile)
-{
- return strFile.Left(12).Equals("virtualpath:");
-}
-
bool URIUtils::IsStack(const CStdString& strFile)
{
return strFile.Left(6).Equals("stack:");
diff --git a/xbmc/utils/URIUtils.h b/xbmc/utils/URIUtils.h
index f1f86c5fbb..300b144aba 100644
--- a/xbmc/utils/URIUtils.h
+++ b/xbmc/utils/URIUtils.h
@@ -79,7 +79,6 @@ public:
static bool IsUPnP(const CStdString& strFile);
static bool IsURL(const CStdString& strFile);
static bool IsVideoDb(const CStdString& strFile);
- static bool IsVirtualPath(const CStdString& strFile);
static bool IsVTP(const CStdString& strFile);
static bool IsZIP(const CStdString& strFile);
generated by cgit v1.2.3 (git 2.26.2) at 2025-03-19 15:48:15 +0000