aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--XBMC-ATV2.xcodeproj/project.pbxproj370
-rw-r--r--XBMC-IOS.xcodeproj/project.pbxproj370
-rw-r--r--XBMC.xcodeproj/project.pbxproj494
-rw-r--r--project/VS2010Express/XBMC.vcxproj371
-rw-r--r--project/VS2010Express/XBMC.vcxproj.filters1126
-rw-r--r--xbmc/Application.cpp6
-rw-r--r--xbmc/Autorun.cpp2
-rw-r--r--xbmc/FileItem.cpp6
-rw-r--r--xbmc/SystemGlobals.cpp2
-rw-r--r--xbmc/Util.cpp2
-rw-r--r--xbmc/addons/Scraper.cpp2
-rw-r--r--xbmc/cores/ExternalPlayer/ExternalPlayer.cpp2
-rw-r--r--xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp2
-rw-r--r--xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp2
-rw-r--r--xbmc/filesystem/AFPDirectory.cpp2
-rw-r--r--xbmc/filesystem/AFPFile.cpp (renamed from xbmc/filesystem/FileAFP.cpp)44
-rw-r--r--xbmc/filesystem/AFPFile.h (renamed from xbmc/filesystem/FileAFP.h)8
-rw-r--r--xbmc/filesystem/AddonsDirectory.cpp4
-rw-r--r--xbmc/filesystem/CDDAFile.cpp (renamed from xbmc/filesystem/FileCDDA.cpp)2
-rw-r--r--xbmc/filesystem/CDDAFile.h (renamed from xbmc/filesystem/FileCDDA.h)0
-rw-r--r--xbmc/filesystem/CircularCache.cpp (renamed from xbmc/filesystem/CacheCircular.cpp)0
-rw-r--r--xbmc/filesystem/CircularCache.h (renamed from xbmc/filesystem/CacheCircular.h)0
-rw-r--r--xbmc/filesystem/CurlFile.cpp (renamed from xbmc/filesystem/FileCurl.cpp)106
-rw-r--r--xbmc/filesystem/CurlFile.h (renamed from xbmc/filesystem/FileCurl.h)6
-rw-r--r--xbmc/filesystem/DAAPDirectory.cpp2
-rw-r--r--xbmc/filesystem/DAAPFile.cpp (renamed from xbmc/filesystem/FileDAAP.cpp)26
-rw-r--r--xbmc/filesystem/DAAPFile.h (renamed from xbmc/filesystem/FileDAAP.h)12
-rw-r--r--xbmc/filesystem/DAVDirectory.cpp2
-rw-r--r--xbmc/filesystem/Directory.cpp6
-rw-r--r--xbmc/filesystem/DirectoryCache.cpp50
-rw-r--r--xbmc/filesystem/DirectoryCache.h8
-rw-r--r--xbmc/filesystem/DirectoryFactory.cpp (renamed from xbmc/filesystem/FactoryDirectory.cpp)20
-rw-r--r--xbmc/filesystem/DirectoryFactory.h (renamed from xbmc/filesystem/FactoryDirectory.h)4
-rw-r--r--xbmc/filesystem/FTPDirectory.cpp2
-rw-r--r--xbmc/filesystem/File.cpp4
-rw-r--r--xbmc/filesystem/FileCache.cpp50
-rw-r--r--xbmc/filesystem/FileCache.h8
-rw-r--r--xbmc/filesystem/FileDirectoryFactory.cpp (renamed from xbmc/filesystem/FactoryFileDirectory.cpp)8
-rw-r--r--xbmc/filesystem/FileDirectoryFactory.h (renamed from xbmc/filesystem/FactoryFileDirectory.h)6
-rw-r--r--xbmc/filesystem/FileFactory.cpp46
-rw-r--r--xbmc/filesystem/FileReaderFile.cpp (renamed from xbmc/filesystem/FileFileReader.cpp)26
-rw-r--r--xbmc/filesystem/FileReaderFile.h (renamed from xbmc/filesystem/FileFileReader.h)6
-rw-r--r--xbmc/filesystem/HDFile.cpp (renamed from xbmc/filesystem/FileHD.cpp)42
-rw-r--r--xbmc/filesystem/HDFile.h (renamed from xbmc/filesystem/FileHD.h)8
-rw-r--r--xbmc/filesystem/HDHomeRunDirectory.cpp119
-rw-r--r--xbmc/filesystem/HDHomeRunDirectory.h39
-rw-r--r--xbmc/filesystem/HDHomeRunFile.cpp (renamed from xbmc/filesystem/HDHomeRun.cpp)120
-rw-r--r--xbmc/filesystem/HDHomeRunFile.h (renamed from xbmc/filesystem/HDHomeRun.h)23
-rw-r--r--xbmc/filesystem/HTTPDirectory.cpp2
-rw-r--r--xbmc/filesystem/ISOFile.cpp (renamed from xbmc/filesystem/FileISO.cpp)22
-rw-r--r--xbmc/filesystem/ISOFile.h (renamed from xbmc/filesystem/FileISO.h)8
-rw-r--r--xbmc/filesystem/LastFMDirectory.cpp4
-rw-r--r--xbmc/filesystem/LastFMDirectory.h2
-rw-r--r--xbmc/filesystem/LastFMFile.cpp (renamed from xbmc/filesystem/FileLastFM.cpp)6
-rw-r--r--xbmc/filesystem/LastFMFile.h (renamed from xbmc/filesystem/FileLastFM.h)8
-rw-r--r--xbmc/filesystem/Makefile.in62
-rw-r--r--xbmc/filesystem/MemBufferCache.cpp (renamed from xbmc/filesystem/CacheMemBuffer.cpp)0
-rw-r--r--xbmc/filesystem/MemBufferCache.h (renamed from xbmc/filesystem/CacheMemBuffer.h)0
-rw-r--r--xbmc/filesystem/MusicDatabaseFile.cpp (renamed from xbmc/filesystem/FileMusicDatabase.cpp)24
-rw-r--r--xbmc/filesystem/MusicDatabaseFile.h (renamed from xbmc/filesystem/FileMusicDatabase.h)6
-rw-r--r--xbmc/filesystem/MythDirectory.cpp2
-rw-r--r--xbmc/filesystem/MythFile.cpp2
-rw-r--r--xbmc/filesystem/NFSDirectory.h2
-rw-r--r--xbmc/filesystem/NFSFile.cpp (renamed from xbmc/filesystem/FileNFS.cpp)44
-rw-r--r--xbmc/filesystem/NFSFile.h (renamed from xbmc/filesystem/FileNFS.h)8
-rw-r--r--xbmc/filesystem/PipeFile.cpp (renamed from xbmc/filesystem/FilePipe.cpp)60
-rw-r--r--xbmc/filesystem/PipeFile.h (renamed from xbmc/filesystem/FilePipe.h)8
-rw-r--r--xbmc/filesystem/RSSDirectory.cpp2
-rw-r--r--xbmc/filesystem/RTVFile.cpp (renamed from xbmc/filesystem/FileRTV.cpp)26
-rw-r--r--xbmc/filesystem/RTVFile.h (renamed from xbmc/filesystem/FileRTV.h)8
-rw-r--r--xbmc/filesystem/RarFile.cpp (renamed from xbmc/filesystem/FileRar.cpp)50
-rw-r--r--xbmc/filesystem/RarFile.h (renamed from xbmc/filesystem/FileRar.h)18
-rw-r--r--xbmc/filesystem/SFTPDirectory.h2
-rw-r--r--xbmc/filesystem/SFTPFile.cpp (renamed from xbmc/filesystem/FileSFTP.cpp)26
-rw-r--r--xbmc/filesystem/SFTPFile.h (renamed from xbmc/filesystem/FileSFTP.h)6
-rw-r--r--xbmc/filesystem/SMBDirectory.h2
-rw-r--r--xbmc/filesystem/ShoutcastFile.cpp (renamed from xbmc/filesystem/FileShoutcast.cpp)24
-rw-r--r--xbmc/filesystem/ShoutcastFile.h (renamed from xbmc/filesystem/FileShoutcast.h)12
-rw-r--r--xbmc/filesystem/Slingbox.h91
-rw-r--r--xbmc/filesystem/SlingboxDirectory.cpp45
-rw-r--r--xbmc/filesystem/SlingboxDirectory.h38
-rw-r--r--xbmc/filesystem/SlingboxFile.cpp (renamed from xbmc/filesystem/Slingbox.cpp)21
-rw-r--r--xbmc/filesystem/SlingboxFile.h78
-rw-r--r--xbmc/filesystem/SmbFile.cpp (renamed from xbmc/filesystem/FileSmb.cpp)48
-rw-r--r--xbmc/filesystem/SmbFile.h (renamed from xbmc/filesystem/FileSmb.h)8
-rw-r--r--xbmc/filesystem/SpecialProtocolFile.cpp (renamed from xbmc/filesystem/FileSpecialProtocol.cpp)32
-rw-r--r--xbmc/filesystem/SpecialProtocolFile.h (renamed from xbmc/filesystem/FileSpecialProtocol.h)6
-rw-r--r--xbmc/filesystem/TuxBoxDirectory.cpp (renamed from xbmc/filesystem/DirectoryTuxBox.cpp)18
-rw-r--r--xbmc/filesystem/TuxBoxDirectory.h (renamed from xbmc/filesystem/DirectoryTuxBox.h)6
-rw-r--r--xbmc/filesystem/TuxBoxFile.cpp (renamed from xbmc/filesystem/FileTuxBox.cpp)22
-rw-r--r--xbmc/filesystem/TuxBoxFile.h (renamed from xbmc/filesystem/FileTuxBox.h)6
-rw-r--r--xbmc/filesystem/UDFFile.cpp (renamed from xbmc/filesystem/FileUDF.cpp)22
-rw-r--r--xbmc/filesystem/UDFFile.h (renamed from xbmc/filesystem/FileUDF.h)6
-rw-r--r--xbmc/filesystem/UPnPFile.cpp (renamed from xbmc/filesystem/FileUPnP.cpp)12
-rw-r--r--xbmc/filesystem/UPnPFile.h (renamed from xbmc/filesystem/FileUPnP.h)6
-rw-r--r--xbmc/filesystem/VirtualDirectory.cpp4
-rw-r--r--xbmc/filesystem/ZipFile.cpp (renamed from xbmc/filesystem/FileZip.cpp)34
-rw-r--r--xbmc/filesystem/ZipFile.h (renamed from xbmc/filesystem/FileZip.h)6
-rw-r--r--xbmc/interfaces/http-api/XBMChttp.cpp2
-rw-r--r--xbmc/music/LastFmManager.cpp2
-rw-r--r--xbmc/music/MusicDatabase.cpp2
-rw-r--r--xbmc/music/MusicInfoLoader.cpp2
-rw-r--r--xbmc/music/dialogs/GUIDialogSongInfo.cpp2
-rw-r--r--xbmc/music/infoscanner/MusicInfoScanner.cpp2
-rw-r--r--xbmc/music/infoscanner/MusicInfoScraper.h2
-rw-r--r--xbmc/music/windows/GUIWindowMusicBase.cpp2
-rw-r--r--xbmc/network/AirTunesServer.cpp2
-rw-r--r--xbmc/network/AirTunesServer.h2
-rw-r--r--xbmc/network/libscrobbler/scrobbler.cpp2
-rw-r--r--xbmc/pictures/Picture.cpp2
-rw-r--r--xbmc/utils/DownloadQueue.cpp2
-rw-r--r--xbmc/utils/Fanart.cpp2
-rw-r--r--xbmc/utils/FileOperationJob.cpp2
-rw-r--r--xbmc/utils/RssReader.cpp2
-rw-r--r--xbmc/utils/ScraperUrl.cpp4
-rw-r--r--xbmc/utils/SystemInfo.cpp2
-rw-r--r--xbmc/utils/TuxBoxUtil.cpp2
-rw-r--r--xbmc/video/VideoInfoDownloader.h2
-rw-r--r--xbmc/video/VideoInfoScanner.cpp2
-rw-r--r--xbmc/windows/GUIMediaWindow.cpp2
120 files changed, 2386 insertions, 2181 deletions
diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj
index d570b177fd..2acf83982f 100644
--- a/XBMC-ATV2.xcodeproj/project.pbxproj
+++ b/XBMC-ATV2.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
/* Begin PBXBuildFile section */
1830216013B8E35300770920 /* controledit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1830215F13B8E35300770920 /* controledit.cpp */; };
- 18404DFB1396C43B00863BBA /* Slingbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18404DF91396C43B00863BBA /* Slingbox.cpp */; };
18404DFD1396C44F00863BBA /* SlingboxLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18404DFC1396C44F00863BBA /* SlingboxLib.a */; };
1840B796139968DB007C848B /* JSONVariantParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B792139968DB007C848B /* JSONVariantParser.cpp */; };
1840B797139968DB007C848B /* JSONVariantWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B794139968DB007C848B /* JSONVariantWriter.cpp */; };
@@ -25,17 +24,14 @@
7C0A7FC913A9E75400AFC2BD /* DirtyRegionTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FC613A9E75400AFC2BD /* DirtyRegionTracker.cpp */; };
7C0A7FCC13A9E76E00AFC2BD /* GUIWindowDebugInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FCA13A9E76E00AFC2BD /* GUIWindowDebugInfo.cpp */; };
7C89627013B702F3003631FE /* GUIWindowScreensaverDim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C89626E13B702F3003631FE /* GUIWindowScreensaverDim.cpp */; };
- 7C99B73F133D372300FC2B16 /* CacheCircular.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B73D133D372300FC2B16 /* CacheCircular.cpp */; };
7C99B7AA134072CD00FC2B16 /* GUIDialogPlayEject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B7A8134072CD00FC2B16 /* GUIDialogPlayEject.cpp */; };
7CCFD9AA1514952700211D82 /* PCMCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CCFD9A81514952700211D82 /* PCMCodec.cpp */; };
7CEE2E6D13D6B7A8000ABF2A /* TimeSmoother.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEE2E6B13D6B7A8000ABF2A /* TimeSmoother.cpp */; };
C807119F135DB842002F601B /* InputOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C807119D135DB842002F601B /* InputOperations.cpp */; };
C8EC5D51136954E400CCC10D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D4F136954E400CCC10D /* XBMC_keytable.cpp */; };
- DF0DF16C13A3AF82008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF16813A3AF82008ED511 /* FileNFS.cpp */; };
DF0DF16D13A3AF82008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */; };
DF34890913FD96390026A711 /* GUIAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF34890713FD96390026A711 /* GUIAction.cpp */; };
DF44852F140064F40069344B /* BXAcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF44852D140064F40069344B /* BXAcodec.cpp */; };
- DF4485341400651B0069344B /* FilePipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4485301400651B0069344B /* FilePipe.cpp */; };
DF4485351400651B0069344B /* PipesManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4485321400651B0069344B /* PipesManager.cpp */; };
DF4485381400654A0069344B /* AirTunesServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4485361400654A0069344B /* AirTunesServer.cpp */; };
DF527780151BAFD600B5B63B /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF527777151BAFD600B5B63B /* WebSocket.cpp */; };
@@ -44,7 +40,34 @@
DF527783151BAFD600B5B63B /* WebSocketV8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF52777D151BAFD600B5B63B /* WebSocketV8.cpp */; };
DF527788151BAFEE00B5B63B /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF527784151BAFEE00B5B63B /* Base64.cpp */; };
DF527789151BAFEE00B5B63B /* HttpResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF527786151BAFEE00B5B63B /* HttpResponse.cpp */; };
- DF673A251443769300A5A509 /* FileUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF673A231443769300A5A509 /* FileUPnP.cpp */; };
+ DF93D7701444B09C007C6459 /* AFPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7381444B09C007C6459 /* AFPFile.cpp */; };
+ DF93D7731444B09C007C6459 /* CDDAFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D73E1444B09C007C6459 /* CDDAFile.cpp */; };
+ DF93D7741444B09C007C6459 /* CurlFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7401444B09C007C6459 /* CurlFile.cpp */; };
+ DF93D7751444B09C007C6459 /* DAAPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7421444B09C007C6459 /* DAAPFile.cpp */; };
+ DF93D7761444B09C007C6459 /* DirectoryFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7441444B09C007C6459 /* DirectoryFactory.cpp */; };
+ DF93D7771444B09C007C6459 /* FileDirectoryFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7461444B09C007C6459 /* FileDirectoryFactory.cpp */; };
+ DF93D7781444B09C007C6459 /* FileReaderFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7481444B09C007C6459 /* FileReaderFile.cpp */; };
+ DF93D7791444B09C007C6459 /* HDFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D74A1444B09C007C6459 /* HDFile.cpp */; };
+ DF93D77A1444B09C007C6459 /* ISOFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D74C1444B09C007C6459 /* ISOFile.cpp */; };
+ DF93D77B1444B09C007C6459 /* LastFMFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D74E1444B09C007C6459 /* LastFMFile.cpp */; };
+ DF93D77C1444B09C007C6459 /* MusicDatabaseFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7501444B09C007C6459 /* MusicDatabaseFile.cpp */; };
+ DF93D77D1444B09C007C6459 /* NFSFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7521444B09C007C6459 /* NFSFile.cpp */; };
+ DF93D77E1444B09C007C6459 /* PipeFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7541444B09C007C6459 /* PipeFile.cpp */; };
+ DF93D77F1444B09C007C6459 /* RarFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7561444B09C007C6459 /* RarFile.cpp */; };
+ DF93D7801444B09C007C6459 /* RTVFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7581444B09C007C6459 /* RTVFile.cpp */; };
+ DF93D7811444B09C007C6459 /* SFTPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D75A1444B09C007C6459 /* SFTPFile.cpp */; };
+ DF93D7821444B09C007C6459 /* ShoutcastFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D75C1444B09C007C6459 /* ShoutcastFile.cpp */; };
+ DF93D7831444B09C007C6459 /* SlingboxDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D75E1444B09C007C6459 /* SlingboxDirectory.cpp */; };
+ DF93D7841444B09C007C6459 /* SlingboxFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7601444B09C007C6459 /* SlingboxFile.cpp */; };
+ DF93D7851444B09C007C6459 /* SmbFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7621444B09C007C6459 /* SmbFile.cpp */; };
+ DF93D7861444B09C007C6459 /* SpecialProtocolFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7641444B09C007C6459 /* SpecialProtocolFile.cpp */; };
+ DF93D7871444B09C007C6459 /* TuxBoxDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7661444B09C007C6459 /* TuxBoxDirectory.cpp */; };
+ DF93D7881444B09C007C6459 /* TuxBoxFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7681444B09C007C6459 /* TuxBoxFile.cpp */; };
+ DF93D7891444B09C007C6459 /* UDFFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D76A1444B09C007C6459 /* UDFFile.cpp */; };
+ DF93D78A1444B09C007C6459 /* UPnPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D76C1444B09C007C6459 /* UPnPFile.cpp */; };
+ DF93D78B1444B09C007C6459 /* ZipFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D76E1444B09C007C6459 /* ZipFile.cpp */; };
+ DF93D8331444B88B007C6459 /* HDHomeRunDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D82F1444B88B007C6459 /* HDHomeRunDirectory.cpp */; };
+ DF93D8341444B88B007C6459 /* HDHomeRunFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D8311444B88B007C6459 /* HDHomeRunFile.cpp */; };
DF98D9A81434F4B400A6EBE1 /* SkinVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF98D9A61434F4B400A6EBE1 /* SkinVariable.cpp */; };
DFA6BE8713FED2A10048CC11 /* AirPlayServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE8513FED2A10048CC11 /* AirPlayServer.cpp */; };
DFA6BE8A13FED2B40048CC11 /* HttpParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE8813FED2B40048CC11 /* HttpParser.cpp */; };
@@ -56,10 +79,13 @@
DFCA6B0F15224684000BFAAE /* HTTPWebinterfaceHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCA6B0615224684000BFAAE /* HTTPWebinterfaceHandler.cpp */; };
DFCA6B1015224684000BFAAE /* IHTTPRequestHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCA6B0815224684000BFAAE /* IHTTPRequestHandler.cpp */; };
DFCFC53D1413F7F70004D0BF /* AFPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCFC5391413F7F70004D0BF /* AFPDirectory.cpp */; };
- DFCFC53E1413F7F70004D0BF /* FileAFP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCFC53B1413F7F70004D0BF /* FileAFP.cpp */; };
DFD4D22013D7286E00A47C47 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D21413D7286E00A47C47 /* Implementation.cpp */; };
DFD4D22113D7286E00A47C47 /* README.platform in Resources */ = {isa = PBXBuildFile; fileRef = DFD4D21613D7286E00A47C47 /* README.platform */; };
DFD4D22213D7286E00A47C47 /* SystemClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D21C13D7286E00A47C47 /* SystemClock.cpp */; };
+ DFDB00491516408F005079A4 /* CircularCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDB00411516408F005079A4 /* CircularCache.cpp */; };
+ DFDB004A1516408F005079A4 /* DirectoryCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDB00431516408F005079A4 /* DirectoryCache.cpp */; };
+ DFDB004B1516408F005079A4 /* FileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDB00451516408F005079A4 /* FileCache.cpp */; };
+ DFDB004C1516408F005079A4 /* MemBufferCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDB00471516408F005079A4 /* MemBufferCache.cpp */; };
F54D9E8E12B71457006870F9 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F54D9E8D12B71457006870F9 /* CoreAudio.framework */; };
F56B15FB12CD6922009B4C96 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15FA12CD6922009B4C96 /* CoreVideo.framework */; };
F56B15FD12CD6930009B4C96 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15FC12CD6930009B4C96 /* AudioToolbox.framework */; };
@@ -301,45 +327,21 @@
F56C7971131EC154000AD0F6 /* ASAPFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C739F131EC151000AD0F6 /* ASAPFileDirectory.cpp */; };
F56C7972131EC154000AD0F6 /* MusicFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73A1131EC151000AD0F6 /* MusicFileDirectory.cpp */; };
F56C7973131EC154000AD0F6 /* MythSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73A3131EC151000AD0F6 /* MythSession.cpp */; };
- F56C7974131EC154000AD0F6 /* FileSmb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73A4131EC151000AD0F6 /* FileSmb.cpp */; };
F56C7975131EC154000AD0F6 /* SMBDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73A5131EC151000AD0F6 /* SMBDirectory.cpp */; };
F56C7976131EC154000AD0F6 /* MythDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73A6131EC151000AD0F6 /* MythDirectory.cpp */; };
F56C7977131EC154000AD0F6 /* MythFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73A8131EC151000AD0F6 /* MythFile.cpp */; };
- F56C7978131EC154000AD0F6 /* FileShoutcast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73AA131EC151000AD0F6 /* FileShoutcast.cpp */; };
- F56C7979131EC154000AD0F6 /* CacheMemBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73AB131EC151000AD0F6 /* CacheMemBuffer.cpp */; };
F56C797A131EC154000AD0F6 /* CacheStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73AD131EC151000AD0F6 /* CacheStrategy.cpp */; };
F56C797B131EC154000AD0F6 /* CDDADirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73AF131EC151000AD0F6 /* CDDADirectory.cpp */; };
F56C797C131EC154000AD0F6 /* DAAPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73B1131EC151000AD0F6 /* DAAPDirectory.cpp */; };
F56C797D131EC154000AD0F6 /* DAVDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73B3131EC151000AD0F6 /* DAVDirectory.cpp */; };
F56C797E131EC154000AD0F6 /* Directory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73B5131EC151000AD0F6 /* Directory.cpp */; };
- F56C797F131EC154000AD0F6 /* DirectoryCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73B7131EC151000AD0F6 /* DirectoryCache.cpp */; };
F56C7980131EC154000AD0F6 /* DirectoryHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73B9131EC151000AD0F6 /* DirectoryHistory.cpp */; };
- F56C7981131EC154000AD0F6 /* DirectoryTuxBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73BB131EC151000AD0F6 /* DirectoryTuxBox.cpp */; };
F56C7982131EC154000AD0F6 /* DllLibCurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73BD131EC151000AD0F6 /* DllLibCurl.cpp */; };
- F56C7983131EC154000AD0F6 /* FactoryDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73BF131EC151000AD0F6 /* FactoryDirectory.cpp */; };
- F56C7984131EC154000AD0F6 /* FactoryFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73C1131EC151000AD0F6 /* FactoryFileDirectory.cpp */; };
F56C7985131EC154000AD0F6 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73C3131EC151000AD0F6 /* File.cpp */; };
- F56C7986131EC154000AD0F6 /* FileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73C5131EC151000AD0F6 /* FileCache.cpp */; };
- F56C7987131EC154000AD0F6 /* FileCDDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73C7131EC151000AD0F6 /* FileCDDA.cpp */; };
- F56C7988131EC154000AD0F6 /* FileCurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73C9131EC151000AD0F6 /* FileCurl.cpp */; };
- F56C7989131EC154000AD0F6 /* FileDAAP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73CB131EC151000AD0F6 /* FileDAAP.cpp */; };
F56C798A131EC154000AD0F6 /* FileFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73CD131EC151000AD0F6 /* FileFactory.cpp */; };
- F56C798B131EC154000AD0F6 /* FileFileReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73CF131EC151000AD0F6 /* FileFileReader.cpp */; };
- F56C798C131EC154000AD0F6 /* FileHD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73D1131EC151000AD0F6 /* FileHD.cpp */; };
- F56C798D131EC154000AD0F6 /* FileISO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73D3131EC151000AD0F6 /* FileISO.cpp */; };
- F56C798E131EC154000AD0F6 /* FileLastFM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73D5131EC151000AD0F6 /* FileLastFM.cpp */; };
- F56C798F131EC154000AD0F6 /* FileMusicDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73D7131EC151000AD0F6 /* FileMusicDatabase.cpp */; };
- F56C7990131EC154000AD0F6 /* FileRar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73D9131EC151000AD0F6 /* FileRar.cpp */; };
- F56C7991131EC154000AD0F6 /* FileRTV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73DB131EC151000AD0F6 /* FileRTV.cpp */; };
- F56C7992131EC154000AD0F6 /* FileSFTP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73DD131EC151000AD0F6 /* FileSFTP.cpp */; };
- F56C7993131EC154000AD0F6 /* FileSpecialProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73E0131EC151000AD0F6 /* FileSpecialProtocol.cpp */; };
- F56C7994131EC154000AD0F6 /* FileTuxBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73E2131EC151000AD0F6 /* FileTuxBox.cpp */; };
- F56C7995131EC154000AD0F6 /* FileUDF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73E4131EC151000AD0F6 /* FileUDF.cpp */; };
- F56C7997131EC154000AD0F6 /* FileZip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73E8131EC151000AD0F6 /* FileZip.cpp */; };
F56C7998131EC154000AD0F6 /* FTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73EA131EC151000AD0F6 /* FTPDirectory.cpp */; };
F56C7999131EC154000AD0F6 /* FTPParse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73EC131EC151000AD0F6 /* FTPParse.cpp */; };
F56C799A131EC154000AD0F6 /* HDDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73EE131EC151000AD0F6 /* HDDirectory.cpp */; };
- F56C799B131EC154000AD0F6 /* HDHomeRun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73F0131EC151000AD0F6 /* HDHomeRun.cpp */; };
F56C799C131EC154000AD0F6 /* HTSPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73F3131EC151000AD0F6 /* HTSPDirectory.cpp */; };
F56C799D131EC154000AD0F6 /* HTSPSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73F5131EC151000AD0F6 /* HTSPSession.cpp */; };
F56C799E131EC154000AD0F6 /* HTTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C73F7131EC151000AD0F6 /* HTTPDirectory.cpp */; };
@@ -963,8 +965,6 @@
/* Begin PBXFileReference section */
1830215F13B8E35300770920 /* controledit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controledit.cpp; sourceTree = "<group>"; };
- 18404DF91396C43B00863BBA /* Slingbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Slingbox.cpp; sourceTree = "<group>"; };
- 18404DFA1396C43B00863BBA /* Slingbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Slingbox.h; sourceTree = "<group>"; };
18404DFC1396C44F00863BBA /* SlingboxLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = SlingboxLib.a; path = lib/SlingboxLib/SlingboxLib.a; sourceTree = "<group>"; };
1840B792139968DB007C848B /* JSONVariantParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONVariantParser.cpp; sourceTree = "<group>"; };
1840B793139968DB007C848B /* JSONVariantParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONVariantParser.h; sourceTree = "<group>"; };
@@ -998,8 +998,6 @@
7C0A7FCB13A9E76E00AFC2BD /* GUIWindowDebugInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowDebugInfo.h; sourceTree = "<group>"; };
7C89626E13B702F3003631FE /* GUIWindowScreensaverDim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowScreensaverDim.cpp; sourceTree = "<group>"; };
7C89626F13B702F3003631FE /* GUIWindowScreensaverDim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowScreensaverDim.h; sourceTree = "<group>"; };
- 7C99B73D133D372300FC2B16 /* CacheCircular.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheCircular.cpp; sourceTree = "<group>"; };
- 7C99B73E133D372300FC2B16 /* CacheCircular.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheCircular.h; sourceTree = "<group>"; };
7C99B7A8134072CD00FC2B16 /* GUIDialogPlayEject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPlayEject.cpp; sourceTree = "<group>"; };
7C99B7A9134072CD00FC2B16 /* GUIDialogPlayEject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPlayEject.h; sourceTree = "<group>"; };
7CCFD9A81514952700211D82 /* PCMCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCMCodec.cpp; sourceTree = "<group>"; };
@@ -1013,16 +1011,12 @@
C807119E135DB842002F601B /* InputOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputOperations.h; sourceTree = "<group>"; };
C8EC5D4F136954E400CCC10D /* XBMC_keytable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMC_keytable.cpp; sourceTree = "<group>"; };
C8EC5D50136954E400CCC10D /* XBMC_keytable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_keytable.h; sourceTree = "<group>"; };
- DF0DF16813A3AF82008ED511 /* FileNFS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileNFS.cpp; sourceTree = "<group>"; };
- DF0DF16913A3AF82008ED511 /* FileNFS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileNFS.h; sourceTree = "<group>"; };
DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSDirectory.cpp; sourceTree = "<group>"; };
DF0DF16B13A3AF82008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = "<group>"; };
DF34890713FD96390026A711 /* GUIAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIAction.cpp; sourceTree = "<group>"; };
DF34890813FD96390026A711 /* GUIAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIAction.h; sourceTree = "<group>"; };
DF44852D140064F40069344B /* BXAcodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BXAcodec.cpp; sourceTree = "<group>"; };
DF44852E140064F40069344B /* BXAcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BXAcodec.h; sourceTree = "<group>"; };
- DF4485301400651B0069344B /* FilePipe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilePipe.cpp; sourceTree = "<group>"; };
- DF4485311400651B0069344B /* FilePipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilePipe.h; sourceTree = "<group>"; };
DF4485321400651B0069344B /* PipesManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PipesManager.cpp; sourceTree = "<group>"; };
DF4485331400651B0069344B /* PipesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipesManager.h; sourceTree = "<group>"; };
DF4485361400654A0069344B /* AirTunesServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirTunesServer.cpp; sourceTree = "<group>"; };
@@ -1039,8 +1033,62 @@
DF527785151BAFEE00B5B63B /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
DF527786151BAFEE00B5B63B /* HttpResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpResponse.cpp; sourceTree = "<group>"; };
DF527787151BAFEE00B5B63B /* HttpResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpResponse.h; sourceTree = "<group>"; };
- DF673A231443769300A5A509 /* FileUPnP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUPnP.cpp; sourceTree = "<group>"; };
- DF673A241443769300A5A509 /* FileUPnP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUPnP.h; sourceTree = "<group>"; };
+ DF93D7381444B09C007C6459 /* AFPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AFPFile.cpp; sourceTree = "<group>"; };
+ DF93D7391444B09C007C6459 /* AFPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFPFile.h; sourceTree = "<group>"; };
+ DF93D73E1444B09C007C6459 /* CDDAFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDDAFile.cpp; sourceTree = "<group>"; };
+ DF93D73F1444B09C007C6459 /* CDDAFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDDAFile.h; sourceTree = "<group>"; };
+ DF93D7401444B09C007C6459 /* CurlFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CurlFile.cpp; sourceTree = "<group>"; };
+ DF93D7411444B09C007C6459 /* CurlFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurlFile.h; sourceTree = "<group>"; };
+ DF93D7421444B09C007C6459 /* DAAPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DAAPFile.cpp; sourceTree = "<group>"; };
+ DF93D7431444B09C007C6459 /* DAAPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DAAPFile.h; sourceTree = "<group>"; };
+ DF93D7441444B09C007C6459 /* DirectoryFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryFactory.cpp; sourceTree = "<group>"; };
+ DF93D7451444B09C007C6459 /* DirectoryFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryFactory.h; sourceTree = "<group>"; };
+ DF93D7461444B09C007C6459 /* FileDirectoryFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileDirectoryFactory.cpp; sourceTree = "<group>"; };
+ DF93D7471444B09C007C6459 /* FileDirectoryFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileDirectoryFactory.h; sourceTree = "<group>"; };
+ DF93D7481444B09C007C6459 /* FileReaderFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileReaderFile.cpp; sourceTree = "<group>"; };
+ DF93D7491444B09C007C6459 /* FileReaderFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileReaderFile.h; sourceTree = "<group>"; };
+ DF93D74A1444B09C007C6459 /* HDFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDFile.cpp; sourceTree = "<group>"; };
+ DF93D74B1444B09C007C6459 /* HDFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDFile.h; sourceTree = "<group>"; };
+ DF93D74C1444B09C007C6459 /* ISOFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ISOFile.cpp; sourceTree = "<group>"; };
+ DF93D74D1444B09C007C6459 /* ISOFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISOFile.h; sourceTree = "<group>"; };
+ DF93D74E1444B09C007C6459 /* LastFMFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LastFMFile.cpp; sourceTree = "<group>"; };
+ DF93D74F1444B09C007C6459 /* LastFMFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LastFMFile.h; sourceTree = "<group>"; };
+ DF93D7501444B09C007C6459 /* MusicDatabaseFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicDatabaseFile.cpp; sourceTree = "<group>"; };
+ DF93D7511444B09C007C6459 /* MusicDatabaseFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicDatabaseFile.h; sourceTree = "<group>"; };
+ DF93D7521444B09C007C6459 /* NFSFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSFile.cpp; sourceTree = "<group>"; };
+ DF93D7531444B09C007C6459 /* NFSFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSFile.h; sourceTree = "<group>"; };
+ DF93D7541444B09C007C6459 /* PipeFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PipeFile.cpp; sourceTree = "<group>"; };
+ DF93D7551444B09C007C6459 /* PipeFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipeFile.h; sourceTree = "<group>"; };
+ DF93D7561444B09C007C6459 /* RarFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RarFile.cpp; sourceTree = "<group>"; };
+ DF93D7571444B09C007C6459 /* RarFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RarFile.h; sourceTree = "<group>"; };
+ DF93D7581444B09C007C6459 /* RTVFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTVFile.cpp; sourceTree = "<group>"; };
+ DF93D7591444B09C007C6459 /* RTVFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTVFile.h; sourceTree = "<group>"; };
+ DF93D75A1444B09C007C6459 /* SFTPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SFTPFile.cpp; sourceTree = "<group>"; };
+ DF93D75B1444B09C007C6459 /* SFTPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFTPFile.h; sourceTree = "<group>"; };
+ DF93D75C1444B09C007C6459 /* ShoutcastFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShoutcastFile.cpp; sourceTree = "<group>"; };
+ DF93D75D1444B09C007C6459 /* ShoutcastFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoutcastFile.h; sourceTree = "<group>"; };
+ DF93D75E1444B09C007C6459 /* SlingboxDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SlingboxDirectory.cpp; sourceTree = "<group>"; };
+ DF93D75F1444B09C007C6459 /* SlingboxDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlingboxDirectory.h; sourceTree = "<group>"; };
+ DF93D7601444B09C007C6459 /* SlingboxFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SlingboxFile.cpp; sourceTree = "<group>"; };
+ DF93D7611444B09C007C6459 /* SlingboxFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlingboxFile.h; sourceTree = "<group>"; };
+ DF93D7621444B09C007C6459 /* SmbFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmbFile.cpp; sourceTree = "<group>"; };
+ DF93D7631444B09C007C6459 /* SmbFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmbFile.h; sourceTree = "<group>"; };
+ DF93D7641444B09C007C6459 /* SpecialProtocolFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpecialProtocolFile.cpp; sourceTree = "<group>"; };
+ DF93D7651444B09C007C6459 /* SpecialProtocolFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpecialProtocolFile.h; sourceTree = "<group>"; };
+ DF93D7661444B09C007C6459 /* TuxBoxDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuxBoxDirectory.cpp; sourceTree = "<group>"; };
+ DF93D7671444B09C007C6459 /* TuxBoxDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TuxBoxDirectory.h; sourceTree = "<group>"; };
+ DF93D7681444B09C007C6459 /* TuxBoxFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuxBoxFile.cpp; sourceTree = "<group>"; };
+ DF93D7691444B09C007C6459 /* TuxBoxFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TuxBoxFile.h; sourceTree = "<group>"; };
+ DF93D76A1444B09C007C6459 /* UDFFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UDFFile.cpp; sourceTree = "<group>"; };
+ DF93D76B1444B09C007C6459 /* UDFFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UDFFile.h; sourceTree = "<group>"; };
+ DF93D76C1444B09C007C6459 /* UPnPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnPFile.cpp; sourceTree = "<group>"; };
+ DF93D76D1444B09C007C6459 /* UPnPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPFile.h; sourceTree = "<group>"; };
+ DF93D76E1444B09C007C6459 /* ZipFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZipFile.cpp; sourceTree = "<group>"; };
+ DF93D76F1444B09C007C6459 /* ZipFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipFile.h; sourceTree = "<group>"; };
+ DF93D82F1444B88B007C6459 /* HDHomeRunDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDHomeRunDirectory.cpp; sourceTree = "<group>"; };
+ DF93D8301444B88B007C6459 /* HDHomeRunDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDHomeRunDirectory.h; sourceTree = "<group>"; };
+ DF93D8311444B88B007C6459 /* HDHomeRunFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDHomeRunFile.cpp; sourceTree = "<group>"; };
+ DF93D8321444B88B007C6459 /* HDHomeRunFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDHomeRunFile.h; sourceTree = "<group>"; };
DF98D9A61434F4B400A6EBE1 /* SkinVariable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkinVariable.cpp; sourceTree = "<group>"; };
DF98D9A71434F4B400A6EBE1 /* SkinVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkinVariable.h; sourceTree = "<group>"; };
DFA6BE8513FED2A10048CC11 /* AirPlayServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirPlayServer.cpp; sourceTree = "<group>"; };
@@ -1063,8 +1111,6 @@
DFCA6B0915224684000BFAAE /* IHTTPRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IHTTPRequestHandler.h; sourceTree = "<group>"; };
DFCFC5391413F7F70004D0BF /* AFPDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AFPDirectory.cpp; sourceTree = "<group>"; };
DFCFC53A1413F7F70004D0BF /* AFPDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFPDirectory.h; sourceTree = "<group>"; };
- DFCFC53B1413F7F70004D0BF /* FileAFP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileAFP.cpp; sourceTree = "<group>"; };
- DFCFC53C1413F7F70004D0BF /* FileAFP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileAFP.h; sourceTree = "<group>"; };
DFD4D20D13D7286E00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
DFD4D20E13D7286E00A47C47 /* CriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CriticalSection.h; sourceTree = "<group>"; };
DFD4D21213D7286E00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
@@ -1075,6 +1121,14 @@
DFD4D21713D7286E00A47C47 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
DFD4D21C13D7286E00A47C47 /* SystemClock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemClock.cpp; sourceTree = "<group>"; };
DFD4D21D13D7286E00A47C47 /* SystemClock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemClock.h; sourceTree = "<group>"; };
+ DFDB00411516408F005079A4 /* CircularCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CircularCache.cpp; sourceTree = "<group>"; };
+ DFDB00421516408F005079A4 /* CircularCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularCache.h; sourceTree = "<group>"; };
+ DFDB00431516408F005079A4 /* DirectoryCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryCache.cpp; sourceTree = "<group>"; };
+ DFDB00441516408F005079A4 /* DirectoryCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryCache.h; sourceTree = "<group>"; };
+ DFDB00451516408F005079A4 /* FileCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCache.cpp; sourceTree = "<group>"; };
+ DFDB00461516408F005079A4 /* FileCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCache.h; sourceTree = "<group>"; };
+ DFDB00471516408F005079A4 /* MemBufferCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemBufferCache.cpp; sourceTree = "<group>"; };
+ DFDB00481516408F005079A4 /* MemBufferCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemBufferCache.h; sourceTree = "<group>"; };
F54D9E8D12B71457006870F9 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
F558F66813AFE7F300631E12 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
F558F66E13AFE81500631E12 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
@@ -1653,15 +1707,11 @@
F56C73A1131EC151000AD0F6 /* MusicFileDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicFileDirectory.cpp; sourceTree = "<group>"; };
F56C73A2131EC151000AD0F6 /* MusicFileDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicFileDirectory.h; sourceTree = "<group>"; };
F56C73A3131EC151000AD0F6 /* MythSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MythSession.cpp; sourceTree = "<group>"; };
- F56C73A4131EC151000AD0F6 /* FileSmb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSmb.cpp; sourceTree = "<group>"; };
F56C73A5131EC151000AD0F6 /* SMBDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SMBDirectory.cpp; sourceTree = "<group>"; };
F56C73A6131EC151000AD0F6 /* MythDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MythDirectory.cpp; sourceTree = "<group>"; };
F56C73A7131EC151000AD0F6 /* MythDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MythDirectory.h; sourceTree = "<group>"; };
F56C73A8131EC151000AD0F6 /* MythFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MythFile.cpp; sourceTree = "<group>"; };
F56C73A9131EC151000AD0F6 /* MythFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MythFile.h; sourceTree = "<group>"; };
- F56C73AA131EC151000AD0F6 /* FileShoutcast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileShoutcast.cpp; sourceTree = "<group>"; };
- F56C73AB131EC151000AD0F6 /* CacheMemBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheMemBuffer.cpp; sourceTree = "<group>"; };
- F56C73AC131EC151000AD0F6 /* CacheMemBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheMemBuffer.h; sourceTree = "<group>"; };
F56C73AD131EC151000AD0F6 /* CacheStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheStrategy.cpp; sourceTree = "<group>"; };
F56C73AE131EC151000AD0F6 /* CacheStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheStrategy.h; sourceTree = "<group>"; };
F56C73AF131EC151000AD0F6 /* CDDADirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDDADirectory.cpp; sourceTree = "<group>"; };
@@ -1672,63 +1722,20 @@
F56C73B4131EC151000AD0F6 /* DAVDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DAVDirectory.h; sourceTree = "<group>"; };
F56C73B5131EC151000AD0F6 /* Directory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Directory.cpp; sourceTree = "<group>"; };
F56C73B6131EC151000AD0F6 /* Directory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Directory.h; sourceTree = "<group>"; };
- F56C73B7131EC151000AD0F6 /* DirectoryCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryCache.cpp; sourceTree = "<group>"; };
- F56C73B8131EC151000AD0F6 /* DirectoryCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryCache.h; sourceTree = "<group>"; };
F56C73B9131EC151000AD0F6 /* DirectoryHistory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryHistory.cpp; sourceTree = "<group>"; };
F56C73BA131EC151000AD0F6 /* DirectoryHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryHistory.h; sourceTree = "<group>"; };
- F56C73BB131EC151000AD0F6 /* DirectoryTuxBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryTuxBox.cpp; sourceTree = "<group>"; };
- F56C73BC131EC151000AD0F6 /* DirectoryTuxBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryTuxBox.h; sourceTree = "<group>"; };
F56C73BD131EC151000AD0F6 /* DllLibCurl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DllLibCurl.cpp; sourceTree = "<group>"; };
F56C73BE131EC151000AD0F6 /* DllLibCurl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibCurl.h; sourceTree = "<group>"; };
- F56C73BF131EC151000AD0F6 /* FactoryDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FactoryDirectory.cpp; sourceTree = "<group>"; };
- F56C73C0131EC151000AD0F6 /* FactoryDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FactoryDirectory.h; sourceTree = "<group>"; };
- F56C73C1131EC151000AD0F6 /* FactoryFileDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FactoryFileDirectory.cpp; sourceTree = "<group>"; };
- F56C73C2131EC151000AD0F6 /* FactoryFileDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FactoryFileDirectory.h; sourceTree = "<group>"; };
F56C73C3131EC151000AD0F6 /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = "<group>"; };
F56C73C4131EC151000AD0F6 /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
- F56C73C5131EC151000AD0F6 /* FileCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCache.cpp; sourceTree = "<group>"; };
- F56C73C6131EC151000AD0F6 /* FileCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCache.h; sourceTree = "<group>"; };
- F56C73C7131EC151000AD0F6 /* FileCDDA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCDDA.cpp; sourceTree = "<group>"; };
- F56C73C8131EC151000AD0F6 /* FileCDDA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCDDA.h; sourceTree = "<group>"; };
- F56C73C9131EC151000AD0F6 /* FileCurl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCurl.cpp; sourceTree = "<group>"; };
- F56C73CA131EC151000AD0F6 /* FileCurl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCurl.h; sourceTree = "<group>"; };
- F56C73CB131EC151000AD0F6 /* FileDAAP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileDAAP.cpp; sourceTree = "<group>"; };
- F56C73CC131EC151000AD0F6 /* FileDAAP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileDAAP.h; sourceTree = "<group>"; };
F56C73CD131EC151000AD0F6 /* FileFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileFactory.cpp; sourceTree = "<group>"; };
F56C73CE131EC151000AD0F6 /* FileFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileFactory.h; sourceTree = "<group>"; };
- F56C73CF131EC151000AD0F6 /* FileFileReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileFileReader.cpp; sourceTree = "<group>"; };
- F56C73D0131EC151000AD0F6 /* FileFileReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileFileReader.h; sourceTree = "<group>"; };
- F56C73D1131EC151000AD0F6 /* FileHD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileHD.cpp; sourceTree = "<group>"; };
- F56C73D2131EC151000AD0F6 /* FileHD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileHD.h; sourceTree = "<group>"; };
- F56C73D3131EC151000AD0F6 /* FileISO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileISO.cpp; sourceTree = "<group>"; };
- F56C73D4131EC151000AD0F6 /* FileISO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileISO.h; sourceTree = "<group>"; };
- F56C73D5131EC151000AD0F6 /* FileLastFM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileLastFM.cpp; sourceTree = "<group>"; };
- F56C73D6131EC151000AD0F6 /* FileLastFM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileLastFM.h; sourceTree = "<group>"; };
- F56C73D7131EC151000AD0F6 /* FileMusicDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileMusicDatabase.cpp; sourceTree = "<group>"; };
- F56C73D8131EC151000AD0F6 /* FileMusicDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileMusicDatabase.h; sourceTree = "<group>"; };
- F56C73D9131EC151000AD0F6 /* FileRar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileRar.cpp; sourceTree = "<group>"; };
- F56C73DA131EC151000AD0F6 /* FileRar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileRar.h; sourceTree = "<group>"; };
- F56C73DB131EC151000AD0F6 /* FileRTV.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileRTV.cpp; sourceTree = "<group>"; };
- F56C73DC131EC151000AD0F6 /* FileRTV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileRTV.h; sourceTree = "<group>"; };
- F56C73DD131EC151000AD0F6 /* FileSFTP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSFTP.cpp; sourceTree = "<group>"; };
- F56C73DE131EC151000AD0F6 /* FileSFTP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSFTP.h; sourceTree = "<group>"; };
- F56C73DF131EC151000AD0F6 /* FileSmb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSmb.h; sourceTree = "<group>"; };
- F56C73E0131EC151000AD0F6 /* FileSpecialProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSpecialProtocol.cpp; sourceTree = "<group>"; };
- F56C73E1131EC151000AD0F6 /* FileSpecialProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSpecialProtocol.h; sourceTree = "<group>"; };
- F56C73E2131EC151000AD0F6 /* FileTuxBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileTuxBox.cpp; sourceTree = "<group>"; };
- F56C73E3131EC151000AD0F6 /* FileTuxBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileTuxBox.h; sourceTree = "<group>"; };
- F56C73E4131EC151000AD0F6 /* FileUDF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUDF.cpp; sourceTree = "<group>"; };
- F56C73E5131EC151000AD0F6 /* FileUDF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUDF.h; sourceTree = "<group>"; };
- F56C73E8131EC151000AD0F6 /* FileZip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileZip.cpp; sourceTree = "<group>"; };
- F56C73E9131EC151000AD0F6 /* FileZip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileZip.h; sourceTree = "<group>"; };
F56C73EA131EC151000AD0F6 /* FTPDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FTPDirectory.cpp; sourceTree = "<group>"; };
F56C73EB131EC151000AD0F6 /* FTPDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTPDirectory.h; sourceTree = "<group>"; };
F56C73EC131EC151000AD0F6 /* FTPParse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FTPParse.cpp; sourceTree = "<group>"; };
F56C73ED131EC151000AD0F6 /* FTPParse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTPParse.h; sourceTree = "<group>"; };
F56C73EE131EC151000AD0F6 /* HDDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDDirectory.cpp; sourceTree = "<group>"; };
F56C73EF131EC151000AD0F6 /* HDDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDDirectory.h; sourceTree = "<group>"; };
- F56C73F0131EC151000AD0F6 /* HDHomeRun.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDHomeRun.cpp; sourceTree = "<group>"; };
- F56C73F1131EC151000AD0F6 /* HDHomeRun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDHomeRun.h; sourceTree = "<group>"; };
F56C73F2131EC151000AD0F6 /* HTSPDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTSPDirectory.h; sourceTree = "<group>"; };
F56C73F3131EC151000AD0F6 /* HTSPDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTSPDirectory.cpp; sourceTree = "<group>"; };
F56C73F4131EC151000AD0F6 /* HTSPSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTSPSession.h; sourceTree = "<group>"; };
@@ -4113,89 +4120,58 @@
F56C739D131EC151000AD0F6 /* AddonsDirectory.h */,
DFCFC5391413F7F70004D0BF /* AFPDirectory.cpp */,
DFCFC53A1413F7F70004D0BF /* AFPDirectory.h */,
+ DF93D7381444B09C007C6459 /* AFPFile.cpp */,
+ DF93D7391444B09C007C6459 /* AFPFile.h */,
F56C739F131EC151000AD0F6 /* ASAPFileDirectory.cpp */,
F56C73A0131EC151000AD0F6 /* ASAPFileDirectory.h */,
- 7C99B73D133D372300FC2B16 /* CacheCircular.cpp */,
- 7C99B73E133D372300FC2B16 /* CacheCircular.h */,
- F56C73AB131EC151000AD0F6 /* CacheMemBuffer.cpp */,
- F56C73AC131EC151000AD0F6 /* CacheMemBuffer.h */,
F56C73AD131EC151000AD0F6 /* CacheStrategy.cpp */,
F56C73AE131EC151000AD0F6 /* CacheStrategy.h */,
F56C73AF131EC151000AD0F6 /* CDDADirectory.cpp */,
F56C73B0131EC151000AD0F6 /* CDDADirectory.h */,
+ DF93D73E1444B09C007C6459 /* CDDAFile.cpp */,
+ DF93D73F1444B09C007C6459 /* CDDAFile.h */,
+ DFDB00411516408F005079A4 /* CircularCache.cpp */,
+ DFDB00421516408F005079A4 /* CircularCache.h */,
+ DF93D7401444B09C007C6459 /* CurlFile.cpp */,
+ DF93D7411444B09C007C6459 /* CurlFile.h */,
F56C73B1131EC151000AD0F6 /* DAAPDirectory.cpp */,
F56C73B2131EC151000AD0F6 /* DAAPDirectory.h */,
+ DF93D7421444B09C007C6459 /* DAAPFile.cpp */,
+ DF93D7431444B09C007C6459 /* DAAPFile.h */,
F56C73B3131EC151000AD0F6 /* DAVDirectory.cpp */,
F56C73B4131EC151000AD0F6 /* DAVDirectory.h */,
F56C73B5131EC151000AD0F6 /* Directory.cpp */,
F56C73B6131EC151000AD0F6 /* Directory.h */,
- F56C73B7131EC151000AD0F6 /* DirectoryCache.cpp */,
- F56C73B8131EC151000AD0F6 /* DirectoryCache.h */,
+ DFDB00431516408F005079A4 /* DirectoryCache.cpp */,
+ DFDB00441516408F005079A4 /* DirectoryCache.h */,
+ DF93D7441444B09C007C6459 /* DirectoryFactory.cpp */,
+ DF93D7451444B09C007C6459 /* DirectoryFactory.h */,
F56C73B9131EC151000AD0F6 /* DirectoryHistory.cpp */,
F56C73BA131EC151000AD0F6 /* DirectoryHistory.h */,
- F56C73BB131EC151000AD0F6 /* DirectoryTuxBox.cpp */,
- F56C73BC131EC151000AD0F6 /* DirectoryTuxBox.h */,
F56C73BD131EC151000AD0F6 /* DllLibCurl.cpp */,
F56C73BE131EC151000AD0F6 /* DllLibCurl.h */,
- F56C73BF131EC151000AD0F6 /* FactoryDirectory.cpp */,
- F56C73C0131EC151000AD0F6 /* FactoryDirectory.h */,
- F56C73C1131EC151000AD0F6 /* FactoryFileDirectory.cpp */,
- F56C73C2131EC151000AD0F6 /* FactoryFileDirectory.h */,
F56C73C3131EC151000AD0F6 /* File.cpp */,
F56C73C4131EC151000AD0F6 /* File.h */,
- DFCFC53B1413F7F70004D0BF /* FileAFP.cpp */,
- DFCFC53C1413F7F70004D0BF /* FileAFP.h */,
- F56C73C5131EC151000AD0F6 /* FileCache.cpp */,
- F56C73C6131EC151000AD0F6 /* FileCache.h */,
- F56C73C7131EC151000AD0F6 /* FileCDDA.cpp */,
- F56C73C8131EC151000AD0F6 /* FileCDDA.h */,
- F56C73C9131EC151000AD0F6 /* FileCurl.cpp */,
- F56C73CA131EC151000AD0F6 /* FileCurl.h */,
- F56C73CB131EC151000AD0F6 /* FileDAAP.cpp */,
- F56C73CC131EC151000AD0F6 /* FileDAAP.h */,
+ DFDB00451516408F005079A4 /* FileCache.cpp */,
+ DFDB00461516408F005079A4 /* FileCache.h */,
+ DF93D7461444B09C007C6459 /* FileDirectoryFactory.cpp */,
+ DF93D7471444B09C007C6459 /* FileDirectoryFactory.h */,
F56C73CD131EC151000AD0F6 /* FileFactory.cpp */,
F56C73CE131EC151000AD0F6 /* FileFactory.h */,
- F56C73CF131EC151000AD0F6 /* FileFileReader.cpp */,
- F56C73D0131EC151000AD0F6 /* FileFileReader.h */,
- F56C73D1131EC151000AD0F6 /* FileHD.cpp */,
- F56C73D2131EC151000AD0F6 /* FileHD.h */,
- F56C73D3131EC151000AD0F6 /* FileISO.cpp */,
- F56C73D4131EC151000AD0F6 /* FileISO.h */,
- F56C73D5131EC151000AD0F6 /* FileLastFM.cpp */,
- F56C73D6131EC151000AD0F6 /* FileLastFM.h */,
- F56C73D7131EC151000AD0F6 /* FileMusicDatabase.cpp */,
- F56C73D8131EC151000AD0F6 /* FileMusicDatabase.h */,
- DF0DF16813A3AF82008ED511 /* FileNFS.cpp */,
- DF0DF16913A3AF82008ED511 /* FileNFS.h */,
- DF4485301400651B0069344B /* FilePipe.cpp */,
- DF4485311400651B0069344B /* FilePipe.h */,
- F56C73D9131EC151000AD0F6 /* FileRar.cpp */,
- F56C73DA131EC151000AD0F6 /* FileRar.h */,
- F56C73DB131EC151000AD0F6 /* FileRTV.cpp */,
- F56C73DC131EC151000AD0F6 /* FileRTV.h */,
- F56C73DD131EC151000AD0F6 /* FileSFTP.cpp */,
- F56C73DE131EC151000AD0F6 /* FileSFTP.h */,
- F56C73AA131EC151000AD0F6 /* FileShoutcast.cpp */,
- F56C73A4131EC151000AD0F6 /* FileSmb.cpp */,
- F56C73DF131EC151000AD0F6 /* FileSmb.h */,
- F56C73E0131EC151000AD0F6 /* FileSpecialProtocol.cpp */,
- F56C73E1131EC151000AD0F6 /* FileSpecialProtocol.h */,
- F56C73E2131EC151000AD0F6 /* FileTuxBox.cpp */,
- F56C73E3131EC151000AD0F6 /* FileTuxBox.h */,
- F56C73E4131EC151000AD0F6 /* FileUDF.cpp */,
- F56C73E5131EC151000AD0F6 /* FileUDF.h */,
- DF673A231443769300A5A509 /* FileUPnP.cpp */,
- DF673A241443769300A5A509 /* FileUPnP.h */,
- F56C73E8131EC151000AD0F6 /* FileZip.cpp */,
- F56C73E9131EC151000AD0F6 /* FileZip.h */,
+ DF93D7481444B09C007C6459 /* FileReaderFile.cpp */,
+ DF93D7491444B09C007C6459 /* FileReaderFile.h */,
F56C73EA131EC151000AD0F6 /* FTPDirectory.cpp */,
F56C73EB131EC151000AD0F6 /* FTPDirectory.h */,
F56C73EC131EC151000AD0F6 /* FTPParse.cpp */,
F56C73ED131EC151000AD0F6 /* FTPParse.h */,
F56C73EE131EC151000AD0F6 /* HDDirectory.cpp */,
F56C73EF131EC151000AD0F6 /* HDDirectory.h */,
- F56C73F0131EC151000AD0F6 /* HDHomeRun.cpp */,
- F56C73F1131EC151000AD0F6 /* HDHomeRun.h */,
+ DF93D74A1444B09C007C6459 /* HDFile.cpp */,
+ DF93D74B1444B09C007C6459 /* HDFile.h */,
+ DF93D82F1444B88B007C6459 /* HDHomeRunDirectory.cpp */,
+ DF93D8301444B88B007C6459 /* HDHomeRunDirectory.h */,
+ DF93D8311444B88B007C6459 /* HDHomeRunFile.cpp */,
+ DF93D8321444B88B007C6459 /* HDHomeRunFile.h */,
F56C73F3131EC151000AD0F6 /* HTSPDirectory.cpp */,
F56C73F2131EC151000AD0F6 /* HTSPDirectory.h */,
F56C73F5131EC151000AD0F6 /* HTSPSession.cpp */,
@@ -4211,14 +4187,22 @@
F56C73FE131EC151000AD0F6 /* iso9660.h */,
F56C73FF131EC151000AD0F6 /* ISO9660Directory.cpp */,
F56C7400131EC151000AD0F6 /* ISO9660Directory.h */,
+ DF93D74C1444B09C007C6459 /* ISOFile.cpp */,
+ DF93D74D1444B09C007C6459 /* ISOFile.h */,
F56C7401131EC151000AD0F6 /* LastFMDirectory.cpp */,
F56C7402131EC151000AD0F6 /* LastFMDirectory.h */,
+ DF93D74E1444B09C007C6459 /* LastFMFile.cpp */,
+ DF93D74F1444B09C007C6459 /* LastFMFile.h */,
+ DFDB00471516408F005079A4 /* MemBufferCache.cpp */,
+ DFDB00481516408F005079A4 /* MemBufferCache.h */,
F56C7403131EC151000AD0F6 /* MultiPathDirectory.cpp */,
F56C7404131EC152000AD0F6 /* MultiPathDirectory.h */,
F56C7405131EC152000AD0F6 /* MultiPathFile.cpp */,
F56C7406131EC152000AD0F6 /* MultiPathFile.h */,
F56C7434131EC152000AD0F6 /* MusicDatabaseDirectory.cpp */,
F56C7435131EC152000AD0F6 /* MusicDatabaseDirectory.h */,
+ DF93D7501444B09C007C6459 /* MusicDatabaseFile.cpp */,
+ DF93D7511444B09C007C6459 /* MusicDatabaseFile.h */,
F56C73A1131EC151000AD0F6 /* MusicFileDirectory.cpp */,
F56C73A2131EC151000AD0F6 /* MusicFileDirectory.h */,
F56C7436131EC152000AD0F6 /* MusicSearchDirectory.cpp */,
@@ -4230,11 +4214,15 @@
F56C73A3131EC151000AD0F6 /* MythSession.cpp */,
DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */,
DF0DF16B13A3AF82008ED511 /* NFSDirectory.h */,
+ DF93D7521444B09C007C6459 /* NFSFile.cpp */,
+ DF93D7531444B09C007C6459 /* NFSFile.h */,
F56C739A131EC151000AD0F6 /* NptXbmcFile.cpp */,
F56C7438131EC152000AD0F6 /* NSFFileDirectory.cpp */,
F56C7439131EC152000AD0F6 /* NSFFileDirectory.h */,
F56C743A131EC152000AD0F6 /* OGGFileDirectory.cpp */,
F56C743B131EC152000AD0F6 /* OGGFileDirectory.h */,
+ DF93D7541444B09C007C6459 /* PipeFile.cpp */,
+ DF93D7551444B09C007C6459 /* PipeFile.h */,
DF4485321400651B0069344B /* PipesManager.cpp */,
DF4485331400651B0069344B /* PipesManager.h */,
F56C743C131EC152000AD0F6 /* PlaylistDirectory.cpp */,
@@ -4245,40 +4233,62 @@
F56C7441131EC152000AD0F6 /* PluginDirectory.h */,
F56C7442131EC152000AD0F6 /* RarDirectory.cpp */,
F56C7443131EC152000AD0F6 /* RarDirectory.h */,
+ DF93D7561444B09C007C6459 /* RarFile.cpp */,
+ DF93D7571444B09C007C6459 /* RarFile.h */,
F56C7444131EC152000AD0F6 /* RarManager.cpp */,
F56C7445131EC152000AD0F6 /* RarManager.h */,
F56C739B131EC151000AD0F6 /* RSSDirectory.cpp */,
F56C739C131EC151000AD0F6 /* RSSDirectory.h */,
F56C7446131EC152000AD0F6 /* RTVDirectory.cpp */,
F56C7447131EC152000AD0F6 /* RTVDirectory.h */,
+ DF93D7581444B09C007C6459 /* RTVFile.cpp */,
+ DF93D7591444B09C007C6459 /* RTVFile.h */,
F56C7449131EC152000AD0F6 /* SAPDirectory.cpp */,
F56C7448131EC152000AD0F6 /* SAPDirectory.h */,
F56C744B131EC152000AD0F6 /* SAPFile.cpp */,
F56C744A131EC152000AD0F6 /* SAPFile.h */,
F56C744C131EC152000AD0F6 /* SFTPDirectory.cpp */,
F56C744D131EC152000AD0F6 /* SFTPDirectory.h */,
+ DF93D75A1444B09C007C6459 /* SFTPFile.cpp */,
+ DF93D75B1444B09C007C6459 /* SFTPFile.h */,
+ DF93D75C1444B09C007C6459 /* ShoutcastFile.cpp */,
+ DF93D75D1444B09C007C6459 /* ShoutcastFile.h */,
F56C744E131EC152000AD0F6 /* SIDFileDirectory.cpp */,
F56C744F131EC152000AD0F6 /* SIDFileDirectory.h */,
- 18404DF91396C43B00863BBA /* Slingbox.cpp */,
- 18404DFA1396C43B00863BBA /* Slingbox.h */,
+ DF93D75E1444B09C007C6459 /* SlingboxDirectory.cpp */,
+ DF93D75F1444B09C007C6459 /* SlingboxDirectory.h */,
+ DF93D7601444B09C007C6459 /* SlingboxFile.cpp */,
+ DF93D7611444B09C007C6459 /* SlingboxFile.h */,
F56C7450131EC152000AD0F6 /* SmartPlaylistDirectory.cpp */,
F56C7451131EC152000AD0F6 /* SmartPlaylistDirectory.h */,
F56C73A5131EC151000AD0F6 /* SMBDirectory.cpp */,
F56C7452131EC152000AD0F6 /* SMBDirectory.h */,
+ DF93D7621444B09C007C6459 /* SmbFile.cpp */,
+ DF93D7631444B09C007C6459 /* SmbFile.h */,
F57A1DBB1329FB0A00498CC7 /* SourcesDirectory.cpp */,
F57A1DBC1329FB0A00498CC7 /* SourcesDirectory.h */,
F56C7396131EC151000AD0F6 /* SpecialProtocol.cpp */,
F56C7397131EC151000AD0F6 /* SpecialProtocol.h */,
F56C7398131EC151000AD0F6 /* SpecialProtocolDirectory.cpp */,
F56C7399131EC151000AD0F6 /* SpecialProtocolDirectory.h */,
+ DF93D7641444B09C007C6459 /* SpecialProtocolFile.cpp */,
+ DF93D7651444B09C007C6459 /* SpecialProtocolFile.h */,
F56C7453131EC152000AD0F6 /* StackDirectory.cpp */,
F56C7454131EC152000AD0F6 /* StackDirectory.h */,
+ DF93D7661444B09C007C6459 /* TuxBoxDirectory.cpp */,
+ DF93D7671444B09C007C6459 /* TuxBoxDirectory.h */,
+ DF93D7681444B09C007C6459 /* TuxBoxFile.cpp */,
+ DF93D7691444B09C007C6459 /* TuxBoxFile.h */,
F56C7455131EC152000AD0F6 /* udf25.cpp */,
F56C7456131EC152000AD0F6 /* udf25.h */,
F56C7457131EC152000AD0F6 /* UDFDirectory.cpp */,
F56C7458131EC152000AD0F6 /* UDFDirectory.h */,
+ DF93D76A1444B09C007C6459 /* UDFFile.cpp */,
+ DF93D76B1444B09C007C6459 /* UDFFile.h */,
F56C7459131EC152000AD0F6 /* UPnPDirectory.cpp */,
F56C745A131EC152000AD0F6 /* UPnPDirectory.h */,
+ DF93D76C1444B09C007C6459 /* UPnPFile.cpp */,
+ DF93D76D1444B09C007C6459 /* UPnPFile.h */,
F56C7490131EC152000AD0F6 /* VideoDatabaseDirectory.cpp */,
F56C7491131EC152000AD0F6 /* VideoDatabaseDirectory.h */,
F56C7492131EC152000AD0F6 /* VirtualDirectory.cpp */,
@@ -4293,6 +4303,8 @@
F56C7498131EC152000AD0F6 /* ZeroconfDirectory.h */,
F56C749B131EC152000AD0F6 /* ZipDirectory.cpp */,
F56C749C131EC152000AD0F6 /* ZipDirectory.h */,
+ DF93D76E1444B09C007C6459 /* ZipFile.cpp */,
+ DF93D76F1444B09C007C6459 /* ZipFile.h */,
F56C749D131EC152000AD0F6 /* ZipManager.cpp */,
F56C749E131EC152000AD0F6 /* ZipManager.h */,
);
@@ -6351,45 +6363,21 @@
F56C7971131EC154000AD0F6 /* ASAPFileDirectory.cpp in Sources */,
F56C7972131EC154000AD0F6 /* MusicFileDirectory.cpp in Sources */,
F56C7973131EC154000AD0F6 /* MythSession.cpp in Sources */,
- F56C7974131EC154000AD0F6 /* FileSmb.cpp in Sources */,
F56C7975131EC154000AD0F6 /* SMBDirectory.cpp in Sources */,
F56C7976131EC154000AD0F6 /* MythDirectory.cpp in Sources */,
F56C7977131EC154000AD0F6 /* MythFile.cpp in Sources */,
- F56C7978131EC154000AD0F6 /* FileShoutcast.cpp in Sources */,
- F56C7979131EC154000AD0F6 /* CacheMemBuffer.cpp in Sources */,
F56C797A131EC154000AD0F6 /* CacheStrategy.cpp in Sources */,
F56C797B131EC154000AD0F6 /* CDDADirectory.cpp in Sources */,
F56C797C131EC154000AD0F6 /* DAAPDirectory.cpp in Sources */,
F56C797D131EC154000AD0F6 /* DAVDirectory.cpp in Sources */,
F56C797E131EC154000AD0F6 /* Directory.cpp in Sources */,
- F56C797F131EC154000AD0F6 /* DirectoryCache.cpp in Sources */,
F56C7980131EC154000AD0F6 /* DirectoryHistory.cpp in Sources */,
- F56C7981131EC154000AD0F6 /* DirectoryTuxBox.cpp in Sources */,
F56C7982131EC154000AD0F6 /* DllLibCurl.cpp in Sources */,
- F56C7983131EC154000AD0F6 /* FactoryDirectory.cpp in Sources */,
- F56C7984131EC154000AD0F6 /* FactoryFileDirectory.cpp in Sources */,
F56C7985131EC154000AD0F6 /* File.cpp in Sources */,
- F56C7986131EC154000AD0F6 /* FileCache.cpp in Sources */,
- F56C7987131EC154000AD0F6 /* FileCDDA.cpp in Sources */,
- F56C7988131EC154000AD0F6 /* FileCurl.cpp in Sources */,
- F56C7989131EC154000AD0F6 /* FileDAAP.cpp in Sources */,
F56C798A131EC154000AD0F6 /* FileFactory.cpp in Sources */,
- F56C798B131EC154000AD0F6 /* FileFileReader.cpp in Sources */,
- F56C798C131EC154000AD0F6 /* FileHD.cpp in Sources */,
- F56C798D131EC154000AD0F6 /* FileISO.cpp in Sources */,
- F56C798E131EC154000AD0F6 /* FileLastFM.cpp in Sources */,
- F56C798F131EC154000AD0F6 /* FileMusicDatabase.cpp in Sources */,
- F56C7990131EC154000AD0F6 /* FileRar.cpp in Sources */,
- F56C7991131EC154000AD0F6 /* FileRTV.cpp in Sources */,
- F56C7992131EC154000AD0F6 /* FileSFTP.cpp in Sources */,
- F56C7993131EC154000AD0F6 /* FileSpecialProtocol.cpp in Sources */,
- F56C7994131EC154000AD0F6 /* FileTuxBox.cpp in Sources */,
- F56C7995131EC154000AD0F6 /* FileUDF.cpp in Sources */,
- F56C7997131EC154000AD0F6 /* FileZip.cpp in Sources */,
F56C7998131EC154000AD0F6 /* FTPDirectory.cpp in Sources */,
F56C7999131EC154000AD0F6 /* FTPParse.cpp in Sources */,
F56C799A131EC154000AD0F6 /* HDDirectory.cpp in Sources */,
- F56C799B131EC154000AD0F6 /* HDHomeRun.cpp in Sources */,
F56C799C131EC154000AD0F6 /* HTSPDirectory.cpp in Sources */,
F56C799D131EC154000AD0F6 /* HTSPSession.cpp in Sources */,
F56C799E131EC154000AD0F6 /* HTTPDirectory.cpp in Sources */,
@@ -6963,7 +6951,6 @@
F56C7FB0131F36BF000AD0F6 /* DVDVideoCodecVideoToolBox.cpp in Sources */,
F57A1DBD1329FB0A00498CC7 /* SourcesDirectory.cpp in Sources */,
F5B13E0113344F310045076D /* DarwinUtils.mm in Sources */,
- 7C99B73F133D372300FC2B16 /* CacheCircular.cpp in Sources */,
7C99B7AA134072CD00FC2B16 /* GUIDialogPlayEject.cpp in Sources */,
F5AE40EA134175160004BD79 /* HttpApi.cpp in Sources */,
F5AE40EB134175160004BD79 /* XBMChttp.cpp in Sources */,
@@ -6980,7 +6967,6 @@
18ACF8E313597B0000B67371 /* RecentlyAddedJob.cpp in Sources */,
C807119F135DB842002F601B /* InputOperations.cpp in Sources */,
C8EC5D51136954E400CCC10D /* XBMC_keytable.cpp in Sources */,
- 18404DFB1396C43B00863BBA /* Slingbox.cpp in Sources */,
1840B796139968DB007C848B /* JSONVariantParser.cpp in Sources */,
1840B797139968DB007C848B /* JSONVariantWriter.cpp in Sources */,
7C0A7ECD13A5DBF900AFC2BD /* AppParamParser.cpp in Sources */,
@@ -6988,7 +6974,6 @@
7C0A7FC813A9E75400AFC2BD /* DirtyRegionSolvers.cpp in Sources */,
7C0A7FC913A9E75400AFC2BD /* DirtyRegionTracker.cpp in Sources */,
7C0A7FCC13A9E76E00AFC2BD /* GUIWindowDebugInfo.cpp in Sources */,
- DF0DF16C13A3AF82008ED511 /* FileNFS.cpp in Sources */,
DF0DF16D13A3AF82008ED511 /* NFSDirectory.cpp in Sources */,
7C89627013B702F3003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
1830216013B8E35300770920 /* controledit.cpp in Sources */,
@@ -7004,10 +6989,8 @@
DFA6BE8A13FED2B40048CC11 /* HttpParser.cpp in Sources */,
18968DE814155E1D005BA742 /* ApplicationOperations.cpp in Sources */,
DFCFC53D1413F7F70004D0BF /* AFPDirectory.cpp in Sources */,
- DFCFC53E1413F7F70004D0BF /* FileAFP.cpp in Sources */,
32D6D47C1423A9D8003641AC /* JpegIO.cpp in Sources */,
DF44852F140064F40069344B /* BXAcodec.cpp in Sources */,
- DF4485341400651B0069344B /* FilePipe.cpp in Sources */,
DF4485351400651B0069344B /* PipesManager.cpp in Sources */,
DF4485381400654A0069344B /* AirTunesServer.cpp in Sources */,
DF98D9A81434F4B400A6EBE1 /* SkinVariable.cpp in Sources */,
@@ -7025,7 +7008,6 @@
F5E1132814357B6500175026 /* GUIDialogPeripheralSettings.cpp in Sources */,
F5E1132914357B6500175026 /* Peripherals.cpp in Sources */,
F5E113AD1435882400175026 /* pyrendercapture.cpp in Sources */,
- DF673A251443769300A5A509 /* FileUPnP.cpp in Sources */,
F5BD033A148D4923001B5583 /* CryptThreading.cpp in Sources */,
7CCFD9AA1514952700211D82 /* PCMCodec.cpp in Sources */,
DF527780151BAFD600B5B63B /* WebSocket.cpp in Sources */,
@@ -7042,6 +7024,38 @@
DFCA6B0E15224684000BFAAE /* HTTPWebinterfaceAddonsHandler.cpp in Sources */,
DFCA6B0F15224684000BFAAE /* HTTPWebinterfaceHandler.cpp in Sources */,
DFCA6B1015224684000BFAAE /* IHTTPRequestHandler.cpp in Sources */,
+ DF93D7701444B09C007C6459 /* AFPFile.cpp in Sources */,
+ DF93D7731444B09C007C6459 /* CDDAFile.cpp in Sources */,
+ DF93D7741444B09C007C6459 /* CurlFile.cpp in Sources */,
+ DF93D7751444B09C007C6459 /* DAAPFile.cpp in Sources */,
+ DF93D7761444B09C007C6459 /* DirectoryFactory.cpp in Sources */,
+ DF93D7771444B09C007C6459 /* FileDirectoryFactory.cpp in Sources */,
+ DF93D7781444B09C007C6459 /* FileReaderFile.cpp in Sources */,
+ DF93D7791444B09C007C6459 /* HDFile.cpp in Sources */,
+ DF93D77A1444B09C007C6459 /* ISOFile.cpp in Sources */,
+ DF93D77B1444B09C007C6459 /* LastFMFile.cpp in Sources */,
+ DF93D77C1444B09C007C6459 /* MusicDatabaseFile.cpp in Sources */,
+ DF93D77D1444B09C007C6459 /* NFSFile.cpp in Sources */,
+ DF93D77E1444B09C007C6459 /* PipeFile.cpp in Sources */,
+ DF93D77F1444B09C007C6459 /* RarFile.cpp in Sources */,
+ DF93D7801444B09C007C6459 /* RTVFile.cpp in Sources */,
+ DF93D7811444B09C007C6459 /* SFTPFile.cpp in Sources */,
+ DF93D7821444B09C007C6459 /* ShoutcastFile.cpp in Sources */,
+ DF93D7831444B09C007C6459 /* SlingboxDirectory.cpp in Sources */,
+ DF93D7841444B09C007C6459 /* SlingboxFile.cpp in Sources */,
+ DF93D7851444B09C007C6459 /* SmbFile.cpp in Sources */,
+ DF93D7861444B09C007C6459 /* SpecialProtocolFile.cpp in Sources */,
+ DF93D7871444B09C007C6459 /* TuxBoxDirectory.cpp in Sources */,
+ DF93D7881444B09C007C6459 /* TuxBoxFile.cpp in Sources */,
+ DF93D7891444B09C007C6459 /* UDFFile.cpp in Sources */,
+ DF93D78A1444B09C007C6459 /* UPnPFile.cpp in Sources */,
+ DF93D78B1444B09C007C6459 /* ZipFile.cpp in Sources */,
+ DF93D8331444B88B007C6459 /* HDHomeRunDirectory.cpp in Sources */,
+ DF93D8341444B88B007C6459 /* HDHomeRunFile.cpp in Sources */,
+ DFDB00491516408F005079A4 /* CircularCache.cpp in Sources */,
+ DFDB004A1516408F005079A4 /* DirectoryCache.cpp in Sources */,
+ DFDB004B1516408F005079A4 /* FileCache.cpp in Sources */,
+ DFDB004C1516408F005079A4 /* MemBufferCache.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj
index ff606d51e2..7dfb7904a0 100644
--- a/XBMC-IOS.xcodeproj/project.pbxproj
+++ b/XBMC-IOS.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
1830219E13B8E37300770920 /* controledit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1830219D13B8E37300770920 /* controledit.cpp */; };
18404DD31396C3D200863BBA /* SlingboxLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18404DD21396C3D200863BBA /* SlingboxLib.a */; };
- 18404DD61396C3F300863BBA /* Slingbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18404DD41396C3F300863BBA /* Slingbox.cpp */; };
1840B77A1399616D007C848B /* JSONVariantParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B7761399616D007C848B /* JSONVariantParser.cpp */; };
1840B77B1399616D007C848B /* JSONVariantWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B7781399616D007C848B /* JSONVariantWriter.cpp */; };
188F761E1522182F009870CE /* GUIOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 188F761C1522182F009870CE /* GUIOperations.cpp */; };
@@ -26,17 +25,14 @@
7C0A7FB213A9E72E00AFC2BD /* DirtyRegionSolvers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FAE13A9E72E00AFC2BD /* DirtyRegionSolvers.cpp */; };
7C0A7FB313A9E72E00AFC2BD /* DirtyRegionTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FB013A9E72E00AFC2BD /* DirtyRegionTracker.cpp */; };
7C89628013B7031E003631FE /* GUIWindowScreensaverDim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C89627E13B7031E003631FE /* GUIWindowScreensaverDim.cpp */; };
- 7C99B6E9133D36E200FC2B16 /* CacheCircular.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B6E7133D36E200FC2B16 /* CacheCircular.cpp */; };
7C99B7BE1340730000FC2B16 /* GUIDialogPlayEject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B7BC1340730000FC2B16 /* GUIDialogPlayEject.cpp */; };
7CCFD9991514950700211D82 /* PCMCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CCFD9971514950700211D82 /* PCMCodec.cpp */; };
7CEE2E7F13D6B7D4000ABF2A /* TimeSmoother.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEE2E7D13D6B7D4000ABF2A /* TimeSmoother.cpp */; };
C80711AD135DB85F002F601B /* InputOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80711AB135DB85F002F601B /* InputOperations.cpp */; };
C8EC5D26136953E100CCC10D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D24136953E100CCC10D /* XBMC_keytable.cpp */; };
- DF0DF17F13A3AF9F008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF17B13A3AF9F008ED511 /* FileNFS.cpp */; };
DF0DF18013A3AF9F008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF17D13A3AF9F008ED511 /* NFSDirectory.cpp */; };
DF3488F813FD961A0026A711 /* GUIAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF3488F613FD961A0026A711 /* GUIAction.cpp */; };
DF44856C140065C60069344B /* BXAcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF44856A140065C60069344B /* BXAcodec.cpp */; };
- DF448571140065E10069344B /* FilePipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF44856D140065E10069344B /* FilePipe.cpp */; };
DF448572140065E10069344B /* PipesManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF44856F140065E10069344B /* PipesManager.cpp */; };
DF4485751400662D0069344B /* AirTunesServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4485731400662D0069344B /* AirTunesServer.cpp */; };
DF527757151BAF8200B5B63B /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF52774E151BAF8200B5B63B /* WebSocket.cpp */; };
@@ -45,7 +41,34 @@
DF52775A151BAF8200B5B63B /* WebSocketV8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF527754151BAF8200B5B63B /* WebSocketV8.cpp */; };
DF527760151BAFA000B5B63B /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF52775C151BAFA000B5B63B /* Base64.cpp */; };
DF527761151BAFA000B5B63B /* HttpResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF52775E151BAFA000B5B63B /* HttpResponse.cpp */; };
- DF6739E21443765F00A5A509 /* FileUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF6739E01443765F00A5A509 /* FileUPnP.cpp */; };
+ DF93D7CF1444B105007C6459 /* AFPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7971444B105007C6459 /* AFPFile.cpp */; };
+ DF93D7D21444B105007C6459 /* CDDAFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D79D1444B105007C6459 /* CDDAFile.cpp */; };
+ DF93D7D31444B105007C6459 /* CurlFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D79F1444B105007C6459 /* CurlFile.cpp */; };
+ DF93D7D41444B105007C6459 /* DAAPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7A11444B105007C6459 /* DAAPFile.cpp */; };
+ DF93D7D51444B105007C6459 /* DirectoryFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7A31444B105007C6459 /* DirectoryFactory.cpp */; };
+ DF93D7D61444B105007C6459 /* FileDirectoryFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7A51444B105007C6459 /* FileDirectoryFactory.cpp */; };
+ DF93D7D71444B105007C6459 /* FileReaderFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7A71444B105007C6459 /* FileReaderFile.cpp */; };
+ DF93D7D81444B105007C6459 /* HDFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7A91444B105007C6459 /* HDFile.cpp */; };
+ DF93D7D91444B105007C6459 /* ISOFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7AB1444B105007C6459 /* ISOFile.cpp */; };
+ DF93D7DA1444B105007C6459 /* LastFMFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7AD1444B105007C6459 /* LastFMFile.cpp */; };
+ DF93D7DB1444B105007C6459 /* MusicDatabaseFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7AF1444B105007C6459 /* MusicDatabaseFile.cpp */; };
+ DF93D7DC1444B105007C6459 /* NFSFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7B11444B105007C6459 /* NFSFile.cpp */; };
+ DF93D7DD1444B105007C6459 /* PipeFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7B31444B105007C6459 /* PipeFile.cpp */; };
+ DF93D7DE1444B105007C6459 /* RarFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7B51444B105007C6459 /* RarFile.cpp */; };
+ DF93D7DF1444B105007C6459 /* RTVFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7B71444B105007C6459 /* RTVFile.cpp */; };
+ DF93D7E01444B105007C6459 /* SFTPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7B91444B105007C6459 /* SFTPFile.cpp */; };
+ DF93D7E11444B105007C6459 /* ShoutcastFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7BB1444B105007C6459 /* ShoutcastFile.cpp */; };
+ DF93D7E21444B105007C6459 /* SlingboxDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7BD1444B105007C6459 /* SlingboxDirectory.cpp */; };
+ DF93D7E31444B105007C6459 /* SlingboxFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7BF1444B105007C6459 /* SlingboxFile.cpp */; };
+ DF93D7E41444B105007C6459 /* SmbFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7C11444B105007C6459 /* SmbFile.cpp */; };
+ DF93D7E51444B105007C6459 /* SpecialProtocolFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7C31444B105007C6459 /* SpecialProtocolFile.cpp */; };
+ DF93D7E61444B105007C6459 /* TuxBoxDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7C51444B105007C6459 /* TuxBoxDirectory.cpp */; };
+ DF93D7E71444B105007C6459 /* TuxBoxFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7C71444B105007C6459 /* TuxBoxFile.cpp */; };
+ DF93D7E81444B105007C6459 /* UDFFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7C91444B105007C6459 /* UDFFile.cpp */; };
+ DF93D7E91444B105007C6459 /* UPnPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7CB1444B105007C6459 /* UPnPFile.cpp */; };
+ DF93D7EA1444B105007C6459 /* ZipFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7CD1444B105007C6459 /* ZipFile.cpp */; };
+ DF93D81E1444B86B007C6459 /* HDHomeRunDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D81A1444B86B007C6459 /* HDHomeRunDirectory.cpp */; };
+ DF93D81F1444B86B007C6459 /* HDHomeRunFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D81C1444B86B007C6459 /* HDHomeRunFile.cpp */; };
DF98D9991434F49500A6EBE1 /* SkinVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF98D9971434F49500A6EBE1 /* SkinVariable.cpp */; };
DFA6BE4313FECA010048CC11 /* AirPlayServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE4113FECA010048CC11 /* AirPlayServer.cpp */; };
DFA6BE7713FED09C0048CC11 /* HttpParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFA6BE7513FED09C0048CC11 /* HttpParser.cpp */; };
@@ -57,10 +80,13 @@
DFCA6AEF15224671000BFAAE /* HTTPWebinterfaceHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCA6AE615224671000BFAAE /* HTTPWebinterfaceHandler.cpp */; };
DFCA6AF015224671000BFAAE /* IHTTPRequestHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCA6AE815224671000BFAAE /* IHTTPRequestHandler.cpp */; };
DFCFC52A1413F7D60004D0BF /* AFPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCFC5261413F7D60004D0BF /* AFPDirectory.cpp */; };
- DFCFC52B1413F7D60004D0BF /* FileAFP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFCFC5281413F7D60004D0BF /* FileAFP.cpp */; };
DFD4D1E213D725ED00A47C47 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D1D813D725ED00A47C47 /* Implementation.cpp */; };
DFD4D1E713D7263000A47C47 /* README.platform in Resources */ = {isa = PBXBuildFile; fileRef = DFD4D1E613D7263000A47C47 /* README.platform */; };
DFD4D1FE13D7283500A47C47 /* SystemClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D1FC13D7283500A47C47 /* SystemClock.cpp */; };
+ DFDB00241516403A005079A4 /* CircularCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDB001C1516403A005079A4 /* CircularCache.cpp */; };
+ DFDB00251516403A005079A4 /* DirectoryCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDB001E1516403A005079A4 /* DirectoryCache.cpp */; };
+ DFDB00261516403A005079A4 /* FileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDB00201516403A005079A4 /* FileCache.cpp */; };
+ DFDB00271516403A005079A4 /* MemBufferCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFDB00221516403A005079A4 /* MemBufferCache.cpp */; };
F56B143412CAF279009B4C96 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B143312CAF279009B4C96 /* CoreVideo.framework */; };
F56B14A512CAF523009B4C96 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B14A412CAF523009B4C96 /* AudioToolbox.framework */; };
F56B15D512CD67A9009B4C96 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15D412CD67A9009B4C96 /* CoreGraphics.framework */; };
@@ -393,45 +419,21 @@
F56C895B131F42ED000AD0F6 /* ASAPFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8382131F42E8000AD0F6 /* ASAPFileDirectory.cpp */; };
F56C895C131F42ED000AD0F6 /* MusicFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8384131F42E8000AD0F6 /* MusicFileDirectory.cpp */; };
F56C895D131F42ED000AD0F6 /* MythSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8386131F42E8000AD0F6 /* MythSession.cpp */; };
- F56C895E131F42ED000AD0F6 /* FileSmb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8387131F42E8000AD0F6 /* FileSmb.cpp */; };
F56C895F131F42ED000AD0F6 /* SMBDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8388131F42E8000AD0F6 /* SMBDirectory.cpp */; };
F56C8960131F42ED000AD0F6 /* MythDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8389131F42E8000AD0F6 /* MythDirectory.cpp */; };
F56C8961131F42ED000AD0F6 /* MythFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C838B131F42E8000AD0F6 /* MythFile.cpp */; };
- F56C8962131F42ED000AD0F6 /* FileShoutcast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C838D131F42E8000AD0F6 /* FileShoutcast.cpp */; };
- F56C8963131F42ED000AD0F6 /* CacheMemBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C838E131F42E8000AD0F6 /* CacheMemBuffer.cpp */; };
F56C8964131F42ED000AD0F6 /* CacheStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8390131F42E8000AD0F6 /* CacheStrategy.cpp */; };
F56C8965131F42ED000AD0F6 /* CDDADirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8392131F42E8000AD0F6 /* CDDADirectory.cpp */; };
F56C8966131F42ED000AD0F6 /* DAAPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8394131F42E8000AD0F6 /* DAAPDirectory.cpp */; };
F56C8967131F42ED000AD0F6 /* DAVDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8396131F42E8000AD0F6 /* DAVDirectory.cpp */; };
F56C8968131F42ED000AD0F6 /* Directory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8398131F42E8000AD0F6 /* Directory.cpp */; };
- F56C8969131F42ED000AD0F6 /* DirectoryCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C839A131F42E8000AD0F6 /* DirectoryCache.cpp */; };
F56C896A131F42ED000AD0F6 /* DirectoryHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C839C131F42E8000AD0F6 /* DirectoryHistory.cpp */; };
- F56C896B131F42ED000AD0F6 /* DirectoryTuxBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C839E131F42E8000AD0F6 /* DirectoryTuxBox.cpp */; };
F56C896C131F42ED000AD0F6 /* DllLibCurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83A0131F42E8000AD0F6 /* DllLibCurl.cpp */; };
- F56C896D131F42ED000AD0F6 /* FactoryDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83A2131F42E8000AD0F6 /* FactoryDirectory.cpp */; };
- F56C896E131F42ED000AD0F6 /* FactoryFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83A4131F42E8000AD0F6 /* FactoryFileDirectory.cpp */; };
F56C896F131F42ED000AD0F6 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83A6131F42E8000AD0F6 /* File.cpp */; };
- F56C8970131F42ED000AD0F6 /* FileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83A8131F42E8000AD0F6 /* FileCache.cpp */; };
- F56C8971131F42ED000AD0F6 /* FileCDDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83AA131F42E8000AD0F6 /* FileCDDA.cpp */; };
- F56C8972131F42ED000AD0F6 /* FileCurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83AC131F42E8000AD0F6 /* FileCurl.cpp */; };
- F56C8973131F42ED000AD0F6 /* FileDAAP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83AE131F42E8000AD0F6 /* FileDAAP.cpp */; };
F56C8974131F42ED000AD0F6 /* FileFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83B0131F42E8000AD0F6 /* FileFactory.cpp */; };
- F56C8975131F42ED000AD0F6 /* FileFileReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83B2131F42E8000AD0F6 /* FileFileReader.cpp */; };
- F56C8976131F42ED000AD0F6 /* FileHD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83B4131F42E8000AD0F6 /* FileHD.cpp */; };
- F56C8977131F42ED000AD0F6 /* FileISO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83B6131F42E8000AD0F6 /* FileISO.cpp */; };
- F56C8978131F42ED000AD0F6 /* FileLastFM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83B8131F42E8000AD0F6 /* FileLastFM.cpp */; };
- F56C8979131F42ED000AD0F6 /* FileMusicDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83BA131F42E8000AD0F6 /* FileMusicDatabase.cpp */; };
- F56C897A131F42ED000AD0F6 /* FileRar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83BC131F42E8000AD0F6 /* FileRar.cpp */; };
- F56C897B131F42ED000AD0F6 /* FileRTV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83BE131F42E8000AD0F6 /* FileRTV.cpp */; };
- F56C897C131F42ED000AD0F6 /* FileSFTP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83C0131F42E8000AD0F6 /* FileSFTP.cpp */; };
- F56C897D131F42ED000AD0F6 /* FileSpecialProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83C3131F42E8000AD0F6 /* FileSpecialProtocol.cpp */; };
- F56C897E131F42ED000AD0F6 /* FileTuxBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83C5131F42E8000AD0F6 /* FileTuxBox.cpp */; };
- F56C897F131F42ED000AD0F6 /* FileUDF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83C7131F42E8000AD0F6 /* FileUDF.cpp */; };
- F56C8981131F42ED000AD0F6 /* FileZip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83CB131F42E8000AD0F6 /* FileZip.cpp */; };
F56C8982131F42ED000AD0F6 /* FTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83CD131F42E8000AD0F6 /* FTPDirectory.cpp */; };
F56C8983131F42ED000AD0F6 /* FTPParse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83CF131F42E8000AD0F6 /* FTPParse.cpp */; };
F56C8984131F42ED000AD0F6 /* HDDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83D1131F42E8000AD0F6 /* HDDirectory.cpp */; };
- F56C8985131F42ED000AD0F6 /* HDHomeRun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83D3131F42E8000AD0F6 /* HDHomeRun.cpp */; };
F56C8986131F42ED000AD0F6 /* HTSPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83D6131F42E8000AD0F6 /* HTSPDirectory.cpp */; };
F56C8987131F42ED000AD0F6 /* HTSPSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83D8131F42E8000AD0F6 /* HTSPSession.cpp */; };
F56C8988131F42ED000AD0F6 /* HTTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C83DA131F42E8000AD0F6 /* HTTPDirectory.cpp */; };
@@ -964,8 +966,6 @@
/* Begin PBXFileReference section */
1830219D13B8E37300770920 /* controledit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controledit.cpp; sourceTree = "<group>"; };
18404DD21396C3D200863BBA /* SlingboxLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = SlingboxLib.a; path = lib/SlingboxLib/SlingboxLib.a; sourceTree = "<group>"; };
- 18404DD41396C3F300863BBA /* Slingbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Slingbox.cpp; sourceTree = "<group>"; };
- 18404DD51396C3F300863BBA /* Slingbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Slingbox.h; sourceTree = "<group>"; };
1840B7761399616D007C848B /* JSONVariantParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONVariantParser.cpp; sourceTree = "<group>"; };
1840B7771399616D007C848B /* JSONVariantParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONVariantParser.h; sourceTree = "<group>"; };
1840B7781399616D007C848B /* JSONVariantWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONVariantWriter.cpp; sourceTree = "<group>"; };
@@ -999,8 +999,6 @@
7C0A7FB113A9E72E00AFC2BD /* DirtyRegionTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirtyRegionTracker.h; sourceTree = "<group>"; };
7C89627E13B7031E003631FE /* GUIWindowScreensaverDim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowScreensaverDim.cpp; sourceTree = "<group>"; };
7C89627F13B7031E003631FE /* GUIWindowScreensaverDim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowScreensaverDim.h; sourceTree = "<group>"; };
- 7C99B6E7133D36E200FC2B16 /* CacheCircular.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheCircular.cpp; sourceTree = "<group>"; };
- 7C99B6E8133D36E200FC2B16 /* CacheCircular.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheCircular.h; sourceTree = "<group>"; };
7C99B7BC1340730000FC2B16 /* GUIDialogPlayEject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPlayEject.cpp; sourceTree = "<group>"; };
7C99B7BD1340730000FC2B16 /* GUIDialogPlayEject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPlayEject.h; sourceTree = "<group>"; };
7CCFD9971514950700211D82 /* PCMCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCMCodec.cpp; sourceTree = "<group>"; };
@@ -1013,16 +1011,12 @@
C80711AC135DB85F002F601B /* InputOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputOperations.h; sourceTree = "<group>"; };
C8EC5D24136953E100CCC10D /* XBMC_keytable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMC_keytable.cpp; sourceTree = "<group>"; };
C8EC5D25136953E100CCC10D /* XBMC_keytable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_keytable.h; sourceTree = "<group>"; };
- DF0DF17B13A3AF9F008ED511 /* FileNFS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileNFS.cpp; sourceTree = "<group>"; };
- DF0DF17C13A3AF9F008ED511 /* FileNFS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileNFS.h; sourceTree = "<group>"; };
DF0DF17D13A3AF9F008ED511 /* NFSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSDirectory.cpp; sourceTree = "<group>"; };
DF0DF17E13A3AF9F008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = "<group>"; };
DF3488F613FD961A0026A711 /* GUIAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIAction.cpp; sourceTree = "<group>"; };
DF3488F713FD961A0026A711 /* GUIAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIAction.h; sourceTree = "<group>"; };
DF44856A140065C60069344B /* BXAcodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BXAcodec.cpp; sourceTree = "<group>"; };
DF44856B140065C60069344B /* BXAcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BXAcodec.h; sourceTree = "<group>"; };
- DF44856D140065E10069344B /* FilePipe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilePipe.cpp; sourceTree = "<group>"; };
- DF44856E140065E10069344B /* FilePipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilePipe.h; sourceTree = "<group>"; };
DF44856F140065E10069344B /* PipesManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PipesManager.cpp; sourceTree = "<group>"; };
DF448570140065E10069344B /* PipesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipesManager.h; sourceTree = "<group>"; };
DF4485731400662D0069344B /* AirTunesServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirTunesServer.cpp; sourceTree = "<group>"; };
@@ -1039,8 +1033,62 @@
DF52775D151BAFA000B5B63B /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
DF52775E151BAFA000B5B63B /* HttpResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpResponse.cpp; sourceTree = "<group>"; };
DF52775F151BAFA000B5B63B /* HttpResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpResponse.h; sourceTree = "<group>"; };
- DF6739E01443765F00A5A509 /* FileUPnP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUPnP.cpp; sourceTree = "<group>"; };
- DF6739E11443765F00A5A509 /* FileUPnP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUPnP.h; sourceTree = "<group>"; };
+ DF93D7971444B105007C6459 /* AFPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AFPFile.cpp; sourceTree = "<group>"; };
+ DF93D7981444B105007C6459 /* AFPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFPFile.h; sourceTree = "<group>"; };
+ DF93D79D1444B105007C6459 /* CDDAFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDDAFile.cpp; sourceTree = "<group>"; };
+ DF93D79E1444B105007C6459 /* CDDAFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDDAFile.h; sourceTree = "<group>"; };
+ DF93D79F1444B105007C6459 /* CurlFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CurlFile.cpp; sourceTree = "<group>"; };
+ DF93D7A01444B105007C6459 /* CurlFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurlFile.h; sourceTree = "<group>"; };
+ DF93D7A11444B105007C6459 /* DAAPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DAAPFile.cpp; sourceTree = "<group>"; };
+ DF93D7A21444B105007C6459 /* DAAPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DAAPFile.h; sourceTree = "<group>"; };
+ DF93D7A31444B105007C6459 /* DirectoryFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryFactory.cpp; sourceTree = "<group>"; };
+ DF93D7A41444B105007C6459 /* DirectoryFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryFactory.h; sourceTree = "<group>"; };
+ DF93D7A51444B105007C6459 /* FileDirectoryFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileDirectoryFactory.cpp; sourceTree = "<group>"; };
+ DF93D7A61444B105007C6459 /* FileDirectoryFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileDirectoryFactory.h; sourceTree = "<group>"; };
+ DF93D7A71444B105007C6459 /* FileReaderFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileReaderFile.cpp; sourceTree = "<group>"; };
+ DF93D7A81444B105007C6459 /* FileReaderFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileReaderFile.h; sourceTree = "<group>"; };
+ DF93D7A91444B105007C6459 /* HDFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDFile.cpp; sourceTree = "<group>"; };
+ DF93D7AA1444B105007C6459 /* HDFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDFile.h; sourceTree = "<group>"; };
+ DF93D7AB1444B105007C6459 /* ISOFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ISOFile.cpp; sourceTree = "<group>"; };
+ DF93D7AC1444B105007C6459 /* ISOFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISOFile.h; sourceTree = "<group>"; };
+ DF93D7AD1444B105007C6459 /* LastFMFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LastFMFile.cpp; sourceTree = "<group>"; };
+ DF93D7AE1444B105007C6459 /* LastFMFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LastFMFile.h; sourceTree = "<group>"; };
+ DF93D7AF1444B105007C6459 /* MusicDatabaseFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicDatabaseFile.cpp; sourceTree = "<group>"; };
+ DF93D7B01444B105007C6459 /* MusicDatabaseFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicDatabaseFile.h; sourceTree = "<group>"; };
+ DF93D7B11444B105007C6459 /* NFSFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSFile.cpp; sourceTree = "<group>"; };
+ DF93D7B21444B105007C6459 /* NFSFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSFile.h; sourceTree = "<group>"; };
+ DF93D7B31444B105007C6459 /* PipeFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PipeFile.cpp; sourceTree = "<group>"; };
+ DF93D7B41444B105007C6459 /* PipeFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipeFile.h; sourceTree = "<group>"; };
+ DF93D7B51444B105007C6459 /* RarFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RarFile.cpp; sourceTree = "<group>"; };
+ DF93D7B61444B105007C6459 /* RarFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RarFile.h; sourceTree = "<group>"; };
+ DF93D7B71444B105007C6459 /* RTVFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTVFile.cpp; sourceTree = "<group>"; };
+ DF93D7B81444B105007C6459 /* RTVFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTVFile.h; sourceTree = "<group>"; };
+ DF93D7B91444B105007C6459 /* SFTPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SFTPFile.cpp; sourceTree = "<group>"; };
+ DF93D7BA1444B105007C6459 /* SFTPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFTPFile.h; sourceTree = "<group>"; };
+ DF93D7BB1444B105007C6459 /* ShoutcastFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShoutcastFile.cpp; sourceTree = "<group>"; };
+ DF93D7BC1444B105007C6459 /* ShoutcastFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoutcastFile.h; sourceTree = "<group>"; };
+ DF93D7BD1444B105007C6459 /* SlingboxDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SlingboxDirectory.cpp; sourceTree = "<group>"; };
+ DF93D7BE1444B105007C6459 /* SlingboxDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlingboxDirectory.h; sourceTree = "<group>"; };
+ DF93D7BF1444B105007C6459 /* SlingboxFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SlingboxFile.cpp; sourceTree = "<group>"; };
+ DF93D7C01444B105007C6459 /* SlingboxFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlingboxFile.h; sourceTree = "<group>"; };
+ DF93D7C11444B105007C6459 /* SmbFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmbFile.cpp; sourceTree = "<group>"; };
+ DF93D7C21444B105007C6459 /* SmbFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmbFile.h; sourceTree = "<group>"; };
+ DF93D7C31444B105007C6459 /* SpecialProtocolFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpecialProtocolFile.cpp; sourceTree = "<group>"; };
+ DF93D7C41444B105007C6459 /* SpecialProtocolFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpecialProtocolFile.h; sourceTree = "<group>"; };
+ DF93D7C51444B105007C6459 /* TuxBoxDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuxBoxDirectory.cpp; sourceTree = "<group>"; };
+ DF93D7C61444B105007C6459 /* TuxBoxDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TuxBoxDirectory.h; sourceTree = "<group>"; };
+ DF93D7C71444B105007C6459 /* TuxBoxFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuxBoxFile.cpp; sourceTree = "<group>"; };
+ DF93D7C81444B105007C6459 /* TuxBoxFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TuxBoxFile.h; sourceTree = "<group>"; };
+ DF93D7C91444B105007C6459 /* UDFFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UDFFile.cpp; sourceTree = "<group>"; };
+ DF93D7CA1444B105007C6459 /* UDFFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UDFFile.h; sourceTree = "<group>"; };
+ DF93D7CB1444B105007C6459 /* UPnPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnPFile.cpp; sourceTree = "<group>"; };
+ DF93D7CC1444B105007C6459 /* UPnPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPFile.h; sourceTree = "<group>"; };
+ DF93D7CD1444B105007C6459 /* ZipFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZipFile.cpp; sourceTree = "<group>"; };
+ DF93D7CE1444B105007C6459 /* ZipFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipFile.h; sourceTree = "<group>"; };
+ DF93D81A1444B86B007C6459 /* HDHomeRunDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDHomeRunDirectory.cpp; sourceTree = "<group>"; };
+ DF93D81B1444B86B007C6459 /* HDHomeRunDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDHomeRunDirectory.h; sourceTree = "<group>"; };
+ DF93D81C1444B86B007C6459 /* HDHomeRunFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDHomeRunFile.cpp; sourceTree = "<group>"; };
+ DF93D81D1444B86B007C6459 /* HDHomeRunFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDHomeRunFile.h; sourceTree = "<group>"; };
DF98D9971434F49500A6EBE1 /* SkinVariable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkinVariable.cpp; sourceTree = "<group>"; };
DF98D9981434F49500A6EBE1 /* SkinVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkinVariable.h; sourceTree = "<group>"; };
DFA6BE4113FECA010048CC11 /* AirPlayServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirPlayServer.cpp; sourceTree = "<group>"; };
@@ -1063,8 +1111,6 @@
DFCA6AE915224671000BFAAE /* IHTTPRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IHTTPRequestHandler.h; sourceTree = "<group>"; };
DFCFC5261413F7D60004D0BF /* AFPDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AFPDirectory.cpp; sourceTree = "<group>"; };
DFCFC5271413F7D60004D0BF /* AFPDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFPDirectory.h; sourceTree = "<group>"; };
- DFCFC5281413F7D60004D0BF /* FileAFP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileAFP.cpp; sourceTree = "<group>"; };
- DFCFC5291413F7D60004D0BF /* FileAFP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileAFP.h; sourceTree = "<group>"; };
DFD4D1D113D725ED00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
DFD4D1D213D725ED00A47C47 /* CriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CriticalSection.h; sourceTree = "<group>"; };
DFD4D1D613D725ED00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
@@ -1075,6 +1121,14 @@
DFD4D1E613D7263000A47C47 /* README.platform */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.platform; sourceTree = "<group>"; };
DFD4D1FC13D7283500A47C47 /* SystemClock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemClock.cpp; sourceTree = "<group>"; };
DFD4D1FD13D7283500A47C47 /* SystemClock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemClock.h; sourceTree = "<group>"; };
+ DFDB001C1516403A005079A4 /* CircularCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CircularCache.cpp; sourceTree = "<group>"; };
+ DFDB001D1516403A005079A4 /* CircularCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularCache.h; sourceTree = "<group>"; };
+ DFDB001E1516403A005079A4 /* DirectoryCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryCache.cpp; sourceTree = "<group>"; };
+ DFDB001F1516403A005079A4 /* DirectoryCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryCache.h; sourceTree = "<group>"; };
+ DFDB00201516403A005079A4 /* FileCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCache.cpp; sourceTree = "<group>"; };
+ DFDB00211516403A005079A4 /* FileCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCache.h; sourceTree = "<group>"; };
+ DFDB00221516403A005079A4 /* MemBufferCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemBufferCache.cpp; sourceTree = "<group>"; };
+ DFDB00231516403A005079A4 /* MemBufferCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemBufferCache.h; sourceTree = "<group>"; };
F558F60613AFDC1700631E12 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
F558F61013AFDC3000631E12 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
F56B143312CAF279009B4C96 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
@@ -1852,15 +1906,11 @@
F56C8384131F42E8000AD0F6 /* MusicFileDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicFileDirectory.cpp; sourceTree = "<group>"; };
F56C8385131F42E8000AD0F6 /* MusicFileDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicFileDirectory.h; sourceTree = "<group>"; };
F56C8386131F42E8000AD0F6 /* MythSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MythSession.cpp; sourceTree = "<group>"; };
- F56C8387131F42E8000AD0F6 /* FileSmb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSmb.cpp; sourceTree = "<group>"; };
F56C8388131F42E8000AD0F6 /* SMBDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SMBDirectory.cpp; sourceTree = "<group>"; };
F56C8389131F42E8000AD0F6 /* MythDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MythDirectory.cpp; sourceTree = "<group>"; };
F56C838A131F42E8000AD0F6 /* MythDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MythDirectory.h; sourceTree = "<group>"; };
F56C838B131F42E8000AD0F6 /* MythFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MythFile.cpp; sourceTree = "<group>"; };
F56C838C131F42E8000AD0F6 /* MythFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MythFile.h; sourceTree = "<group>"; };
- F56C838D131F42E8000AD0F6 /* FileShoutcast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileShoutcast.cpp; sourceTree = "<group>"; };
- F56C838E131F42E8000AD0F6 /* CacheMemBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheMemBuffer.cpp; sourceTree = "<group>"; };
- F56C838F131F42E8000AD0F6 /* CacheMemBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheMemBuffer.h; sourceTree = "<group>"; };
F56C8390131F42E8000AD0F6 /* CacheStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheStrategy.cpp; sourceTree = "<group>"; };
F56C8391131F42E8000AD0F6 /* CacheStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheStrategy.h; sourceTree = "<group>"; };
F56C8392131F42E8000AD0F6 /* CDDADirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDDADirectory.cpp; sourceTree = "<group>"; };
@@ -1871,63 +1921,20 @@
F56C8397131F42E8000AD0F6 /* DAVDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DAVDirectory.h; sourceTree = "<group>"; };
F56C8398131F42E8000AD0F6 /* Directory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Directory.cpp; sourceTree = "<group>"; };
F56C8399131F42E8000AD0F6 /* Directory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Directory.h; sourceTree = "<group>"; };
- F56C839A131F42E8000AD0F6 /* DirectoryCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryCache.cpp; sourceTree = "<group>"; };
- F56C839B131F42E8000AD0F6 /* DirectoryCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryCache.h; sourceTree = "<group>"; };
F56C839C131F42E8000AD0F6 /* DirectoryHistory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryHistory.cpp; sourceTree = "<group>"; };
F56C839D131F42E8000AD0F6 /* DirectoryHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryHistory.h; sourceTree = "<group>"; };
- F56C839E131F42E8000AD0F6 /* DirectoryTuxBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryTuxBox.cpp; sourceTree = "<group>"; };
- F56C839F131F42E8000AD0F6 /* DirectoryTuxBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryTuxBox.h; sourceTree = "<group>"; };
F56C83A0131F42E8000AD0F6 /* DllLibCurl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DllLibCurl.cpp; sourceTree = "<group>"; };
F56C83A1131F42E8000AD0F6 /* DllLibCurl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibCurl.h; sourceTree = "<group>"; };
- F56C83A2131F42E8000AD0F6 /* FactoryDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FactoryDirectory.cpp; sourceTree = "<group>"; };
- F56C83A3131F42E8000AD0F6 /* FactoryDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FactoryDirectory.h; sourceTree = "<group>"; };
- F56C83A4131F42E8000AD0F6 /* FactoryFileDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FactoryFileDirectory.cpp; sourceTree = "<group>"; };
- F56C83A5131F42E8000AD0F6 /* FactoryFileDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FactoryFileDirectory.h; sourceTree = "<group>"; };
F56C83A6131F42E8000AD0F6 /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = "<group>"; };
F56C83A7131F42E8000AD0F6 /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
- F56C83A8131F42E8000AD0F6 /* FileCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCache.cpp; sourceTree = "<group>"; };
- F56C83A9131F42E8000AD0F6 /* FileCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCache.h; sourceTree = "<group>"; };
- F56C83AA131F42E8000AD0F6 /* FileCDDA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCDDA.cpp; sourceTree = "<group>"; };
- F56C83AB131F42E8000AD0F6 /* FileCDDA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCDDA.h; sourceTree = "<group>"; };
- F56C83AC131F42E8000AD0F6 /* FileCurl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCurl.cpp; sourceTree = "<group>"; };
- F56C83AD131F42E8000AD0F6 /* FileCurl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCurl.h; sourceTree = "<group>"; };
- F56C83AE131F42E8000AD0F6 /* FileDAAP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileDAAP.cpp; sourceTree = "<group>"; };
- F56C83AF131F42E8000AD0F6 /* FileDAAP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileDAAP.h; sourceTree = "<group>"; };
F56C83B0131F42E8000AD0F6 /* FileFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileFactory.cpp; sourceTree = "<group>"; };
F56C83B1131F42E8000AD0F6 /* FileFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileFactory.h; sourceTree = "<group>"; };
- F56C83B2131F42E8000AD0F6 /* FileFileReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileFileReader.cpp; sourceTree = "<group>"; };
- F56C83B3131F42E8000AD0F6 /* FileFileReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileFileReader.h; sourceTree = "<group>"; };
- F56C83B4131F42E8000AD0F6 /* FileHD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileHD.cpp; sourceTree = "<group>"; };
- F56C83B5131F42E8000AD0F6 /* FileHD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileHD.h; sourceTree = "<group>"; };
- F56C83B6131F42E8000AD0F6 /* FileISO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileISO.cpp; sourceTree = "<group>"; };
- F56C83B7131F42E8000AD0F6 /* FileISO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileISO.h; sourceTree = "<group>"; };
- F56C83B8131F42E8000AD0F6 /* FileLastFM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileLastFM.cpp; sourceTree = "<group>"; };
- F56C83B9131F42E8000AD0F6 /* FileLastFM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileLastFM.h; sourceTree = "<group>"; };
- F56C83BA131F42E8000AD0F6 /* FileMusicDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileMusicDatabase.cpp; sourceTree = "<group>"; };
- F56C83BB131F42E8000AD0F6 /* FileMusicDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileMusicDatabase.h; sourceTree = "<group>"; };
- F56C83BC131F42E8000AD0F6 /* FileRar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileRar.cpp; sourceTree = "<group>"; };
- F56C83BD131F42E8000AD0F6 /* FileRar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileRar.h; sourceTree = "<group>"; };
- F56C83BE131F42E8000AD0F6 /* FileRTV.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileRTV.cpp; sourceTree = "<group>"; };
- F56C83BF131F42E8000AD0F6 /* FileRTV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileRTV.h; sourceTree = "<group>"; };
- F56C83C0131F42E8000AD0F6 /* FileSFTP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSFTP.cpp; sourceTree = "<group>"; };
- F56C83C1131F42E8000AD0F6 /* FileSFTP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSFTP.h; sourceTree = "<group>"; };
- F56C83C2131F42E8000AD0F6 /* FileSmb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSmb.h; sourceTree = "<group>"; };
- F56C83C3131F42E8000AD0F6 /* FileSpecialProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSpecialProtocol.cpp; sourceTree = "<group>"; };
- F56C83C4131F42E8000AD0F6 /* FileSpecialProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSpecialProtocol.h; sourceTree = "<group>"; };
- F56C83C5131F42E8000AD0F6 /* FileTuxBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileTuxBox.cpp; sourceTree = "<group>"; };
- F56C83C6131F42E8000AD0F6 /* FileTuxBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileTuxBox.h; sourceTree = "<group>"; };
- F56C83C7131F42E8000AD0F6 /* FileUDF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUDF.cpp; sourceTree = "<group>"; };
- F56C83C8131F42E8000AD0F6 /* FileUDF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUDF.h; sourceTree = "<group>"; };
- F56C83CB131F42E8000AD0F6 /* FileZip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileZip.cpp; sourceTree = "<group>"; };
- F56C83CC131F42E8000AD0F6 /* FileZip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileZip.h; sourceTree = "<group>"; };
F56C83CD131F42E8000AD0F6 /* FTPDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FTPDirectory.cpp; sourceTree = "<group>"; };
F56C83CE131F42E8000AD0F6 /* FTPDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTPDirectory.h; sourceTree = "<group>"; };
F56C83CF131F42E8000AD0F6 /* FTPParse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FTPParse.cpp; sourceTree = "<group>"; };
F56C83D0131F42E8000AD0F6 /* FTPParse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTPParse.h; sourceTree = "<group>"; };
F56C83D1131F42E8000AD0F6 /* HDDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDDirectory.cpp; sourceTree = "<group>"; };
F56C83D2131F42E8000AD0F6 /* HDDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDDirectory.h; sourceTree = "<group>"; };
- F56C83D3131F42E8000AD0F6 /* HDHomeRun.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDHomeRun.cpp; sourceTree = "<group>"; };
- F56C83D4131F42E8000AD0F6 /* HDHomeRun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDHomeRun.h; sourceTree = "<group>"; };
F56C83D5131F42E8000AD0F6 /* HTSPDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTSPDirectory.h; sourceTree = "<group>"; };
F56C83D6131F42E8000AD0F6 /* HTSPDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTSPDirectory.cpp; sourceTree = "<group>"; };
F56C83D7131F42E8000AD0F6 /* HTSPSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTSPSession.h; sourceTree = "<group>"; };
@@ -4472,89 +4479,58 @@
F56C8380131F42E8000AD0F6 /* AddonsDirectory.h */,
DFCFC5261413F7D60004D0BF /* AFPDirectory.cpp */,
DFCFC5271413F7D60004D0BF /* AFPDirectory.h */,
+ DF93D7971444B105007C6459 /* AFPFile.cpp */,
+ DF93D7981444B105007C6459 /* AFPFile.h */,
F56C8382131F42E8000AD0F6 /* ASAPFileDirectory.cpp */,
F56C8383131F42E8000AD0F6 /* ASAPFileDirectory.h */,
- 7C99B6E7133D36E200FC2B16 /* CacheCircular.cpp */,
- 7C99B6E8133D36E200FC2B16 /* CacheCircular.h */,
- F56C838E131F42E8000AD0F6 /* CacheMemBuffer.cpp */,
- F56C838F131F42E8000AD0F6 /* CacheMemBuffer.h */,
F56C8390131F42E8000AD0F6 /* CacheStrategy.cpp */,
F56C8391131F42E8000AD0F6 /* CacheStrategy.h */,
F56C8392131F42E8000AD0F6 /* CDDADirectory.cpp */,
F56C8393131F42E8000AD0F6 /* CDDADirectory.h */,
+ DF93D79D1444B105007C6459 /* CDDAFile.cpp */,
+ DF93D79E1444B105007C6459 /* CDDAFile.h */,
+ DFDB001C1516403A005079A4 /* CircularCache.cpp */,
+ DFDB001D1516403A005079A4 /* CircularCache.h */,
+ DF93D79F1444B105007C6459 /* CurlFile.cpp */,
+ DF93D7A01444B105007C6459 /* CurlFile.h */,
F56C8394131F42E8000AD0F6 /* DAAPDirectory.cpp */,
F56C8395131F42E8000AD0F6 /* DAAPDirectory.h */,
+ DF93D7A11444B105007C6459 /* DAAPFile.cpp */,
+ DF93D7A21444B105007C6459 /* DAAPFile.h */,
F56C8396131F42E8000AD0F6 /* DAVDirectory.cpp */,
F56C8397131F42E8000AD0F6 /* DAVDirectory.h */,
F56C8398131F42E8000AD0F6 /* Directory.cpp */,
F56C8399131F42E8000AD0F6 /* Directory.h */,
- F56C839A131F42E8000AD0F6 /* DirectoryCache.cpp */,
- F56C839B131F42E8000AD0F6 /* DirectoryCache.h */,
+ DFDB001E1516403A005079A4 /* DirectoryCache.cpp */,
+ DFDB001F1516403A005079A4 /* DirectoryCache.h */,
+ DF93D7A31444B105007C6459 /* DirectoryFactory.cpp */,
+ DF93D7A41444B105007C6459 /* DirectoryFactory.h */,
F56C839C131F42E8000AD0F6 /* DirectoryHistory.cpp */,
F56C839D131F42E8000AD0F6 /* DirectoryHistory.h */,
- F56C839E131F42E8000AD0F6 /* DirectoryTuxBox.cpp */,
- F56C839F131F42E8000AD0F6 /* DirectoryTuxBox.h */,
F56C83A0131F42E8000AD0F6 /* DllLibCurl.cpp */,
F56C83A1131F42E8000AD0F6 /* DllLibCurl.h */,
- F56C83A2131F42E8000AD0F6 /* FactoryDirectory.cpp */,
- F56C83A3131F42E8000AD0F6 /* FactoryDirectory.h */,
- F56C83A4131F42E8000AD0F6 /* FactoryFileDirectory.cpp */,
- F56C83A5131F42E8000AD0F6 /* FactoryFileDirectory.h */,
F56C83A6131F42E8000AD0F6 /* File.cpp */,
F56C83A7131F42E8000AD0F6 /* File.h */,
- DFCFC5281413F7D60004D0BF /* FileAFP.cpp */,
- DFCFC5291413F7D60004D0BF /* FileAFP.h */,
- F56C83A8131F42E8000AD0F6 /* FileCache.cpp */,
- F56C83A9131F42E8000AD0F6 /* FileCache.h */,
- F56C83AA131F42E8000AD0F6 /* FileCDDA.cpp */,
- F56C83AB131F42E8000AD0F6 /* FileCDDA.h */,
- F56C83AC131F42E8000AD0F6 /* FileCurl.cpp */,
- F56C83AD131F42E8000AD0F6 /* FileCurl.h */,
- F56C83AE131F42E8000AD0F6 /* FileDAAP.cpp */,
- F56C83AF131F42E8000AD0F6 /* FileDAAP.h */,
+ DFDB00201516403A005079A4 /* FileCache.cpp */,
+ DFDB00211516403A005079A4 /* FileCache.h */,
+ DF93D7A51444B105007C6459 /* FileDirectoryFactory.cpp */,
+ DF93D7A61444B105007C6459 /* FileDirectoryFactory.h */,
F56C83B0131F42E8000AD0F6 /* FileFactory.cpp */,
F56C83B1131F42E8000AD0F6 /* FileFactory.h */,
- F56C83B2131F42E8000AD0F6 /* FileFileReader.cpp */,
- F56C83B3131F42E8000AD0F6 /* FileFileReader.h */,
- F56C83B4131F42E8000AD0F6 /* FileHD.cpp */,
- F56C83B5131F42E8000AD0F6 /* FileHD.h */,
- F56C83B6131F42E8000AD0F6 /* FileISO.cpp */,
- F56C83B7131F42E8000AD0F6 /* FileISO.h */,
- F56C83B8131F42E8000AD0F6 /* FileLastFM.cpp */,
- F56C83B9131F42E8000AD0F6 /* FileLastFM.h */,
- F56C83BA131F42E8000AD0F6 /* FileMusicDatabase.cpp */,
- F56C83BB131F42E8000AD0F6 /* FileMusicDatabase.h */,
- DF0DF17B13A3AF9F008ED511 /* FileNFS.cpp */,
- DF0DF17C13A3AF9F008ED511 /* FileNFS.h */,
- DF44856D140065E10069344B /* FilePipe.cpp */,
- DF44856E140065E10069344B /* FilePipe.h */,
- F56C83BC131F42E8000AD0F6 /* FileRar.cpp */,
- F56C83BD131F42E8000AD0F6 /* FileRar.h */,
- F56C83BE131F42E8000AD0F6 /* FileRTV.cpp */,
- F56C83BF131F42E8000AD0F6 /* FileRTV.h */,
- F56C83C0131F42E8000AD0F6 /* FileSFTP.cpp */,
- F56C83C1131F42E8000AD0F6 /* FileSFTP.h */,
- F56C838D131F42E8000AD0F6 /* FileShoutcast.cpp */,
- F56C8387131F42E8000AD0F6 /* FileSmb.cpp */,
- F56C83C2131F42E8000AD0F6 /* FileSmb.h */,
- F56C83C3131F42E8000AD0F6 /* FileSpecialProtocol.cpp */,
- F56C83C4131F42E8000AD0F6 /* FileSpecialProtocol.h */,
- F56C83C5131F42E8000AD0F6 /* FileTuxBox.cpp */,
- F56C83C6131F42E8000AD0F6 /* FileTuxBox.h */,
- F56C83C7131F42E8000AD0F6 /* FileUDF.cpp */,
- F56C83C8131F42E8000AD0F6 /* FileUDF.h */,
- DF6739E01443765F00A5A509 /* FileUPnP.cpp */,
- DF6739E11443765F00A5A509 /* FileUPnP.h */,
- F56C83CB131F42E8000AD0F6 /* FileZip.cpp */,
- F56C83CC131F42E8000AD0F6 /* FileZip.h */,
+ DF93D7A71444B105007C6459 /* FileReaderFile.cpp */,
+ DF93D7A81444B105007C6459 /* FileReaderFile.h */,
F56C83CD131F42E8000AD0F6 /* FTPDirectory.cpp */,
F56C83CE131F42E8000AD0F6 /* FTPDirectory.h */,
F56C83CF131F42E8000AD0F6 /* FTPParse.cpp */,
F56C83D0131F42E8000AD0F6 /* FTPParse.h */,
F56C83D1131F42E8000AD0F6 /* HDDirectory.cpp */,
F56C83D2131F42E8000AD0F6 /* HDDirectory.h */,
- F56C83D3131F42E8000AD0F6 /* HDHomeRun.cpp */,
- F56C83D4131F42E8000AD0F6 /* HDHomeRun.h */,
+ DF93D7A91444B105007C6459 /* HDFile.cpp */,
+ DF93D7AA1444B105007C6459 /* HDFile.h */,
+ DF93D81A1444B86B007C6459 /* HDHomeRunDirectory.cpp */,
+ DF93D81B1444B86B007C6459 /* HDHomeRunDirectory.h */,
+ DF93D81C1444B86B007C6459 /* HDHomeRunFile.cpp */,
+ DF93D81D1444B86B007C6459 /* HDHomeRunFile.h */,
F56C83D6131F42E8000AD0F6 /* HTSPDirectory.cpp */,
F56C83D5131F42E8000AD0F6 /* HTSPDirectory.h */,
F56C83D8131F42E8000AD0F6 /* HTSPSession.cpp */,
@@ -4570,14 +4546,22 @@
F56C83E1131F42E8000AD0F6 /* iso9660.h */,
F56C83E2131F42E8000AD0F6 /* ISO9660Directory.cpp */,
F56C83E3131F42E8000AD0F6 /* ISO9660Directory.h */,
+ DF93D7AB1444B105007C6459 /* ISOFile.cpp */,
+ DF93D7AC1444B105007C6459 /* ISOFile.h */,
F56C83E4131F42E8000AD0F6 /* LastFMDirectory.cpp */,
F56C83E5131F42E8000AD0F6 /* LastFMDirectory.h */,
+ DF93D7AD1444B105007C6459 /* LastFMFile.cpp */,
+ DF93D7AE1444B105007C6459 /* LastFMFile.h */,
+ DFDB00221516403A005079A4 /* MemBufferCache.cpp */,
+ DFDB00231516403A005079A4 /* MemBufferCache.h */,
F56C83E6131F42E8000AD0F6 /* MultiPathDirectory.cpp */,
F56C83E7131F42E8000AD0F6 /* MultiPathDirectory.h */,
F56C83E8131F42E8000AD0F6 /* MultiPathFile.cpp */,
F56C83E9131F42E8000AD0F6 /* MultiPathFile.h */,
F56C8417131F42E8000AD0F6 /* MusicDatabaseDirectory.cpp */,
F56C8418131F42E8000AD0F6 /* MusicDatabaseDirectory.h */,
+ DF93D7AF1444B105007C6459 /* MusicDatabaseFile.cpp */,
+ DF93D7B01444B105007C6459 /* MusicDatabaseFile.h */,
F56C8384131F42E8000AD0F6 /* MusicFileDirectory.cpp */,
F56C8385131F42E8000AD0F6 /* MusicFileDirectory.h */,
F56C8419131F42E8000AD0F6 /* MusicSearchDirectory.cpp */,
@@ -4589,11 +4573,15 @@
F56C8386131F42E8000AD0F6 /* MythSession.cpp */,
DF0DF17D13A3AF9F008ED511 /* NFSDirectory.cpp */,
DF0DF17E13A3AF9F008ED511 /* NFSDirectory.h */,
+ DF93D7B11444B105007C6459 /* NFSFile.cpp */,
+ DF93D7B21444B105007C6459 /* NFSFile.h */,
F56C837D131F42E8000AD0F6 /* NptXbmcFile.cpp */,
F56C841B131F42E8000AD0F6 /* NSFFileDirectory.cpp */,
F56C841C131F42E8000AD0F6 /* NSFFileDirectory.h */,
F56C841D131F42E8000AD0F6 /* OGGFileDirectory.cpp */,
F56C841E131F42E8000AD0F6 /* OGGFileDirectory.h */,
+ DF93D7B31444B105007C6459 /* PipeFile.cpp */,
+ DF93D7B41444B105007C6459 /* PipeFile.h */,
DF44856F140065E10069344B /* PipesManager.cpp */,
DF448570140065E10069344B /* PipesManager.h */,
F56C841F131F42E8000AD0F6 /* PlaylistDirectory.cpp */,
@@ -4604,40 +4592,62 @@
F56C8424131F42E8000AD0F6 /* PluginDirectory.h */,
F56C8425131F42E8000AD0F6 /* RarDirectory.cpp */,
F56C8426131F42E8000AD0F6 /* RarDirectory.h */,
+ DF93D7B51444B105007C6459 /* RarFile.cpp */,
+ DF93D7B61444B105007C6459 /* RarFile.h */,
F56C8427131F42E8000AD0F6 /* RarManager.cpp */,
F56C8428131F42E8000AD0F6 /* RarManager.h */,
F56C837E131F42E8000AD0F6 /* RSSDirectory.cpp */,
F56C837F131F42E8000AD0F6 /* RSSDirectory.h */,
F56C8429131F42E8000AD0F6 /* RTVDirectory.cpp */,
F56C842A131F42E8000AD0F6 /* RTVDirectory.h */,
+ DF93D7B71444B105007C6459 /* RTVFile.cpp */,
+ DF93D7B81444B105007C6459 /* RTVFile.h */,
F56C842C131F42E8000AD0F6 /* SAPDirectory.cpp */,
F56C842B131F42E8000AD0F6 /* SAPDirectory.h */,
F56C842E131F42E8000AD0F6 /* SAPFile.cpp */,
F56C842D131F42E8000AD0F6 /* SAPFile.h */,
F56C842F131F42E8000AD0F6 /* SFTPDirectory.cpp */,
F56C8430131F42E8000AD0F6 /* SFTPDirectory.h */,
+ DF93D7B91444B105007C6459 /* SFTPFile.cpp */,
+ DF93D7BA1444B105007C6459 /* SFTPFile.h */,
+ DF93D7BB1444B105007C6459 /* ShoutcastFile.cpp */,
+ DF93D7BC1444B105007C6459 /* ShoutcastFile.h */,
F56C8431131F42E8000AD0F6 /* SIDFileDirectory.cpp */,
F56C8432131F42E8000AD0F6 /* SIDFileDirectory.h */,
- 18404DD41396C3F300863BBA /* Slingbox.cpp */,
- 18404DD51396C3F300863BBA /* Slingbox.h */,
+ DF93D7BD1444B105007C6459 /* SlingboxDirectory.cpp */,
+ DF93D7BE1444B105007C6459 /* SlingboxDirectory.h */,
+ DF93D7BF1444B105007C6459 /* SlingboxFile.cpp */,
+ DF93D7C01444B105007C6459 /* SlingboxFile.h */,
F56C8433131F42E8000AD0F6 /* SmartPlaylistDirectory.cpp */,
F56C8434131F42E8000AD0F6 /* SmartPlaylistDirectory.h */,
F56C8388131F42E8000AD0F6 /* SMBDirectory.cpp */,
F56C8435131F42E8000AD0F6 /* SMBDirectory.h */,
+ DF93D7C11444B105007C6459 /* SmbFile.cpp */,
+ DF93D7C21444B105007C6459 /* SmbFile.h */,
F57A1DB61329FAF700498CC7 /* SourcesDirectory.cpp */,
F57A1DB71329FAF700498CC7 /* SourcesDirectory.h */,
F56C8379131F42E8000AD0F6 /* SpecialProtocol.cpp */,
F56C837A131F42E8000AD0F6 /* SpecialProtocol.h */,
F56C837B131F42E8000AD0F6 /* SpecialProtocolDirectory.cpp */,
F56C837C131F42E8000AD0F6 /* SpecialProtocolDirectory.h */,
+ DF93D7C31444B105007C6459 /* SpecialProtocolFile.cpp */,
+ DF93D7C41444B105007C6459 /* SpecialProtocolFile.h */,
F56C8436131F42E8000AD0F6 /* StackDirectory.cpp */,
F56C8437131F42E8000AD0F6 /* StackDirectory.h */,
+ DF93D7C51444B105007C6459 /* TuxBoxDirectory.cpp */,
+ DF93D7C61444B105007C6459 /* TuxBoxDirectory.h */,
+ DF93D7C71444B105007C6459 /* TuxBoxFile.cpp */,
+ DF93D7C81444B105007C6459 /* TuxBoxFile.h */,
F56C8438131F42E8000AD0F6 /* udf25.cpp */,
F56C8439131F42E8000AD0F6 /* udf25.h */,
F56C843A131F42E8000AD0F6 /* UDFDirectory.cpp */,
F56C843B131F42E8000AD0F6 /* UDFDirectory.h */,
+ DF93D7C91444B105007C6459 /* UDFFile.cpp */,
+ DF93D7CA1444B105007C6459 /* UDFFile.h */,
F56C843C131F42E8000AD0F6 /* UPnPDirectory.cpp */,
F56C843D131F42E8000AD0F6 /* UPnPDirectory.h */,
+ DF93D7CB1444B105007C6459 /* UPnPFile.cpp */,
+ DF93D7CC1444B105007C6459 /* UPnPFile.h */,
F56C8473131F42E8000AD0F6 /* VideoDatabaseDirectory.cpp */,
F56C8474131F42E8000AD0F6 /* VideoDatabaseDirectory.h */,
F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */,
@@ -4652,6 +4662,8 @@
F56C847B131F42E9000AD0F6 /* ZeroconfDirectory.h */,
F56C847E131F42E9000AD0F6 /* ZipDirectory.cpp */,
F56C847F131F42E9000AD0F6 /* ZipDirectory.h */,
+ DF93D7CD1444B105007C6459 /* ZipFile.cpp */,
+ DF93D7CE1444B105007C6459 /* ZipFile.h */,
F56C8480131F42E9000AD0F6 /* ZipManager.cpp */,
F56C8481131F42E9000AD0F6 /* ZipManager.h */,
);
@@ -6458,45 +6470,21 @@
F56C895B131F42ED000AD0F6 /* ASAPFileDirectory.cpp in Sources */,
F56C895C131F42ED000AD0F6 /* MusicFileDirectory.cpp in Sources */,
F56C895D131F42ED000AD0F6 /* MythSession.cpp in Sources */,
- F56C895E131F42ED000AD0F6 /* FileSmb.cpp in Sources */,
F56C895F131F42ED000AD0F6 /* SMBDirectory.cpp in Sources */,
F56C8960131F42ED000AD0F6 /* MythDirectory.cpp in Sources */,
F56C8961131F42ED000AD0F6 /* MythFile.cpp in Sources */,
- F56C8962131F42ED000AD0F6 /* FileShoutcast.cpp in Sources */,
- F56C8963131F42ED000AD0F6 /* CacheMemBuffer.cpp in Sources */,
F56C8964131F42ED000AD0F6 /* CacheStrategy.cpp in Sources */,
F56C8965131F42ED000AD0F6 /* CDDADirectory.cpp in Sources */,
F56C8966131F42ED000AD0F6 /* DAAPDirectory.cpp in Sources */,
F56C8967131F42ED000AD0F6 /* DAVDirectory.cpp in Sources */,
F56C8968131F42ED000AD0F6 /* Directory.cpp in Sources */,
- F56C8969131F42ED000AD0F6 /* DirectoryCache.cpp in Sources */,
F56C896A131F42ED000AD0F6 /* DirectoryHistory.cpp in Sources */,
- F56C896B131F42ED000AD0F6 /* DirectoryTuxBox.cpp in Sources */,
F56C896C131F42ED000AD0F6 /* DllLibCurl.cpp in Sources */,
- F56C896D131F42ED000AD0F6 /* FactoryDirectory.cpp in Sources */,
- F56C896E131F42ED000AD0F6 /* FactoryFileDirectory.cpp in Sources */,
F56C896F131F42ED000AD0F6 /* File.cpp in Sources */,
- F56C8970131F42ED000AD0F6 /* FileCache.cpp in Sources */,
- F56C8971131F42ED000AD0F6 /* FileCDDA.cpp in Sources */,
- F56C8972131F42ED000AD0F6 /* FileCurl.cpp in Sources */,
- F56C8973131F42ED000AD0F6 /* FileDAAP.cpp in Sources */,
F56C8974131F42ED000AD0F6 /* FileFactory.cpp in Sources */,
- F56C8975131F42ED000AD0F6 /* FileFileReader.cpp in Sources */,
- F56C8976131F42ED000AD0F6 /* FileHD.cpp in Sources */,
- F56C8977131F42ED000AD0F6 /* FileISO.cpp in Sources */,
- F56C8978131F42ED000AD0F6 /* FileLastFM.cpp in Sources */,
- F56C8979131F42ED000AD0F6 /* FileMusicDatabase.cpp in Sources */,
- F56C897A131F42ED000AD0F6 /* FileRar.cpp in Sources */,
- F56C897B131F42ED000AD0F6 /* FileRTV.cpp in Sources */,
- F56C897C131F42ED000AD0F6 /* FileSFTP.cpp in Sources */,
- F56C897D131F42ED000AD0F6 /* FileSpecialProtocol.cpp in Sources */,
- F56C897E131F42ED000AD0F6 /* FileTuxBox.cpp in Sources */,
- F56C897F131F42ED000AD0F6 /* FileUDF.cpp in Sources */,
- F56C8981131F42ED000AD0F6 /* FileZip.cpp in Sources */,
F56C8982131F42ED000AD0F6 /* FTPDirectory.cpp in Sources */,
F56C8983131F42ED000AD0F6 /* FTPParse.cpp in Sources */,
F56C8984131F42ED000AD0F6 /* HDDirectory.cpp in Sources */,
- F56C8985131F42ED000AD0F6 /* HDHomeRun.cpp in Sources */,
F56C8986131F42ED000AD0F6 /* HTSPDirectory.cpp in Sources */,
F56C8987131F42ED000AD0F6 /* HTSPSession.cpp in Sources */,
F56C8988131F42ED000AD0F6 /* HTTPDirectory.cpp in Sources */,
@@ -6978,7 +6966,6 @@
F56C8BAB131F4466000AD0F6 /* XBMCEAGLView.mm in Sources */,
F57A1DB81329FAF700498CC7 /* SourcesDirectory.cpp in Sources */,
F5B13DCF1334490D0045076D /* DarwinUtils.mm in Sources */,
- 7C99B6E9133D36E200FC2B16 /* CacheCircular.cpp in Sources */,
7C99B7BE1340730000FC2B16 /* GUIDialogPlayEject.cpp in Sources */,
F5AE413D1341754C0004BD79 /* HttpApi.cpp in Sources */,
F5AE413E1341754C0004BD79 /* XBMChttp.cpp in Sources */,
@@ -6995,7 +6982,6 @@
18ACF8FD13597B5700B67371 /* RecentlyAddedJob.cpp in Sources */,
C80711AD135DB85F002F601B /* InputOperations.cpp in Sources */,
C8EC5D26136953E100CCC10D /* XBMC_keytable.cpp in Sources */,
- 18404DD61396C3F300863BBA /* Slingbox.cpp in Sources */,
1840B77A1399616D007C848B /* JSONVariantParser.cpp in Sources */,
1840B77B1399616D007C848B /* JSONVariantWriter.cpp in Sources */,
7C0A7EDE13A5DC2800AFC2BD /* AppParamParser.cpp in Sources */,
@@ -7003,7 +6989,6 @@
7C0A7F9D13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp in Sources */,
7C0A7FB213A9E72E00AFC2BD /* DirtyRegionSolvers.cpp in Sources */,
7C0A7FB313A9E72E00AFC2BD /* DirtyRegionTracker.cpp in Sources */,
- DF0DF17F13A3AF9F008ED511 /* FileNFS.cpp in Sources */,
DF0DF18013A3AF9F008ED511 /* NFSDirectory.cpp in Sources */,
7C89628013B7031E003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
1830219E13B8E37300770920 /* controledit.cpp in Sources */,
@@ -7019,10 +7004,8 @@
DFA6BE7713FED09C0048CC11 /* HttpParser.cpp in Sources */,
18968DDE14155E01005BA742 /* ApplicationOperations.cpp in Sources */,
DFCFC52A1413F7D60004D0BF /* AFPDirectory.cpp in Sources */,
- DFCFC52B1413F7D60004D0BF /* FileAFP.cpp in Sources */,
3291892B1423A9B700E878CD /* JpegIO.cpp in Sources */,
DF44856C140065C60069344B /* BXAcodec.cpp in Sources */,
- DF448571140065E10069344B /* FilePipe.cpp in Sources */,
DF448572140065E10069344B /* PipesManager.cpp in Sources */,
DF4485751400662D0069344B /* AirTunesServer.cpp in Sources */,
DF98D9991434F49500A6EBE1 /* SkinVariable.cpp in Sources */,
@@ -7040,7 +7023,6 @@
F5E112E8143577A000175026 /* GUIDialogPeripheralManager.cpp in Sources */,
F5E112E9143577A000175026 /* GUIDialogPeripheralSettings.cpp in Sources */,
F5E112EC143577A000175026 /* Peripherals.cpp in Sources */,
- DF6739E21443765F00A5A509 /* FileUPnP.cpp in Sources */,
F5BD034F148D496A001B5583 /* CryptThreading.cpp in Sources */,
7CCFD9991514950700211D82 /* PCMCodec.cpp in Sources */,
DF527757151BAF8200B5B63B /* WebSocket.cpp in Sources */,
@@ -7057,6 +7039,38 @@
DFCA6AEE15224671000BFAAE /* HTTPWebinterfaceAddonsHandler.cpp in Sources */,
DFCA6AEF15224671000BFAAE /* HTTPWebinterfaceHandler.cpp in Sources */,
DFCA6AF015224671000BFAAE /* IHTTPRequestHandler.cpp in Sources */,
+ DF93D7CF1444B105007C6459 /* AFPFile.cpp in Sources */,
+ DF93D7D21444B105007C6459 /* CDDAFile.cpp in Sources */,
+ DF93D7D31444B105007C6459 /* CurlFile.cpp in Sources */,
+ DF93D7D41444B105007C6459 /* DAAPFile.cpp in Sources */,
+ DF93D7D51444B105007C6459 /* DirectoryFactory.cpp in Sources */,
+ DF93D7D61444B105007C6459 /* FileDirectoryFactory.cpp in Sources */,
+ DF93D7D71444B105007C6459 /* FileReaderFile.cpp in Sources */,
+ DF93D7D81444B105007C6459 /* HDFile.cpp in Sources */,
+ DF93D7D91444B105007C6459 /* ISOFile.cpp in Sources */,
+ DF93D7DA1444B105007C6459 /* LastFMFile.cpp in Sources */,
+ DF93D7DB1444B105007C6459 /* MusicDatabaseFile.cpp in Sources */,
+ DF93D7DC1444B105007C6459 /* NFSFile.cpp in Sources */,
+ DF93D7DD1444B105007C6459 /* PipeFile.cpp in Sources */,
+ DF93D7DE1444B105007C6459 /* RarFile.cpp in Sources */,
+ DF93D7DF1444B105007C6459 /* RTVFile.cpp in Sources */,
+ DF93D7E01444B105007C6459 /* SFTPFile.cpp in Sources */,
+ DF93D7E11444B105007C6459 /* ShoutcastFile.cpp in Sources */,
+ DF93D7E21444B105007C6459 /* SlingboxDirectory.cpp in Sources */,
+ DF93D7E31444B105007C6459 /* SlingboxFile.cpp in Sources */,
+ DF93D7E41444B105007C6459 /* SmbFile.cpp in Sources */,
+ DF93D7E51444B105007C6459 /* SpecialProtocolFile.cpp in Sources */,
+ DF93D7E61444B105007C6459 /* TuxBoxDirectory.cpp in Sources */,
+ DF93D7E71444B105007C6459 /* TuxBoxFile.cpp in Sources */,
+ DF93D7E81444B105007C6459 /* UDFFile.cpp in Sources */,
+ DF93D7E91444B105007C6459 /* UPnPFile.cpp in Sources */,
+ DF93D7EA1444B105007C6459 /* ZipFile.cpp in Sources */,
+ DF93D81E1444B86B007C6459 /* HDHomeRunDirectory.cpp in Sources */,
+ DF93D81F1444B86B007C6459 /* HDHomeRunFile.cpp in Sources */,
+ DFDB00241516403A005079A4 /* CircularCache.cpp in Sources */,
+ DFDB00251516403A005079A4 /* DirectoryCache.cpp in Sources */,
+ DFDB00261516403A005079A4 /* FileCache.cpp in Sources */,
+ DFDB00271516403A005079A4 /* MemBufferCache.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index 5c4587a3a7..7a76d99e51 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -43,9 +43,7 @@
183C454D130C4D55006AA317 /* xbmcvfsmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 189047D11301DEAB00C11012 /* xbmcvfsmodule.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
183FDF8A11AF0B0500B81E9C /* PluginSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 183FDF8811AF0B0500B81E9C /* PluginSource.cpp */; };
183FDF8B11AF0B0500B81E9C /* PluginSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 183FDF8811AF0B0500B81E9C /* PluginSource.cpp */; };
- 18404D9E1396C13500863BBA /* Slingbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18404D9C1396C13500863BBA /* Slingbox.cpp */; };
18404DA61396C31B00863BBA /* SlingboxLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18404DA51396C31B00863BBA /* SlingboxLib.a */; };
- 18404E701396E05D00863BBA /* Slingbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18404D9C1396C13500863BBA /* Slingbox.cpp */; };
18404E711396E06C00863BBA /* SlingboxLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18404DA51396C31B00863BBA /* SlingboxLib.a */; };
1840B74D13993D8A007C848B /* JSONVariantParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B74B13993D8A007C848B /* JSONVariantParser.cpp */; };
1840B74E13993D8A007C848B /* JSONVariantParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B74B13993D8A007C848B /* JSONVariantParser.cpp */; };
@@ -397,10 +395,8 @@
432D7CE512D86DA500CE4C49 /* NetworkLinux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 432D7CE312D86DA500CE4C49 /* NetworkLinux.cpp */; };
432D7CF712D870E800CE4C49 /* TCPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 432D7CF612D870E800CE4C49 /* TCPServer.cpp */; };
432D7CF812D870E800CE4C49 /* TCPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 432D7CF612D870E800CE4C49 /* TCPServer.cpp */; };
- 433219D712E4C6A500CD7486 /* FileUDF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 433219D112E4C6A500CD7486 /* FileUDF.cpp */; };
433219D812E4C6A500CD7486 /* udf25.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 433219D312E4C6A500CD7486 /* udf25.cpp */; };
433219D912E4C6A500CD7486 /* UDFDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 433219D512E4C6A500CD7486 /* UDFDirectory.cpp */; };
- 433219DA12E4C6A500CD7486 /* FileUDF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 433219D112E4C6A500CD7486 /* FileUDF.cpp */; };
433219DB12E4C6A500CD7486 /* udf25.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 433219D312E4C6A500CD7486 /* udf25.cpp */; };
433219DC12E4C6A500CD7486 /* UDFDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 433219D512E4C6A500CD7486 /* UDFDirectory.cpp */; };
43348AA3107747CD00F859CF /* Edl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43348AA1107747CD00F859CF /* Edl.cpp */; };
@@ -553,8 +549,8 @@
7C8A14571154CB2600E5FCFA /* TextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C8A14541154CB2600E5FCFA /* TextureCache.cpp */; };
7C8A187C115B2A8200E5FCFA /* TextureDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C8A187A115B2A8200E5FCFA /* TextureDatabase.cpp */; };
7C8A187D115B2A8200E5FCFA /* TextureDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C8A187A115B2A8200E5FCFA /* TextureDatabase.cpp */; };
- 7C99B6A4133D342100FC2B16 /* CacheCircular.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B6A2133D342100FC2B16 /* CacheCircular.cpp */; };
- 7C99B6A5133D342100FC2B16 /* CacheCircular.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B6A2133D342100FC2B16 /* CacheCircular.cpp */; };
+ 7C99B6A4133D342100FC2B16 /* CircularCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B6A2133D342100FC2B16 /* CircularCache.cpp */; };
+ 7C99B6A5133D342100FC2B16 /* CircularCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B6A2133D342100FC2B16 /* CircularCache.cpp */; };
7C99B7951340723F00FC2B16 /* GUIDialogPlayEject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B7931340723F00FC2B16 /* GUIDialogPlayEject.cpp */; };
7C99B7961340723F00FC2B16 /* GUIDialogPlayEject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B7931340723F00FC2B16 /* GUIDialogPlayEject.cpp */; };
7CAA20511079C8160096DE39 /* BaseRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAA204F1079C8160096DE39 /* BaseRenderer.cpp */; };
@@ -621,12 +617,9 @@
C8D0B2AF1265A9A800F0C0AC /* SystemGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8D0B2AE1265A9A800F0C0AC /* SystemGlobals.cpp */; };
C8D0B2B01265A9A800F0C0AC /* SystemGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8D0B2AE1265A9A800F0C0AC /* SystemGlobals.cpp */; };
C8EC5D0E1369519D00CCC10D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D0C1369519D00CCC10D /* XBMC_keytable.cpp */; };
- DF0DF15B13A3ADA7008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF15713A3ADA7008ED511 /* FileNFS.cpp */; };
DF0DF15C13A3ADA7008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */; };
DF24A6B41406C7C500C7721E /* AFPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF24A6B01406C7C500C7721E /* AFPDirectory.cpp */; };
- DF24A6B51406C7C500C7721E /* FileAFP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF24A6B21406C7C500C7721E /* FileAFP.cpp */; };
DF24A6B61406C7C500C7721E /* AFPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF24A6B01406C7C500C7721E /* AFPDirectory.cpp */; };
- DF24A6B71406C7C500C7721E /* FileAFP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF24A6B21406C7C500C7721E /* FileAFP.cpp */; };
DF3488E713FD958F0026A711 /* GUIAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF3488E513FD958F0026A711 /* GUIAction.cpp */; };
DF3488E813FD958F0026A711 /* GUIAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF3488E513FD958F0026A711 /* GUIAction.cpp */; };
DF34892A13FD9C780026A711 /* AirPlayServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF34892813FD9C780026A711 /* AirPlayServer.cpp */; };
@@ -635,9 +628,7 @@
DF34898313FDAAF60026A711 /* HttpParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF34898113FDAAF60026A711 /* HttpParser.cpp */; };
DF448457140048A60069344B /* AirTunesServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF448455140048A60069344B /* AirTunesServer.cpp */; };
DF448458140048A60069344B /* AirTunesServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF448455140048A60069344B /* AirTunesServer.cpp */; };
- DF44845D140048C80069344B /* FilePipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF448459140048C80069344B /* FilePipe.cpp */; };
DF44845E140048C80069344B /* PipesManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF44845B140048C80069344B /* PipesManager.cpp */; };
- DF44845F140048C80069344B /* FilePipe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF448459140048C80069344B /* FilePipe.cpp */; };
DF448460140048C80069344B /* PipesManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF44845B140048C80069344B /* PipesManager.cpp */; };
DF4484EE140054530069344B /* BXAcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4484EC140054530069344B /* BXAcodec.cpp */; };
DF4484EF140054530069344B /* BXAcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF4484EC140054530069344B /* BXAcodec.cpp */; };
@@ -654,8 +645,66 @@
DF52773B151BAF4C00B5B63B /* WebSocketV13.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF52772F151BAF4C00B5B63B /* WebSocketV13.cpp */; };
DF52773C151BAF4C00B5B63B /* WebSocketV8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF527731151BAF4C00B5B63B /* WebSocketV8.cpp */; };
DF673AA51443819600A5A509 /* AddonManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF41152BFA5001AF8A6 /* AddonManager.cpp */; };
- DF85BAB51443669A000686BE /* FileUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF85BAB41443669A000686BE /* FileUPnP.cpp */; };
- DF85BAB61443669A000686BE /* FileUPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF85BAB41443669A000686BE /* FileUPnP.cpp */; };
+ DF93D65D1444A7A3007C6459 /* SlingboxDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D65C1444A7A3007C6459 /* SlingboxDirectory.cpp */; };
+ DF93D65E1444A7A3007C6459 /* SlingboxDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D65C1444A7A3007C6459 /* SlingboxDirectory.cpp */; };
+ DF93D6991444A8B1007C6459 /* AFPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6631444A8B0007C6459 /* AFPFile.cpp */; };
+ DF93D69A1444A8B1007C6459 /* DirectoryCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6651444A8B0007C6459 /* DirectoryCache.cpp */; };
+ DF93D69B1444A8B1007C6459 /* FileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6671444A8B0007C6459 /* FileCache.cpp */; };
+ DF93D69C1444A8B1007C6459 /* CDDAFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6691444A8B0007C6459 /* CDDAFile.cpp */; };
+ DF93D69D1444A8B1007C6459 /* CurlFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D66B1444A8B0007C6459 /* CurlFile.cpp */; };
+ DF93D69E1444A8B1007C6459 /* DAAPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D66D1444A8B0007C6459 /* DAAPFile.cpp */; };
+ DF93D69F1444A8B1007C6459 /* DirectoryFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D66F1444A8B0007C6459 /* DirectoryFactory.cpp */; };
+ DF93D6A01444A8B1007C6459 /* FileDirectoryFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6711444A8B0007C6459 /* FileDirectoryFactory.cpp */; };
+ DF93D6A11444A8B1007C6459 /* FileReaderFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6731444A8B0007C6459 /* FileReaderFile.cpp */; };
+ DF93D6A21444A8B1007C6459 /* HDFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6751444A8B0007C6459 /* HDFile.cpp */; };
+ DF93D6A31444A8B1007C6459 /* ISOFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6771444A8B0007C6459 /* ISOFile.cpp */; };
+ DF93D6A41444A8B1007C6459 /* LastFMFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6791444A8B0007C6459 /* LastFMFile.cpp */; };
+ DF93D6A51444A8B1007C6459 /* MusicDatabaseFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D67B1444A8B0007C6459 /* MusicDatabaseFile.cpp */; };
+ DF93D6A61444A8B1007C6459 /* NFSFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D67D1444A8B0007C6459 /* NFSFile.cpp */; };
+ DF93D6A71444A8B1007C6459 /* PipeFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D67F1444A8B0007C6459 /* PipeFile.cpp */; };
+ DF93D6A81444A8B1007C6459 /* RarFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6811444A8B0007C6459 /* RarFile.cpp */; };
+ DF93D6A91444A8B1007C6459 /* RTVFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6831444A8B0007C6459 /* RTVFile.cpp */; };
+ DF93D6AA1444A8B1007C6459 /* SFTPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6851444A8B0007C6459 /* SFTPFile.cpp */; };
+ DF93D6AB1444A8B1007C6459 /* ShoutcastFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6871444A8B0007C6459 /* ShoutcastFile.cpp */; };
+ DF93D6AC1444A8B1007C6459 /* SlingboxFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6891444A8B0007C6459 /* SlingboxFile.cpp */; };
+ DF93D6AD1444A8B1007C6459 /* SmbFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D68B1444A8B0007C6459 /* SmbFile.cpp */; };
+ DF93D6AE1444A8B1007C6459 /* SpecialProtocolFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D68D1444A8B0007C6459 /* SpecialProtocolFile.cpp */; };
+ DF93D6AF1444A8B1007C6459 /* TuxBoxDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D68F1444A8B0007C6459 /* TuxBoxDirectory.cpp */; };
+ DF93D6B01444A8B1007C6459 /* TuxBoxFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6911444A8B0007C6459 /* TuxBoxFile.cpp */; };
+ DF93D6B11444A8B1007C6459 /* UDFFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6931444A8B0007C6459 /* UDFFile.cpp */; };
+ DF93D6B21444A8B1007C6459 /* UPnPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6951444A8B0007C6459 /* UPnPFile.cpp */; };
+ DF93D6B31444A8B1007C6459 /* ZipFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6971444A8B0007C6459 /* ZipFile.cpp */; };
+ DF93D6B41444A8B1007C6459 /* AFPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6631444A8B0007C6459 /* AFPFile.cpp */; };
+ DF93D6B51444A8B1007C6459 /* DirectoryCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6651444A8B0007C6459 /* DirectoryCache.cpp */; };
+ DF93D6B61444A8B1007C6459 /* FileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6671444A8B0007C6459 /* FileCache.cpp */; };
+ DF93D6B71444A8B1007C6459 /* CDDAFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6691444A8B0007C6459 /* CDDAFile.cpp */; };
+ DF93D6B81444A8B1007C6459 /* CurlFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D66B1444A8B0007C6459 /* CurlFile.cpp */; };
+ DF93D6B91444A8B1007C6459 /* DAAPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D66D1444A8B0007C6459 /* DAAPFile.cpp */; };
+ DF93D6BA1444A8B1007C6459 /* DirectoryFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D66F1444A8B0007C6459 /* DirectoryFactory.cpp */; };
+ DF93D6BB1444A8B1007C6459 /* FileDirectoryFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6711444A8B0007C6459 /* FileDirectoryFactory.cpp */; };
+ DF93D6BC1444A8B1007C6459 /* FileReaderFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6731444A8B0007C6459 /* FileReaderFile.cpp */; };
+ DF93D6BD1444A8B1007C6459 /* HDFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6751444A8B0007C6459 /* HDFile.cpp */; };
+ DF93D6BE1444A8B1007C6459 /* ISOFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6771444A8B0007C6459 /* ISOFile.cpp */; };
+ DF93D6BF1444A8B1007C6459 /* LastFMFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6791444A8B0007C6459 /* LastFMFile.cpp */; };
+ DF93D6C01444A8B1007C6459 /* MusicDatabaseFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D67B1444A8B0007C6459 /* MusicDatabaseFile.cpp */; };
+ DF93D6C11444A8B1007C6459 /* NFSFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D67D1444A8B0007C6459 /* NFSFile.cpp */; };
+ DF93D6C21444A8B1007C6459 /* PipeFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D67F1444A8B0007C6459 /* PipeFile.cpp */; };
+ DF93D6C31444A8B1007C6459 /* RarFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6811444A8B0007C6459 /* RarFile.cpp */; };
+ DF93D6C41444A8B1007C6459 /* RTVFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6831444A8B0007C6459 /* RTVFile.cpp */; };
+ DF93D6C51444A8B1007C6459 /* SFTPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6851444A8B0007C6459 /* SFTPFile.cpp */; };
+ DF93D6C61444A8B1007C6459 /* ShoutcastFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6871444A8B0007C6459 /* ShoutcastFile.cpp */; };
+ DF93D6C71444A8B1007C6459 /* SlingboxFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6891444A8B0007C6459 /* SlingboxFile.cpp */; };
+ DF93D6C81444A8B1007C6459 /* SmbFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D68B1444A8B0007C6459 /* SmbFile.cpp */; };
+ DF93D6C91444A8B1007C6459 /* SpecialProtocolFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D68D1444A8B0007C6459 /* SpecialProtocolFile.cpp */; };
+ DF93D6CA1444A8B1007C6459 /* TuxBoxDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D68F1444A8B0007C6459 /* TuxBoxDirectory.cpp */; };
+ DF93D6CB1444A8B1007C6459 /* TuxBoxFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6911444A8B0007C6459 /* TuxBoxFile.cpp */; };
+ DF93D6CC1444A8B1007C6459 /* UDFFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6931444A8B0007C6459 /* UDFFile.cpp */; };
+ DF93D6CD1444A8B1007C6459 /* UPnPFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6951444A8B0007C6459 /* UPnPFile.cpp */; };
+ DF93D6CE1444A8B1007C6459 /* ZipFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6971444A8B0007C6459 /* ZipFile.cpp */; };
+ DF93D7F21444B54A007C6459 /* HDHomeRunFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7F01444B54A007C6459 /* HDHomeRunFile.cpp */; };
+ DF93D7F31444B54A007C6459 /* HDHomeRunFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7F01444B54A007C6459 /* HDHomeRunFile.cpp */; };
+ DF93D7F61444B568007C6459 /* HDHomeRunDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7F51444B568007C6459 /* HDHomeRunDirectory.cpp */; };
+ DF93D7F71444B568007C6459 /* HDHomeRunDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D7F51444B568007C6459 /* HDHomeRunDirectory.cpp */; };
DF98D98C1434F47D00A6EBE1 /* SkinVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF98D98A1434F47D00A6EBE1 /* SkinVariable.cpp */; };
DF98D98D1434F47D00A6EBE1 /* SkinVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF98D98A1434F47D00A6EBE1 /* SkinVariable.cpp */; };
DFAB049813F8376700B70BFB /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */; };
@@ -786,38 +835,20 @@
E38E1FFC0D25F9FD00618676 /* DynamicDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E168C0D25F9FA00618676 /* DynamicDll.cpp */; };
E38E1FFE0D25F9FD00618676 /* Favourites.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16900D25F9FA00618676 /* Favourites.cpp */; };
E38E1FFF0D25F9FD00618676 /* FileItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16920D25F9FA00618676 /* FileItem.cpp */; };
- E38E20010D25F9FD00618676 /* CacheMemBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16970D25F9FA00618676 /* CacheMemBuffer.cpp */; };
+ E38E20010D25F9FD00618676 /* MemBufferCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16970D25F9FA00618676 /* MemBufferCache.cpp */; };
E38E20020D25F9FD00618676 /* CacheStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16990D25F9FA00618676 /* CacheStrategy.cpp */; };
E38E20030D25F9FD00618676 /* CDDADirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E169B0D25F9FA00618676 /* CDDADirectory.cpp */; };
E38E20040D25F9FD00618676 /* cddb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E169D0D25F9FA00618676 /* cddb.cpp */; };
E38E20050D25F9FD00618676 /* cdioSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E169F0D25F9FA00618676 /* cdioSupport.cpp */; };
E38E20060D25F9FD00618676 /* DAAPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16AA0D25F9FA00618676 /* DAAPDirectory.cpp */; };
E38E20070D25F9FD00618676 /* Directory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16AC0D25F9FA00618676 /* Directory.cpp */; };
- E38E20080D25F9FD00618676 /* DirectoryCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16AE0D25F9FA00618676 /* DirectoryCache.cpp */; };
E38E20090D25F9FD00618676 /* DirectoryHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B00D25F9FA00618676 /* DirectoryHistory.cpp */; };
- E38E200A0D25F9FD00618676 /* DirectoryTuxBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B20D25F9FA00618676 /* DirectoryTuxBox.cpp */; };
E38E200B0D25F9FD00618676 /* DllLibCurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B40D25F9FA00618676 /* DllLibCurl.cpp */; };
- E38E200C0D25F9FD00618676 /* FactoryDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B60D25F9FA00618676 /* FactoryDirectory.cpp */; };
- E38E200D0D25F9FD00618676 /* FactoryFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B80D25F9FA00618676 /* FactoryFileDirectory.cpp */; };
E38E200E0D25F9FD00618676 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16BA0D25F9FA00618676 /* File.cpp */; };
- E38E200F0D25F9FD00618676 /* FileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16BC0D25F9FA00618676 /* FileCache.cpp */; };
- E38E20100D25F9FD00618676 /* FileCDDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16BE0D25F9FA00618676 /* FileCDDA.cpp */; };
- E38E20110D25F9FD00618676 /* FileCurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C00D25F9FA00618676 /* FileCurl.cpp */; };
- E38E20120D25F9FD00618676 /* FileDAAP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C20D25F9FA00618676 /* FileDAAP.cpp */; };
E38E20130D25F9FD00618676 /* FileFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C40D25F9FA00618676 /* FileFactory.cpp */; };
- E38E20140D25F9FD00618676 /* FileFileReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C60D25F9FA00618676 /* FileFileReader.cpp */; };
- E38E20160D25F9FD00618676 /* FileHD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16CA0D25F9FA00618676 /* FileHD.cpp */; };
- E38E20170D25F9FD00618676 /* FileISO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16CC0D25F9FA00618676 /* FileISO.cpp */; };
- E38E20180D25F9FD00618676 /* FileLastFM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16CE0D25F9FA00618676 /* FileLastFM.cpp */; };
- E38E201A0D25F9FD00618676 /* FileMusicDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16D20D25F9FA00618676 /* FileMusicDatabase.cpp */; };
- E38E201B0D25F9FD00618676 /* FileRar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16D40D25F9FA00618676 /* FileRar.cpp */; };
- E38E201C0D25F9FD00618676 /* FileRTV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16D60D25F9FA00618676 /* FileRTV.cpp */; };
- E38E20200D25F9FD00618676 /* FileTuxBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16DE0D25F9FA00618676 /* FileTuxBox.cpp */; };
- E38E20220D25F9FD00618676 /* FileZip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E20D25F9FA00618676 /* FileZip.cpp */; };
E38E20230D25F9FD00618676 /* FTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E40D25F9FA00618676 /* FTPDirectory.cpp */; };
E38E20240D25F9FD00618676 /* FTPParse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E60D25F9FA00618676 /* FTPParse.cpp */; };
E38E20250D25F9FD00618676 /* HDDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E80D25F9FA00618676 /* HDDirectory.cpp */; };
- E38E20260D25F9FD00618676 /* HDHomeRun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16EA0D25F9FA00618676 /* HDHomeRun.cpp */; };
E38E20270D25F9FD00618676 /* IDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16EC0D25F9FA00618676 /* IDirectory.cpp */; };
E38E20280D25F9FD00618676 /* IFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16EE0D25F9FA00618676 /* IFile.cpp */; };
E38E20290D25F9FD00618676 /* iso9660.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16F10D25F9FA00618676 /* iso9660.cpp */; };
@@ -1151,12 +1182,10 @@
E38E25BB0D263CE000618676 /* xbmcplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E259C0D263CE000618676 /* xbmcplugin.cpp */; settings = {COMPILER_FLAGS = "-I$XBMC_DEPENDS/include/python2.6"; }; };
E38E25C00D263DC100618676 /* DVDFactoryDemuxer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25BF0D263DC100618676 /* DVDFactoryDemuxer.cpp */; };
E38E25C30D263DE200618676 /* DVDDemuxFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25C20D263DE200618676 /* DVDDemuxFFmpeg.cpp */; };
- E38F12C20D29FF200035C331 /* FileShoutcast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38F12C10D29FF200035C331 /* FileShoutcast.cpp */; };
E3A4780A0D29029A00F3C3A6 /* GUIDialogCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3A478090D29029A00F3C3A6 /* GUIDialogCache.cpp */; };
E3A4781A0D29032C00F3C3A6 /* GUIDialogAccessPoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3A478190D29032C00F3C3A6 /* GUIDialogAccessPoints.cpp */; };
E3B53E7C0D97B08100021A96 /* DVDSubtitleParserMicroDVD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3B53E7A0D97B08100021A96 /* DVDSubtitleParserMicroDVD.cpp */; };
E3BBB7990D7EA78A00CAAFD3 /* MythSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3BBB7980D7EA78A00CAAFD3 /* MythSession.cpp */; };
- E3DAAF8C0D6E1B0500F17647 /* FileSmb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3DAAF8A0D6E1B0500F17647 /* FileSmb.cpp */; };
E3DAAF8D0D6E1B0500F17647 /* SMBDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3DAAF8B0D6E1B0500F17647 /* SMBDirectory.cpp */; };
E3E91FFD0D8C61DF002BF43D /* EventPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3E91FFA0D8C61DF002BF43D /* EventPacket.cpp */; };
E3E91FFE0D8C61DF002BF43D /* EventServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3E91FFB0D8C61DF002BF43D /* EventServer.cpp */; };
@@ -1229,7 +1258,6 @@
F558F28013ABD57400631E12 /* DirtyRegionTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F558F27D13ABD57400631E12 /* DirtyRegionTracker.cpp */; };
F558F29613ABD7DF00631E12 /* GUIWindowDebugInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F558F29413ABD7DF00631E12 /* GUIWindowDebugInfo.cpp */; };
F558F29713ABD7DF00631E12 /* GUIWindowDebugInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F558F29413ABD7DF00631E12 /* GUIWindowDebugInfo.cpp */; };
- F558F3D013AE663300631E12 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF15713A3ADA7008ED511 /* FileNFS.cpp */; };
F558F3D113AE663A00631E12 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */; };
F56579AF13060D1E0085ED7F /* RenderCapture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56579AD13060D1E0085ED7F /* RenderCapture.cpp */; };
F56A084B0F4A18FB003F9F87 /* karaokewindowbackground.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56A084A0F4A18FB003F9F87 /* karaokewindowbackground.cpp */; };
@@ -1249,7 +1277,6 @@
F57A1D1F1329B15300498CC7 /* AutoPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = F57A1D1D1329B15300498CC7 /* AutoPool.mm */; };
F57B6F801071B8B500079ACB /* JobManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F57B6F7E1071B8B500079ACB /* JobManager.cpp */; };
F57B6F811071B8B500079ACB /* JobManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F57B6F7E1071B8B500079ACB /* JobManager.cpp */; };
- F584E1290F257BD800DB26A5 /* FileSpecialProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F584E1270F257BD800DB26A5 /* FileSpecialProtocol.cpp */; };
F584E12E0F257C5100DB26A5 /* HTTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F584E12D0F257C5100DB26A5 /* HTTPDirectory.cpp */; };
F58E293911FFC103006F4D46 /* DVDInputStreamBluray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58E293711FFC103006F4D46 /* DVDInputStreamBluray.cpp */; };
F58E293A11FFC103006F4D46 /* DVDInputStreamBluray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F58E293711FFC103006F4D46 /* DVDInputStreamBluray.cpp */; };
@@ -1373,38 +1400,20 @@
F5A1C93E0F6B06CF00A96ABD /* DynamicDll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E168C0D25F9FA00618676 /* DynamicDll.cpp */; };
F5A1C9400F6B06CF00A96ABD /* Favourites.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16900D25F9FA00618676 /* Favourites.cpp */; };
F5A1C9410F6B06CF00A96ABD /* FileItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16920D25F9FA00618676 /* FileItem.cpp */; };
- F5A1C9420F6B06CF00A96ABD /* CacheMemBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16970D25F9FA00618676 /* CacheMemBuffer.cpp */; };
+ F5A1C9420F6B06CF00A96ABD /* MemBufferCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16970D25F9FA00618676 /* MemBufferCache.cpp */; };
F5A1C9430F6B06CF00A96ABD /* CacheStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16990D25F9FA00618676 /* CacheStrategy.cpp */; };
F5A1C9440F6B06CF00A96ABD /* CDDADirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E169B0D25F9FA00618676 /* CDDADirectory.cpp */; };
F5A1C9450F6B06CF00A96ABD /* cddb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E169D0D25F9FA00618676 /* cddb.cpp */; };
F5A1C9460F6B06CF00A96ABD /* cdioSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E169F0D25F9FA00618676 /* cdioSupport.cpp */; };
F5A1C9470F6B06CF00A96ABD /* DAAPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16AA0D25F9FA00618676 /* DAAPDirectory.cpp */; };
F5A1C9480F6B06CF00A96ABD /* Directory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16AC0D25F9FA00618676 /* Directory.cpp */; };
- F5A1C9490F6B06CF00A96ABD /* DirectoryCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16AE0D25F9FA00618676 /* DirectoryCache.cpp */; };
F5A1C94A0F6B06CF00A96ABD /* DirectoryHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B00D25F9FA00618676 /* DirectoryHistory.cpp */; };
- F5A1C94B0F6B06CF00A96ABD /* DirectoryTuxBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B20D25F9FA00618676 /* DirectoryTuxBox.cpp */; };
F5A1C94C0F6B06CF00A96ABD /* DllLibCurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B40D25F9FA00618676 /* DllLibCurl.cpp */; };
- F5A1C94D0F6B06CF00A96ABD /* FactoryDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B60D25F9FA00618676 /* FactoryDirectory.cpp */; };
- F5A1C94E0F6B06CF00A96ABD /* FactoryFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16B80D25F9FA00618676 /* FactoryFileDirectory.cpp */; };
F5A1C94F0F6B06CF00A96ABD /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16BA0D25F9FA00618676 /* File.cpp */; };
- F5A1C9500F6B06CF00A96ABD /* FileCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16BC0D25F9FA00618676 /* FileCache.cpp */; };
- F5A1C9510F6B06CF00A96ABD /* FileCDDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16BE0D25F9FA00618676 /* FileCDDA.cpp */; };
- F5A1C9520F6B06CF00A96ABD /* FileCurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C00D25F9FA00618676 /* FileCurl.cpp */; };
- F5A1C9530F6B06CF00A96ABD /* FileDAAP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C20D25F9FA00618676 /* FileDAAP.cpp */; };
F5A1C9540F6B06CF00A96ABD /* FileFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C40D25F9FA00618676 /* FileFactory.cpp */; };
- F5A1C9550F6B06CF00A96ABD /* FileFileReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16C60D25F9FA00618676 /* FileFileReader.cpp */; };
- F5A1C9560F6B06CF00A96ABD /* FileHD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16CA0D25F9FA00618676 /* FileHD.cpp */; };
- F5A1C9570F6B06CF00A96ABD /* FileISO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16CC0D25F9FA00618676 /* FileISO.cpp */; };
- F5A1C9580F6B06CF00A96ABD /* FileLastFM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16CE0D25F9FA00618676 /* FileLastFM.cpp */; };
- F5A1C9590F6B06CF00A96ABD /* FileMusicDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16D20D25F9FA00618676 /* FileMusicDatabase.cpp */; };
- F5A1C95A0F6B06CF00A96ABD /* FileRar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16D40D25F9FA00618676 /* FileRar.cpp */; };
- F5A1C95B0F6B06CF00A96ABD /* FileRTV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16D60D25F9FA00618676 /* FileRTV.cpp */; };
- F5A1C95C0F6B06CF00A96ABD /* FileTuxBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16DE0D25F9FA00618676 /* FileTuxBox.cpp */; };
- F5A1C95D0F6B06CF00A96ABD /* FileZip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E20D25F9FA00618676 /* FileZip.cpp */; };
F5A1C95E0F6B06CF00A96ABD /* FTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E40D25F9FA00618676 /* FTPDirectory.cpp */; };
F5A1C95F0F6B06CF00A96ABD /* FTPParse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E60D25F9FA00618676 /* FTPParse.cpp */; };
F5A1C9600F6B06CF00A96ABD /* HDDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16E80D25F9FA00618676 /* HDDirectory.cpp */; };
- F5A1C9610F6B06CF00A96ABD /* HDHomeRun.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16EA0D25F9FA00618676 /* HDHomeRun.cpp */; };
F5A1C9620F6B06CF00A96ABD /* IDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16EC0D25F9FA00618676 /* IDirectory.cpp */; };
F5A1C9630F6B06CF00A96ABD /* IFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16EE0D25F9FA00618676 /* IFile.cpp */; };
F5A1C9640F6B06CF00A96ABD /* iso9660.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E16F10D25F9FA00618676 /* iso9660.cpp */; };
@@ -1729,14 +1738,12 @@
F5A1CB1A0F6B06CF00A96ABD /* DVDDemuxFFmpeg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E25C20D263DE200618676 /* DVDDemuxFFmpeg.cpp */; };
F5A1CB1B0F6B06CF00A96ABD /* GUIDialogCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3A478090D29029A00F3C3A6 /* GUIDialogCache.cpp */; };
F5A1CB1D0F6B06CF00A96ABD /* GUIDialogAccessPoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3A478190D29032C00F3C3A6 /* GUIDialogAccessPoints.cpp */; };
- F5A1CB1F0F6B06CF00A96ABD /* FileShoutcast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38F12C10D29FF200035C331 /* FileShoutcast.cpp */; };
F5A1CB220F6B06CF00A96ABD /* DVDPlayerCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E36578860D3AA7B40033CC1C /* DVDPlayerCodec.cpp */; };
F5A1CB230F6B06CF00A96ABD /* DVDDemuxVobsub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E33206370D5070AA00435CE3 /* DVDDemuxVobsub.cpp */; };
F5A1CB240F6B06CF00A96ABD /* DVDInputStreamTV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E33979940D62FD47004ECDDA /* DVDInputStreamTV.cpp */; };
F5A1CB250F6B06CF00A96ABD /* PltMediaConnect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 810C9F600D67BD2F0095F5DD /* PltMediaConnect.cpp */; };
F5A1CB3C0F6B06CF00A96ABD /* MythDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 810C9FA50D67D1FB0095F5DD /* MythDirectory.cpp */; };
F5A1CB3D0F6B06CF00A96ABD /* MythFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 810C9FA70D67D1FB0095F5DD /* MythFile.cpp */; };
- F5A1CB3E0F6B06CF00A96ABD /* FileSmb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3DAAF8A0D6E1B0500F17647 /* FileSmb.cpp */; };
F5A1CB3F0F6B06CF00A96ABD /* SMBDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3DAAF8B0D6E1B0500F17647 /* SMBDirectory.cpp */; };
F5A1CB410F6B06CF00A96ABD /* MythSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3BBB7980D7EA78A00CAAFD3 /* MythSession.cpp */; };
F5A1CB420F6B06CF00A96ABD /* EventPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E3E91FFA0D8C61DF002BF43D /* EventPacket.cpp */; };
@@ -1779,7 +1786,6 @@
F5A1CB7F0F6B06CF00A96ABD /* AudioRendererFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A00B070EFDDDFC00CD59F3 /* AudioRendererFactory.cpp */; };
F5A1CB800F6B06CF00A96ABD /* NullDirectSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A00B240EFDE44100CD59F3 /* NullDirectSound.cpp */; };
F5A1CB810F6B06CF00A96ABD /* ExternalPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C5608C40F1754930056433A /* ExternalPlayer.cpp */; };
- F5A1CB820F6B06CF00A96ABD /* FileSpecialProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F584E1270F257BD800DB26A5 /* FileSpecialProtocol.cpp */; };
F5A1CB830F6B06CF00A96ABD /* HTTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F584E12D0F257C5100DB26A5 /* HTTPDirectory.cpp */; };
F5A1CB840F6B06CF00A96ABD /* GUIDialogKaraokeSongSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F54C51D00F1E783200D46E3C /* GUIDialogKaraokeSongSelector.cpp */; };
F5A1CB850F6B06CF00A96ABD /* karaokelyricscdg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F54C51D40F1E784800D46E3C /* karaokelyricscdg.cpp */; };
@@ -1823,8 +1829,6 @@
F5A7A703112893E50059D6AA /* AnnouncementManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A700112893E50059D6AA /* AnnouncementManager.cpp */; };
F5A7A85B112908F00059D6AA /* WebServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A859112908F00059D6AA /* WebServer.cpp */; };
F5A7A85C112908F00059D6AA /* WebServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A859112908F00059D6AA /* WebServer.cpp */; };
- F5A7B376113AFB5F0059D6AA /* FileSFTP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7B374113AFB5F0059D6AA /* FileSFTP.cpp */; };
- F5A7B377113AFB5F0059D6AA /* FileSFTP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7B374113AFB5F0059D6AA /* FileSFTP.cpp */; };
F5A7B37E113AFB900059D6AA /* SFTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7B37C113AFB900059D6AA /* SFTPDirectory.cpp */; };
F5A7B37F113AFB900059D6AA /* SFTPDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7B37C113AFB900059D6AA /* SFTPDirectory.cpp */; };
F5A7B42C113CBB950059D6AA /* AddonsDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7B42B113CBB950059D6AA /* AddonsDirectory.cpp */; };
@@ -1976,8 +1980,6 @@
18308CB51303370800AA309E /* stdio_utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stdio_utf8.h; sourceTree = "<group>"; };
183FDF8811AF0B0500B81E9C /* PluginSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginSource.cpp; sourceTree = "<group>"; };
183FDF8911AF0B0500B81E9C /* PluginSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginSource.h; sourceTree = "<group>"; };
- 18404D9C1396C13500863BBA /* Slingbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Slingbox.cpp; sourceTree = "<group>"; };
- 18404D9D1396C13500863BBA /* Slingbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Slingbox.h; sourceTree = "<group>"; };
18404DA51396C31B00863BBA /* SlingboxLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = SlingboxLib.a; path = lib/SlingboxLib/SlingboxLib.a; sourceTree = "<group>"; };
1840B74B13993D8A007C848B /* JSONVariantParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONVariantParser.cpp; sourceTree = "<group>"; };
1840B74C13993D8A007C848B /* JSONVariantParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONVariantParser.h; sourceTree = "<group>"; };
@@ -2359,8 +2361,6 @@
432D7CE312D86DA500CE4C49 /* NetworkLinux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkLinux.cpp; sourceTree = "<group>"; };
432D7CF512D870D600CE4C49 /* TCPServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TCPServer.h; sourceTree = "<group>"; };
432D7CF612D870E800CE4C49 /* TCPServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TCPServer.cpp; sourceTree = "<group>"; };
- 433219D112E4C6A500CD7486 /* FileUDF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUDF.cpp; sourceTree = "<group>"; };
- 433219D212E4C6A500CD7486 /* FileUDF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUDF.h; sourceTree = "<group>"; };
433219D312E4C6A500CD7486 /* udf25.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = udf25.cpp; sourceTree = "<group>"; };
433219D412E4C6A500CD7486 /* udf25.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = udf25.h; sourceTree = "<group>"; };
433219D512E4C6A500CD7486 /* UDFDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UDFDirectory.cpp; sourceTree = "<group>"; };
@@ -2531,8 +2531,8 @@
7C8A14551154CB2600E5FCFA /* TextureCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureCache.h; sourceTree = "<group>"; };
7C8A187A115B2A8200E5FCFA /* TextureDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureDatabase.cpp; sourceTree = "<group>"; };
7C8A187B115B2A8200E5FCFA /* TextureDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureDatabase.h; sourceTree = "<group>"; };
- 7C99B6A2133D342100FC2B16 /* CacheCircular.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheCircular.cpp; sourceTree = "<group>"; };
- 7C99B6A3133D342100FC2B16 /* CacheCircular.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheCircular.h; sourceTree = "<group>"; };
+ 7C99B6A2133D342100FC2B16 /* CircularCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CircularCache.cpp; sourceTree = "<group>"; };
+ 7C99B6A3133D342100FC2B16 /* CircularCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularCache.h; sourceTree = "<group>"; };
7C99B7931340723F00FC2B16 /* GUIDialogPlayEject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPlayEject.cpp; sourceTree = "<group>"; };
7C99B7941340723F00FC2B16 /* GUIDialogPlayEject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPlayEject.h; sourceTree = "<group>"; };
7CAA204F1079C8160096DE39 /* BaseRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseRenderer.cpp; sourceTree = "<group>"; };
@@ -2626,14 +2626,10 @@
C8D0B2AE1265A9A800F0C0AC /* SystemGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemGlobals.cpp; sourceTree = "<group>"; };
C8EC5D0C1369519D00CCC10D /* XBMC_keytable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMC_keytable.cpp; sourceTree = "<group>"; };
C8EC5D0D1369519D00CCC10D /* XBMC_keytable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_keytable.h; sourceTree = "<group>"; };
- DF0DF15713A3ADA7008ED511 /* FileNFS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileNFS.cpp; sourceTree = "<group>"; };
- DF0DF15813A3ADA7008ED511 /* FileNFS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileNFS.h; sourceTree = "<group>"; };
DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSDirectory.cpp; sourceTree = "<group>"; };
DF0DF15A13A3ADA7008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = "<group>"; };
DF24A6B01406C7C500C7721E /* AFPDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AFPDirectory.cpp; sourceTree = "<group>"; };
DF24A6B11406C7C500C7721E /* AFPDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFPDirectory.h; sourceTree = "<group>"; };
- DF24A6B21406C7C500C7721E /* FileAFP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileAFP.cpp; sourceTree = "<group>"; };
- DF24A6B31406C7C500C7721E /* FileAFP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileAFP.h; sourceTree = "<group>"; };
DF3488E513FD958F0026A711 /* GUIAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIAction.cpp; sourceTree = "<group>"; };
DF3488E613FD958F0026A711 /* GUIAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIAction.h; sourceTree = "<group>"; };
DF34892813FD9C780026A711 /* AirPlayServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirPlayServer.cpp; sourceTree = "<group>"; };
@@ -2642,8 +2638,6 @@
DF34898113FDAAF60026A711 /* HttpParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpParser.cpp; sourceTree = "<group>"; };
DF448455140048A60069344B /* AirTunesServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AirTunesServer.cpp; sourceTree = "<group>"; };
DF448456140048A60069344B /* AirTunesServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AirTunesServer.h; sourceTree = "<group>"; };
- DF448459140048C80069344B /* FilePipe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilePipe.cpp; sourceTree = "<group>"; };
- DF44845A140048C80069344B /* FilePipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilePipe.h; sourceTree = "<group>"; };
DF44845B140048C80069344B /* PipesManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PipesManager.cpp; sourceTree = "<group>"; };
DF44845C140048C80069344B /* PipesManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipesManager.h; sourceTree = "<group>"; };
DF4484EC140054530069344B /* BXAcodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BXAcodec.cpp; sourceTree = "<group>"; };
@@ -2660,8 +2654,66 @@
DF527730151BAF4C00B5B63B /* WebSocketV13.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketV13.h; sourceTree = "<group>"; };
DF527731151BAF4C00B5B63B /* WebSocketV8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketV8.cpp; sourceTree = "<group>"; };
DF527732151BAF4C00B5B63B /* WebSocketV8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketV8.h; sourceTree = "<group>"; };
- DF85BAB31443669A000686BE /* FileUPnP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileUPnP.h; sourceTree = "<group>"; };
- DF85BAB41443669A000686BE /* FileUPnP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUPnP.cpp; sourceTree = "<group>"; };
+ DF93D65B1444A7A3007C6459 /* SlingboxDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlingboxDirectory.h; sourceTree = "<group>"; };
+ DF93D65C1444A7A3007C6459 /* SlingboxDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SlingboxDirectory.cpp; sourceTree = "<group>"; };
+ DF93D6631444A8B0007C6459 /* AFPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AFPFile.cpp; sourceTree = "<group>"; };
+ DF93D6641444A8B0007C6459 /* AFPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AFPFile.h; sourceTree = "<group>"; };
+ DF93D6651444A8B0007C6459 /* DirectoryCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryCache.cpp; sourceTree = "<group>"; };
+ DF93D6661444A8B0007C6459 /* DirectoryCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryCache.h; sourceTree = "<group>"; };
+ DF93D6671444A8B0007C6459 /* FileCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCache.cpp; sourceTree = "<group>"; };
+ DF93D6681444A8B0007C6459 /* FileCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCache.h; sourceTree = "<group>"; };
+ DF93D6691444A8B0007C6459 /* CDDAFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDDAFile.cpp; sourceTree = "<group>"; };
+ DF93D66A1444A8B0007C6459 /* CDDAFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDDAFile.h; sourceTree = "<group>"; };
+ DF93D66B1444A8B0007C6459 /* CurlFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CurlFile.cpp; sourceTree = "<group>"; };
+ DF93D66C1444A8B0007C6459 /* CurlFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurlFile.h; sourceTree = "<group>"; };
+ DF93D66D1444A8B0007C6459 /* DAAPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DAAPFile.cpp; sourceTree = "<group>"; };
+ DF93D66E1444A8B0007C6459 /* DAAPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DAAPFile.h; sourceTree = "<group>"; };
+ DF93D66F1444A8B0007C6459 /* DirectoryFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryFactory.cpp; sourceTree = "<group>"; };
+ DF93D6701444A8B0007C6459 /* DirectoryFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryFactory.h; sourceTree = "<group>"; };
+ DF93D6711444A8B0007C6459 /* FileDirectoryFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileDirectoryFactory.cpp; sourceTree = "<group>"; };
+ DF93D6721444A8B0007C6459 /* FileDirectoryFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileDirectoryFactory.h; sourceTree = "<group>"; };
+ DF93D6731444A8B0007C6459 /* FileReaderFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileReaderFile.cpp; sourceTree = "<group>"; };
+ DF93D6741444A8B0007C6459 /* FileReaderFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileReaderFile.h; sourceTree = "<group>"; };
+ DF93D6751444A8B0007C6459 /* HDFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDFile.cpp; sourceTree = "<group>"; };
+ DF93D6761444A8B0007C6459 /* HDFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDFile.h; sourceTree = "<group>"; };
+ DF93D6771444A8B0007C6459 /* ISOFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ISOFile.cpp; sourceTree = "<group>"; };
+ DF93D6781444A8B0007C6459 /* ISOFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISOFile.h; sourceTree = "<group>"; };
+ DF93D6791444A8B0007C6459 /* LastFMFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LastFMFile.cpp; sourceTree = "<group>"; };
+ DF93D67A1444A8B0007C6459 /* LastFMFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LastFMFile.h; sourceTree = "<group>"; };
+ DF93D67B1444A8B0007C6459 /* MusicDatabaseFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicDatabaseFile.cpp; sourceTree = "<group>"; };
+ DF93D67C1444A8B0007C6459 /* MusicDatabaseFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicDatabaseFile.h; sourceTree = "<group>"; };
+ DF93D67D1444A8B0007C6459 /* NFSFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSFile.cpp; sourceTree = "<group>"; };
+ DF93D67E1444A8B0007C6459 /* NFSFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSFile.h; sourceTree = "<group>"; };
+ DF93D67F1444A8B0007C6459 /* PipeFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PipeFile.cpp; sourceTree = "<group>"; };
+ DF93D6801444A8B0007C6459 /* PipeFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PipeFile.h; sourceTree = "<group>"; };
+ DF93D6811444A8B0007C6459 /* RarFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RarFile.cpp; sourceTree = "<group>"; };
+ DF93D6821444A8B0007C6459 /* RarFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RarFile.h; sourceTree = "<group>"; };
+ DF93D6831444A8B0007C6459 /* RTVFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTVFile.cpp; sourceTree = "<group>"; };
+ DF93D6841444A8B0007C6459 /* RTVFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTVFile.h; sourceTree = "<group>"; };
+ DF93D6851444A8B0007C6459 /* SFTPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SFTPFile.cpp; sourceTree = "<group>"; };
+ DF93D6861444A8B0007C6459 /* SFTPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFTPFile.h; sourceTree = "<group>"; };
+ DF93D6871444A8B0007C6459 /* ShoutcastFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShoutcastFile.cpp; sourceTree = "<group>"; };
+ DF93D6881444A8B0007C6459 /* ShoutcastFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShoutcastFile.h; sourceTree = "<group>"; };
+ DF93D6891444A8B0007C6459 /* SlingboxFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SlingboxFile.cpp; sourceTree = "<group>"; };
+ DF93D68A1444A8B0007C6459 /* SlingboxFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlingboxFile.h; sourceTree = "<group>"; };
+ DF93D68B1444A8B0007C6459 /* SmbFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmbFile.cpp; sourceTree = "<group>"; };
+ DF93D68C1444A8B0007C6459 /* SmbFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmbFile.h; sourceTree = "<group>"; };
+ DF93D68D1444A8B0007C6459 /* SpecialProtocolFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpecialProtocolFile.cpp; sourceTree = "<group>"; };
+ DF93D68E1444A8B0007C6459 /* SpecialProtocolFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpecialProtocolFile.h; sourceTree = "<group>"; };
+ DF93D68F1444A8B0007C6459 /* TuxBoxDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuxBoxDirectory.cpp; sourceTree = "<group>"; };
+ DF93D6901444A8B0007C6459 /* TuxBoxDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TuxBoxDirectory.h; sourceTree = "<group>"; };
+ DF93D6911444A8B0007C6459 /* TuxBoxFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TuxBoxFile.cpp; sourceTree = "<group>"; };
+ DF93D6921444A8B0007C6459 /* TuxBoxFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TuxBoxFile.h; sourceTree = "<group>"; };
+ DF93D6931444A8B0007C6459 /* UDFFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UDFFile.cpp; sourceTree = "<group>"; };
+ DF93D6941444A8B0007C6459 /* UDFFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UDFFile.h; sourceTree = "<group>"; };
+ DF93D6951444A8B0007C6459 /* UPnPFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnPFile.cpp; sourceTree = "<group>"; };
+ DF93D6961444A8B0007C6459 /* UPnPFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPFile.h; sourceTree = "<group>"; };
+ DF93D6971444A8B0007C6459 /* ZipFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZipFile.cpp; sourceTree = "<group>"; };
+ DF93D6981444A8B0007C6459 /* ZipFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipFile.h; sourceTree = "<group>"; };
+ DF93D7F01444B54A007C6459 /* HDHomeRunFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDHomeRunFile.cpp; sourceTree = "<group>"; };
+ DF93D7F11444B54A007C6459 /* HDHomeRunFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDHomeRunFile.h; sourceTree = "<group>"; };
+ DF93D7F41444B568007C6459 /* HDHomeRunDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDHomeRunDirectory.h; sourceTree = "<group>"; };
+ DF93D7F51444B568007C6459 /* HDHomeRunDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDHomeRunDirectory.cpp; sourceTree = "<group>"; };
DF98D98A1434F47D00A6EBE1 /* SkinVariable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkinVariable.cpp; sourceTree = "<group>"; };
DF98D98B1434F47D00A6EBE1 /* SkinVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkinVariable.h; sourceTree = "<group>"; };
DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
@@ -2941,8 +2993,8 @@
E38E16910D25F9FA00618676 /* Favourites.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Favourites.h; sourceTree = "<group>"; };
E38E16920D25F9FA00618676 /* FileItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileItem.cpp; sourceTree = "<group>"; };
E38E16930D25F9FA00618676 /* FileItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileItem.h; sourceTree = "<group>"; };
- E38E16970D25F9FA00618676 /* CacheMemBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheMemBuffer.cpp; sourceTree = "<group>"; };
- E38E16980D25F9FA00618676 /* CacheMemBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheMemBuffer.h; sourceTree = "<group>"; };
+ E38E16970D25F9FA00618676 /* MemBufferCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemBufferCache.cpp; sourceTree = "<group>"; };
+ E38E16980D25F9FA00618676 /* MemBufferCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemBufferCache.h; sourceTree = "<group>"; };
E38E16990D25F9FA00618676 /* CacheStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheStrategy.cpp; sourceTree = "<group>"; };
E38E169A0D25F9FA00618676 /* CacheStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheStrategy.h; sourceTree = "<group>"; };
E38E169B0D25F9FA00618676 /* CDDADirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CDDADirectory.cpp; sourceTree = "<group>"; };
@@ -2955,57 +3007,20 @@
E38E16AB0D25F9FA00618676 /* DAAPDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DAAPDirectory.h; sourceTree = "<group>"; };
E38E16AC0D25F9FA00618676 /* Directory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Directory.cpp; sourceTree = "<group>"; };
E38E16AD0D25F9FA00618676 /* Directory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Directory.h; sourceTree = "<group>"; };
- E38E16AE0D25F9FA00618676 /* DirectoryCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryCache.cpp; sourceTree = "<group>"; };
- E38E16AF0D25F9FA00618676 /* DirectoryCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryCache.h; sourceTree = "<group>"; };
E38E16B00D25F9FA00618676 /* DirectoryHistory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryHistory.cpp; sourceTree = "<group>"; };
E38E16B10D25F9FA00618676 /* DirectoryHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryHistory.h; sourceTree = "<group>"; };
- E38E16B20D25F9FA00618676 /* DirectoryTuxBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryTuxBox.cpp; sourceTree = "<group>"; };
- E38E16B30D25F9FA00618676 /* DirectoryTuxBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryTuxBox.h; sourceTree = "<group>"; };
E38E16B40D25F9FA00618676 /* DllLibCurl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DllLibCurl.cpp; sourceTree = "<group>"; };
E38E16B50D25F9FA00618676 /* DllLibCurl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllLibCurl.h; sourceTree = "<group>"; };
- E38E16B60D25F9FA00618676 /* FactoryDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FactoryDirectory.cpp; sourceTree = "<group>"; };
- E38E16B70D25F9FA00618676 /* FactoryDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FactoryDirectory.h; sourceTree = "<group>"; };
- E38E16B80D25F9FA00618676 /* FactoryFileDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FactoryFileDirectory.cpp; sourceTree = "<group>"; };
- E38E16B90D25F9FA00618676 /* FactoryFileDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FactoryFileDirectory.h; sourceTree = "<group>"; };
E38E16BA0D25F9FA00618676 /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = "<group>"; };
E38E16BB0D25F9FA00618676 /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
- E38E16BC0D25F9FA00618676 /* FileCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCache.cpp; sourceTree = "<group>"; };
- E38E16BD0D25F9FA00618676 /* FileCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCache.h; sourceTree = "<group>"; };
- E38E16BE0D25F9FA00618676 /* FileCDDA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCDDA.cpp; sourceTree = "<group>"; };
- E38E16BF0D25F9FA00618676 /* FileCDDA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCDDA.h; sourceTree = "<group>"; };
- E38E16C00D25F9FA00618676 /* FileCurl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileCurl.cpp; sourceTree = "<group>"; };
- E38E16C10D25F9FA00618676 /* FileCurl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileCurl.h; sourceTree = "<group>"; };
- E38E16C20D25F9FA00618676 /* FileDAAP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileDAAP.cpp; sourceTree = "<group>"; };
- E38E16C30D25F9FA00618676 /* FileDAAP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileDAAP.h; sourceTree = "<group>"; };
E38E16C40D25F9FA00618676 /* FileFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileFactory.cpp; sourceTree = "<group>"; };
E38E16C50D25F9FA00618676 /* FileFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileFactory.h; sourceTree = "<group>"; };
- E38E16C60D25F9FA00618676 /* FileFileReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileFileReader.cpp; sourceTree = "<group>"; };
- E38E16C70D25F9FA00618676 /* FileFileReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileFileReader.h; sourceTree = "<group>"; };
- E38E16CA0D25F9FA00618676 /* FileHD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileHD.cpp; sourceTree = "<group>"; };
- E38E16CB0D25F9FA00618676 /* FileHD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileHD.h; sourceTree = "<group>"; };
- E38E16CC0D25F9FA00618676 /* FileISO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileISO.cpp; sourceTree = "<group>"; };
- E38E16CD0D25F9FA00618676 /* FileISO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileISO.h; sourceTree = "<group>"; };
- E38E16CE0D25F9FA00618676 /* FileLastFM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileLastFM.cpp; sourceTree = "<group>"; };
- E38E16CF0D25F9FA00618676 /* FileLastFM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileLastFM.h; sourceTree = "<group>"; };
- E38E16D20D25F9FA00618676 /* FileMusicDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileMusicDatabase.cpp; sourceTree = "<group>"; };
- E38E16D30D25F9FA00618676 /* FileMusicDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileMusicDatabase.h; sourceTree = "<group>"; };
- E38E16D40D25F9FA00618676 /* FileRar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileRar.cpp; sourceTree = "<group>"; };
- E38E16D50D25F9FA00618676 /* FileRar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileRar.h; sourceTree = "<group>"; };
- E38E16D60D25F9FA00618676 /* FileRTV.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileRTV.cpp; sourceTree = "<group>"; };
- E38E16D70D25F9FA00618676 /* FileRTV.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileRTV.h; sourceTree = "<group>"; };
- E38E16DB0D25F9FA00618676 /* FileSmb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSmb.h; sourceTree = "<group>"; };
- E38E16DE0D25F9FA00618676 /* FileTuxBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileTuxBox.cpp; sourceTree = "<group>"; };
- E38E16DF0D25F9FA00618676 /* FileTuxBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileTuxBox.h; sourceTree = "<group>"; };
- E38E16E20D25F9FA00618676 /* FileZip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileZip.cpp; sourceTree = "<group>"; };
- E38E16E30D25F9FA00618676 /* FileZip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileZip.h; sourceTree = "<group>"; };
E38E16E40D25F9FA00618676 /* FTPDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FTPDirectory.cpp; sourceTree = "<group>"; };
E38E16E50D25F9FA00618676 /* FTPDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTPDirectory.h; sourceTree = "<group>"; };
E38E16E60D25F9FA00618676 /* FTPParse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FTPParse.cpp; sourceTree = "<group>"; };
E38E16E70D25F9FA00618676 /* FTPParse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTPParse.h; sourceTree = "<group>"; };
E38E16E80D25F9FA00618676 /* HDDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDDirectory.cpp; sourceTree = "<group>"; };
E38E16E90D25F9FA00618676 /* HDDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDDirectory.h; sourceTree = "<group>"; };
- E38E16EA0D25F9FA00618676 /* HDHomeRun.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HDHomeRun.cpp; sourceTree = "<group>"; };
- E38E16EB0D25F9FA00618676 /* HDHomeRun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HDHomeRun.h; sourceTree = "<group>"; };
E38E16EC0D25F9FA00618676 /* IDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDirectory.cpp; sourceTree = "<group>"; };
E38E16ED0D25F9FA00618676 /* IDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDirectory.h; sourceTree = "<group>"; };
E38E16EE0D25F9FA00618676 /* IFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IFile.cpp; sourceTree = "<group>"; };
@@ -3716,13 +3731,11 @@
E38E259C0D263CE000618676 /* xbmcplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbmcplugin.cpp; sourceTree = "<group>"; };
E38E25BF0D263DC100618676 /* DVDFactoryDemuxer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDFactoryDemuxer.cpp; sourceTree = "<group>"; };
E38E25C20D263DE200618676 /* DVDDemuxFFmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDDemuxFFmpeg.cpp; sourceTree = "<group>"; };
- E38F12C10D29FF200035C331 /* FileShoutcast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileShoutcast.cpp; sourceTree = "<group>"; };
E3A478090D29029A00F3C3A6 /* GUIDialogCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogCache.cpp; sourceTree = "<group>"; };
E3A478190D29032C00F3C3A6 /* GUIDialogAccessPoints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogAccessPoints.cpp; sourceTree = "<group>"; };
E3B53E7A0D97B08100021A96 /* DVDSubtitleParserMicroDVD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDSubtitleParserMicroDVD.cpp; sourceTree = "<group>"; };
E3B53E7B0D97B08100021A96 /* DVDSubtitleParserMicroDVD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDSubtitleParserMicroDVD.h; sourceTree = "<group>"; };
E3BBB7980D7EA78A00CAAFD3 /* MythSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MythSession.cpp; sourceTree = "<group>"; };
- E3DAAF8A0D6E1B0500F17647 /* FileSmb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSmb.cpp; sourceTree = "<group>"; };
E3DAAF8B0D6E1B0500F17647 /* SMBDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SMBDirectory.cpp; sourceTree = "<group>"; };
E3E91FFA0D8C61DF002BF43D /* EventPacket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventPacket.cpp; sourceTree = "<group>"; };
E3E91FFB0D8C61DF002BF43D /* EventServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventServer.cpp; sourceTree = "<group>"; };
@@ -3837,8 +3850,6 @@
F57A1D1D1329B15300498CC7 /* AutoPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AutoPool.mm; sourceTree = "<group>"; };
F57B6F7E1071B8B500079ACB /* JobManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JobManager.cpp; sourceTree = "<group>"; };
F57B6F7F1071B8B500079ACB /* JobManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JobManager.h; sourceTree = "<group>"; };
- F584E1270F257BD800DB26A5 /* FileSpecialProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSpecialProtocol.cpp; sourceTree = "<group>"; };
- F584E1280F257BD800DB26A5 /* FileSpecialProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSpecialProtocol.h; sourceTree = "<group>"; };
F584E12C0F257C5100DB26A5 /* HTTPDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPDirectory.h; sourceTree = "<group>"; };
F584E12D0F257C5100DB26A5 /* HTTPDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTTPDirectory.cpp; sourceTree = "<group>"; };
F58E293711FFC103006F4D46 /* DVDInputStreamBluray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDInputStreamBluray.cpp; sourceTree = "<group>"; };
@@ -3873,8 +3884,6 @@
F5A7A701112893E50059D6AA /* AnnouncementManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnnouncementManager.h; sourceTree = "<group>"; };
F5A7A859112908F00059D6AA /* WebServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebServer.cpp; sourceTree = "<group>"; };
F5A7A85A112908F00059D6AA /* WebServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebServer.h; sourceTree = "<group>"; };
- F5A7B374113AFB5F0059D6AA /* FileSFTP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSFTP.cpp; sourceTree = "<group>"; };
- F5A7B375113AFB5F0059D6AA /* FileSFTP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSFTP.h; sourceTree = "<group>"; };
F5A7B37C113AFB900059D6AA /* SFTPDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SFTPDirectory.cpp; sourceTree = "<group>"; };
F5A7B37D113AFB900059D6AA /* SFTPDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFTPDirectory.h; sourceTree = "<group>"; };
F5A7B42A113CBB950059D6AA /* AddonsDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonsDirectory.h; sourceTree = "<group>"; };
@@ -5749,89 +5758,58 @@
F5A7B42A113CBB950059D6AA /* AddonsDirectory.h */,
DF24A6B01406C7C500C7721E /* AFPDirectory.cpp */,
DF24A6B11406C7C500C7721E /* AFPDirectory.h */,
+ DF93D6631444A8B0007C6459 /* AFPFile.cpp */,
+ DF93D6641444A8B0007C6459 /* AFPFile.h */,
88ACB0190DCF40800083CFDF /* ASAPFileDirectory.cpp */,
88ACB01A0DCF40800083CFDF /* ASAPFileDirectory.h */,
- 7C99B6A2133D342100FC2B16 /* CacheCircular.cpp */,
- 7C99B6A3133D342100FC2B16 /* CacheCircular.h */,
- E38E16970D25F9FA00618676 /* CacheMemBuffer.cpp */,
- E38E16980D25F9FA00618676 /* CacheMemBuffer.h */,
E38E16990D25F9FA00618676 /* CacheStrategy.cpp */,
E38E169A0D25F9FA00618676 /* CacheStrategy.h */,
E38E169B0D25F9FA00618676 /* CDDADirectory.cpp */,
E38E169C0D25F9FA00618676 /* CDDADirectory.h */,
+ DF93D6691444A8B0007C6459 /* CDDAFile.cpp */,
+ DF93D66A1444A8B0007C6459 /* CDDAFile.h */,
+ 7C99B6A2133D342100FC2B16 /* CircularCache.cpp */,
+ 7C99B6A3133D342100FC2B16 /* CircularCache.h */,
+ DF93D66B1444A8B0007C6459 /* CurlFile.cpp */,
+ DF93D66C1444A8B0007C6459 /* CurlFile.h */,
E38E16AA0D25F9FA00618676 /* DAAPDirectory.cpp */,
E38E16AB0D25F9FA00618676 /* DAAPDirectory.h */,
+ DF93D66D1444A8B0007C6459 /* DAAPFile.cpp */,
+ DF93D66E1444A8B0007C6459 /* DAAPFile.h */,
7C45DBE710F325C400D4BBF3 /* DAVDirectory.cpp */,
7C45DBE810F325C400D4BBF3 /* DAVDirectory.h */,
E38E16AC0D25F9FA00618676 /* Directory.cpp */,
E38E16AD0D25F9FA00618676 /* Directory.h */,
- E38E16AE0D25F9FA00618676 /* DirectoryCache.cpp */,
- E38E16AF0D25F9FA00618676 /* DirectoryCache.h */,
+ DF93D6651444A8B0007C6459 /* DirectoryCache.cpp */,
+ DF93D6661444A8B0007C6459 /* DirectoryCache.h */,
+ DF93D66F1444A8B0007C6459 /* DirectoryFactory.cpp */,
+ DF93D6701444A8B0007C6459 /* DirectoryFactory.h */,
E38E16B00D25F9FA00618676 /* DirectoryHistory.cpp */,
E38E16B10D25F9FA00618676 /* DirectoryHistory.h */,
- E38E16B20D25F9FA00618676 /* DirectoryTuxBox.cpp */,
- E38E16B30D25F9FA00618676 /* DirectoryTuxBox.h */,
E38E16B40D25F9FA00618676 /* DllLibCurl.cpp */,
E38E16B50D25F9FA00618676 /* DllLibCurl.h */,
- E38E16B60D25F9FA00618676 /* FactoryDirectory.cpp */,
- E38E16B70D25F9FA00618676 /* FactoryDirectory.h */,
- E38E16B80D25F9FA00618676 /* FactoryFileDirectory.cpp */,
- E38E16B90D25F9FA00618676 /* FactoryFileDirectory.h */,
E38E16BA0D25F9FA00618676 /* File.cpp */,
E38E16BB0D25F9FA00618676 /* File.h */,
- DF24A6B21406C7C500C7721E /* FileAFP.cpp */,
- DF24A6B31406C7C500C7721E /* FileAFP.h */,
- E38E16BC0D25F9FA00618676 /* FileCache.cpp */,
- E38E16BD0D25F9FA00618676 /* FileCache.h */,
- E38E16BE0D25F9FA00618676 /* FileCDDA.cpp */,
- E38E16BF0D25F9FA00618676 /* FileCDDA.h */,
- E38E16C00D25F9FA00618676 /* FileCurl.cpp */,
- E38E16C10D25F9FA00618676 /* FileCurl.h */,
- E38E16C20D25F9FA00618676 /* FileDAAP.cpp */,
- E38E16C30D25F9FA00618676 /* FileDAAP.h */,
+ DF93D6671444A8B0007C6459 /* FileCache.cpp */,
+ DF93D6681444A8B0007C6459 /* FileCache.h */,
+ DF93D6711444A8B0007C6459 /* FileDirectoryFactory.cpp */,
+ DF93D6721444A8B0007C6459 /* FileDirectoryFactory.h */,
E38E16C40D25F9FA00618676 /* FileFactory.cpp */,
E38E16C50D25F9FA00618676 /* FileFactory.h */,
- E38E16C60D25F9FA00618676 /* FileFileReader.cpp */,
- E38E16C70D25F9FA00618676 /* FileFileReader.h */,
- E38E16CA0D25F9FA00618676 /* FileHD.cpp */,
- E38E16CB0D25F9FA00618676 /* FileHD.h */,
- E38E16CC0D25F9FA00618676 /* FileISO.cpp */,
- E38E16CD0D25F9FA00618676 /* FileISO.h */,
- E38E16CE0D25F9FA00618676 /* FileLastFM.cpp */,
- E38E16CF0D25F9FA00618676 /* FileLastFM.h */,
- E38E16D20D25F9FA00618676 /* FileMusicDatabase.cpp */,
- E38E16D30D25F9FA00618676 /* FileMusicDatabase.h */,
- DF0DF15713A3ADA7008ED511 /* FileNFS.cpp */,
- DF0DF15813A3ADA7008ED511 /* FileNFS.h */,
- DF448459140048C80069344B /* FilePipe.cpp */,
- DF44845A140048C80069344B /* FilePipe.h */,
- E38E16D40D25F9FA00618676 /* FileRar.cpp */,
- E38E16D50D25F9FA00618676 /* FileRar.h */,
- E38E16D60D25F9FA00618676 /* FileRTV.cpp */,
- E38E16D70D25F9FA00618676 /* FileRTV.h */,
- F5A7B374113AFB5F0059D6AA /* FileSFTP.cpp */,
- F5A7B375113AFB5F0059D6AA /* FileSFTP.h */,
- E38F12C10D29FF200035C331 /* FileShoutcast.cpp */,
- E3DAAF8A0D6E1B0500F17647 /* FileSmb.cpp */,
- E38E16DB0D25F9FA00618676 /* FileSmb.h */,
- F584E1270F257BD800DB26A5 /* FileSpecialProtocol.cpp */,
- F584E1280F257BD800DB26A5 /* FileSpecialProtocol.h */,
- E38E16DE0D25F9FA00618676 /* FileTuxBox.cpp */,
- E38E16DF0D25F9FA00618676 /* FileTuxBox.h */,
- 433219D112E4C6A500CD7486 /* FileUDF.cpp */,
- 433219D212E4C6A500CD7486 /* FileUDF.h */,
- DF85BAB41443669A000686BE /* FileUPnP.cpp */,
- DF85BAB31443669A000686BE /* FileUPnP.h */,
- E38E16E20D25F9FA00618676 /* FileZip.cpp */,
- E38E16E30D25F9FA00618676 /* FileZip.h */,
+ DF93D6731444A8B0007C6459 /* FileReaderFile.cpp */,
+ DF93D6741444A8B0007C6459 /* FileReaderFile.h */,
E38E16E40D25F9FA00618676 /* FTPDirectory.cpp */,
E38E16E50D25F9FA00618676 /* FTPDirectory.h */,
E38E16E60D25F9FA00618676 /* FTPParse.cpp */,
E38E16E70D25F9FA00618676 /* FTPParse.h */,
E38E16E80D25F9FA00618676 /* HDDirectory.cpp */,
E38E16E90D25F9FA00618676 /* HDDirectory.h */,
- E38E16EA0D25F9FA00618676 /* HDHomeRun.cpp */,
- E38E16EB0D25F9FA00618676 /* HDHomeRun.h */,
+ DF93D6751444A8B0007C6459 /* HDFile.cpp */,
+ DF93D6761444A8B0007C6459 /* HDFile.h */,
+ DF93D7F51444B568007C6459 /* HDHomeRunDirectory.cpp */,
+ DF93D7F41444B568007C6459 /* HDHomeRunDirectory.h */,
+ DF93D7F01444B54A007C6459 /* HDHomeRunFile.cpp */,
+ DF93D7F11444B54A007C6459 /* HDHomeRunFile.h */,
E43196140FB2382E0030E150 /* HTSPDirectory.cpp */,
E43196130FB2382D0030E150 /* HTSPDirectory.h */,
E43196160FB2382E0030E150 /* HTSPSession.cpp */,
@@ -5847,14 +5825,22 @@
E38E16F20D25F9FA00618676 /* iso9660.h */,
E38E16F30D25F9FA00618676 /* ISO9660Directory.cpp */,
E38E16F40D25F9FA00618676 /* ISO9660Directory.h */,
+ DF93D6771444A8B0007C6459 /* ISOFile.cpp */,
+ DF93D6781444A8B0007C6459 /* ISOFile.h */,
E38E16F50D25F9FA00618676 /* LastFMDirectory.cpp */,
E38E16F60D25F9FA00618676 /* LastFMDirectory.h */,
+ DF93D6791444A8B0007C6459 /* LastFMFile.cpp */,
+ DF93D67A1444A8B0007C6459 /* LastFMFile.h */,
+ E38E16970D25F9FA00618676 /* MemBufferCache.cpp */,
+ E38E16980D25F9FA00618676 /* MemBufferCache.h */,
E38E17080D25F9FA00618676 /* MultiPathDirectory.cpp */,
E38E17090D25F9FA00618676 /* MultiPathDirectory.h */,
F50629780E57B9680066625A /* MultiPathFile.cpp */,
F50629790E57B9680066625A /* MultiPathFile.h */,
E38E17370D25F9FA00618676 /* MusicDatabaseDirectory.cpp */,
E38E17380D25F9FA00618676 /* MusicDatabaseDirectory.h */,
+ DF93D67B1444A8B0007C6459 /* MusicDatabaseFile.cpp */,
+ DF93D67C1444A8B0007C6459 /* MusicDatabaseFile.h */,
880DBE530DC224A100E26B71 /* MusicFileDirectory.cpp */,
880DBE540DC224A100E26B71 /* MusicFileDirectory.h */,
E38E17390D25F9FA00618676 /* MusicSearchDirectory.cpp */,
@@ -5866,11 +5852,15 @@
E3BBB7980D7EA78A00CAAFD3 /* MythSession.cpp */,
DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */,
DF0DF15A13A3ADA7008ED511 /* NFSDirectory.h */,
+ DF93D67D1444A8B0007C6459 /* NFSFile.cpp */,
+ DF93D67E1444A8B0007C6459 /* NFSFile.h */,
E4E91BB70E7F7338001F0546 /* NptXbmcFile.cpp */,
E38E173C0D25F9FA00618676 /* NSFFileDirectory.cpp */,
E38E173D0D25F9FA00618676 /* NSFFileDirectory.h */,
E38E173E0D25F9FA00618676 /* OGGFileDirectory.cpp */,
E38E173F0D25F9FA00618676 /* OGGFileDirectory.h */,
+ DF93D67F1444A8B0007C6459 /* PipeFile.cpp */,
+ DF93D6801444A8B0007C6459 /* PipeFile.h */,
DF44845B140048C80069344B /* PipesManager.cpp */,
DF44845C140048C80069344B /* PipesManager.h */,
E38E17400D25F9FA00618676 /* PlaylistDirectory.cpp */,
@@ -5881,40 +5871,62 @@
E38E17450D25F9FA00618676 /* PluginDirectory.h */,
E38E17460D25F9FA00618676 /* RarDirectory.cpp */,
E38E17470D25F9FA00618676 /* RarDirectory.h */,
+ DF93D6811444A8B0007C6459 /* RarFile.cpp */,
+ DF93D6821444A8B0007C6459 /* RarFile.h */,
E38E17480D25F9FA00618676 /* RarManager.cpp */,
E38E17490D25F9FA00618676 /* RarManager.h */,
889B4D8C0E0EF86C00FAD25E /* RSSDirectory.cpp */,
889B4D8D0E0EF86C00FAD25E /* RSSDirectory.h */,
E38E174B0D25F9FA00618676 /* RTVDirectory.cpp */,
E38E174C0D25F9FA00618676 /* RTVDirectory.h */,
+ DF93D6831444A8B0007C6459 /* RTVFile.cpp */,
+ DF93D6841444A8B0007C6459 /* RTVFile.h */,
E4DC97500FFE5BA8008E0C07 /* SAPDirectory.cpp */,
E4DC97510FFE5BA8008E0C07 /* SAPDirectory.h */,
E4DC97520FFE5BA8008E0C07 /* SAPFile.cpp */,
E4DC97530FFE5BA8008E0C07 /* SAPFile.h */,
F5A7B37C113AFB900059D6AA /* SFTPDirectory.cpp */,
F5A7B37D113AFB900059D6AA /* SFTPDirectory.h */,
+ DF93D6851444A8B0007C6459 /* SFTPFile.cpp */,
+ DF93D6861444A8B0007C6459 /* SFTPFile.h */,
+ DF93D6871444A8B0007C6459 /* ShoutcastFile.cpp */,
+ DF93D6881444A8B0007C6459 /* ShoutcastFile.h */,
E38E17510D25F9FA00618676 /* SIDFileDirectory.cpp */,
E38E17520D25F9FA00618676 /* SIDFileDirectory.h */,
- 18404D9C1396C13500863BBA /* Slingbox.cpp */,
- 18404D9D1396C13500863BBA /* Slingbox.h */,
+ DF93D65C1444A7A3007C6459 /* SlingboxDirectory.cpp */,
+ DF93D65B1444A7A3007C6459 /* SlingboxDirectory.h */,
+ DF93D6891444A8B0007C6459 /* SlingboxFile.cpp */,
+ DF93D68A1444A8B0007C6459 /* SlingboxFile.h */,
E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */,
E38E17540D25F9FA00618676 /* SmartPlaylistDirectory.h */,
E3DAAF8B0D6E1B0500F17647 /* SMBDirectory.cpp */,
E38E17560D25F9FA00618676 /* SMBDirectory.h */,
+ DF93D68B1444A8B0007C6459 /* SmbFile.cpp */,
+ DF93D68C1444A8B0007C6459 /* SmbFile.h */,
7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */,
7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */,
7C2D6AE20F35453E00DD2E85 /* SpecialProtocol.cpp */,
7C2D6AE30F35453E00DD2E85 /* SpecialProtocol.h */,
7CEBD8A60F33A0D800CAF6AD /* SpecialProtocolDirectory.cpp */,
7CEBD8A70F33A0D800CAF6AD /* SpecialProtocolDirectory.h */,
+ DF93D68D1444A8B0007C6459 /* SpecialProtocolFile.cpp */,
+ DF93D68E1444A8B0007C6459 /* SpecialProtocolFile.h */,
E38E17590D25F9FA00618676 /* StackDirectory.cpp */,
E38E175A0D25F9FA00618676 /* StackDirectory.h */,
+ DF93D68F1444A8B0007C6459 /* TuxBoxDirectory.cpp */,
+ DF93D6901444A8B0007C6459 /* TuxBoxDirectory.h */,
+ DF93D6911444A8B0007C6459 /* TuxBoxFile.cpp */,
+ DF93D6921444A8B0007C6459 /* TuxBoxFile.h */,
433219D312E4C6A500CD7486 /* udf25.cpp */,
433219D412E4C6A500CD7486 /* udf25.h */,
433219D512E4C6A500CD7486 /* UDFDirectory.cpp */,
433219D612E4C6A500CD7486 /* UDFDirectory.h */,
+ DF93D6931444A8B0007C6459 /* UDFFile.cpp */,
+ DF93D6941444A8B0007C6459 /* UDFFile.h */,
E38E175B0D25F9FA00618676 /* UPnPDirectory.cpp */,
E38E175C0D25F9FA00618676 /* UPnPDirectory.h */,
+ DF93D6951444A8B0007C6459 /* UPnPFile.cpp */,
+ DF93D6961444A8B0007C6459 /* UPnPFile.h */,
E38E178A0D25F9FA00618676 /* VideoDatabaseDirectory.cpp */,
E38E178B0D25F9FA00618676 /* VideoDatabaseDirectory.h */,
E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */,
@@ -5929,6 +5941,8 @@
E49ACD8A100745C400A86ECD /* ZeroconfDirectory.h */,
E38E17930D25F9FA00618676 /* ZipDirectory.cpp */,
E38E17940D25F9FA00618676 /* ZipDirectory.h */,
+ DF93D6971444A8B0007C6459 /* ZipFile.cpp */,
+ DF93D6981444A8B0007C6459 /* ZipFile.h */,
E38E17950D25F9FA00618676 /* ZipManager.cpp */,
E38E17960D25F9FA00618676 /* ZipManager.h */,
);
@@ -7339,38 +7353,20 @@
E38E1FFC0D25F9FD00618676 /* DynamicDll.cpp in Sources */,
E38E1FFE0D25F9FD00618676 /* Favourites.cpp in Sources */,
E38E1FFF0D25F9FD00618676 /* FileItem.cpp in Sources */,
- E38E20010D25F9FD00618676 /* CacheMemBuffer.cpp in Sources */,
+ E38E20010D25F9FD00618676 /* MemBufferCache.cpp in Sources */,
E38E20020D25F9FD00618676 /* CacheStrategy.cpp in Sources */,
E38E20030D25F9FD00618676 /* CDDADirectory.cpp in Sources */,
E38E20040D25F9FD00618676 /* cddb.cpp in Sources */,
E38E20050D25F9FD00618676 /* cdioSupport.cpp in Sources */,
E38E20060D25F9FD00618676 /* DAAPDirectory.cpp in Sources */,
E38E20070D25F9FD00618676 /* Directory.cpp in Sources */,
- E38E20080D25F9FD00618676 /* DirectoryCache.cpp in Sources */,
E38E20090D25F9FD00618676 /* DirectoryHistory.cpp in Sources */,
- E38E200A0D25F9FD00618676 /* DirectoryTuxBox.cpp in Sources */,
E38E200B0D25F9FD00618676 /* DllLibCurl.cpp in Sources */,
- E38E200C0D25F9FD00618676 /* FactoryDirectory.cpp in Sources */,
- E38E200D0D25F9FD00618676 /* FactoryFileDirectory.cpp in Sources */,
E38E200E0D25F9FD00618676 /* File.cpp in Sources */,
- E38E200F0D25F9FD00618676 /* FileCache.cpp in Sources */,
- E38E20100D25F9FD00618676 /* FileCDDA.cpp in Sources */,
- E38E20110D25F9FD00618676 /* FileCurl.cpp in Sources */,
- E38E20120D25F9FD00618676 /* FileDAAP.cpp in Sources */,
E38E20130D25F9FD00618676 /* FileFactory.cpp in Sources */,
- E38E20140D25F9FD00618676 /* FileFileReader.cpp in Sources */,
- E38E20160D25F9FD00618676 /* FileHD.cpp in Sources */,
- E38E20170D25F9FD00618676 /* FileISO.cpp in Sources */,
- E38E20180D25F9FD00618676 /* FileLastFM.cpp in Sources */,
- E38E201A0D25F9FD00618676 /* FileMusicDatabase.cpp in Sources */,
- E38E201B0D25F9FD00618676 /* FileRar.cpp in Sources */,
- E38E201C0D25F9FD00618676 /* FileRTV.cpp in Sources */,
- E38E20200D25F9FD00618676 /* FileTuxBox.cpp in Sources */,
- E38E20220D25F9FD00618676 /* FileZip.cpp in Sources */,
E38E20230D25F9FD00618676 /* FTPDirectory.cpp in Sources */,
E38E20240D25F9FD00618676 /* FTPParse.cpp in Sources */,
E38E20250D25F9FD00618676 /* HDDirectory.cpp in Sources */,
- E38E20260D25F9FD00618676 /* HDHomeRun.cpp in Sources */,
E38E20270D25F9FD00618676 /* IDirectory.cpp in Sources */,
E38E20280D25F9FD00618676 /* IFile.cpp in Sources */,
E38E20290D25F9FD00618676 /* iso9660.cpp in Sources */,
@@ -7695,14 +7691,12 @@
E38E25C30D263DE200618676 /* DVDDemuxFFmpeg.cpp in Sources */,
E3A4780A0D29029A00F3C3A6 /* GUIDialogCache.cpp in Sources */,
E3A4781A0D29032C00F3C3A6 /* GUIDialogAccessPoints.cpp in Sources */,
- E38F12C20D29FF200035C331 /* FileShoutcast.cpp in Sources */,
E36578880D3AA7B40033CC1C /* DVDPlayerCodec.cpp in Sources */,
E33206380D5070AA00435CE3 /* DVDDemuxVobsub.cpp in Sources */,
E33979960D62FD48004ECDDA /* DVDInputStreamTV.cpp in Sources */,
810C9F630D67BD2F0095F5DD /* PltMediaConnect.cpp in Sources */,
810C9FA90D67D1FB0095F5DD /* MythDirectory.cpp in Sources */,
810C9FAA0D67D1FB0095F5DD /* MythFile.cpp in Sources */,
- E3DAAF8C0D6E1B0500F17647 /* FileSmb.cpp in Sources */,
E3DAAF8D0D6E1B0500F17647 /* SMBDirectory.cpp in Sources */,
E3BBB7990D7EA78A00CAAFD3 /* MythSession.cpp in Sources */,
E3E91FFD0D8C61DF002BF43D /* EventPacket.cpp in Sources */,
@@ -7745,7 +7739,6 @@
F5A00B080EFDDDFC00CD59F3 /* AudioRendererFactory.cpp in Sources */,
F5A00B260EFDE44100CD59F3 /* NullDirectSound.cpp in Sources */,
7C5608C70F1754930056433A /* ExternalPlayer.cpp in Sources */,
- F584E1290F257BD800DB26A5 /* FileSpecialProtocol.cpp in Sources */,
F584E12E0F257C5100DB26A5 /* HTTPDirectory.cpp in Sources */,
F54C51D20F1E783200D46E3C /* GUIDialogKaraokeSongSelector.cpp in Sources */,
F54C51D50F1E784800D46E3C /* karaokelyricscdg.cpp in Sources */,
@@ -7896,7 +7889,6 @@
F5A7A702112893E50059D6AA /* AnnouncementManager.cpp in Sources */,
F5A7A85B112908F00059D6AA /* WebServer.cpp in Sources */,
7C7B2B301134F36400713D6D /* mysqldataset.cpp in Sources */,
- F5A7B376113AFB5F0059D6AA /* FileSFTP.cpp in Sources */,
F5A7B37E113AFB900059D6AA /* SFTPDirectory.cpp in Sources */,
F5A7B42C113CBB950059D6AA /* AddonsDirectory.cpp in Sources */,
18B4A0021152BFA5001AF8A6 /* Addon.cpp in Sources */,
@@ -8079,7 +8071,6 @@
18B7CA1E12944A8E009E7A26 /* tinyxmlparser.cpp in Sources */,
432D7CE412D86DA500CE4C49 /* NetworkLinux.cpp in Sources */,
432D7CF712D870E800CE4C49 /* TCPServer.cpp in Sources */,
- 433219D712E4C6A500CD7486 /* FileUDF.cpp in Sources */,
433219D812E4C6A500CD7486 /* udf25.cpp in Sources */,
433219D912E4C6A500CD7486 /* UDFDirectory.cpp in Sources */,
7C4705AE12EF584C00369E51 /* AddonInstaller.cpp in Sources */,
@@ -8089,7 +8080,7 @@
7C84A59E12FA3C1600CD1714 /* SourcesDirectory.cpp in Sources */,
F57A1D1E1329B15300498CC7 /* AutoPool.mm in Sources */,
F5B13C8D1334056B0045076D /* DarwinUtils.mm in Sources */,
- 7C99B6A4133D342100FC2B16 /* CacheCircular.cpp in Sources */,
+ 7C99B6A4133D342100FC2B16 /* CircularCache.cpp in Sources */,
7C99B7951340723F00FC2B16 /* GUIDialogPlayEject.cpp in Sources */,
F5AE407613415D8D0004BD79 /* HttpApi.cpp in Sources */,
F5AE407913415D8D0004BD79 /* XBMChttp.cpp in Sources */,
@@ -8107,7 +8098,6 @@
18ACF84313596C9B00B67371 /* RecentlyAddedJob.cpp in Sources */,
C807114D135DB5CC002F601B /* InputOperations.cpp in Sources */,
C8EC5D0E1369519D00CCC10D /* XBMC_keytable.cpp in Sources */,
- 18404D9E1396C13500863BBA /* Slingbox.cpp in Sources */,
1840B74D13993D8A007C848B /* JSONVariantParser.cpp in Sources */,
1840B75313993DA0007C848B /* JSONVariantWriter.cpp in Sources */,
7C0A7EC013A5DBCE00AFC2BD /* AppParamParser.cpp in Sources */,
@@ -8116,7 +8106,6 @@
F558F27B13ABD56600631E12 /* DirtyRegionSolvers.cpp in Sources */,
F558F27F13ABD57400631E12 /* DirtyRegionTracker.cpp in Sources */,
F558F29613ABD7DF00631E12 /* GUIWindowDebugInfo.cpp in Sources */,
- DF0DF15B13A3ADA7008ED511 /* FileNFS.cpp in Sources */,
DF0DF15C13A3ADA7008ED511 /* NFSDirectory.cpp in Sources */,
7C89619213B6A16F003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
1830212813B8E2DC00770920 /* controledit.cpp in Sources */,
@@ -8132,10 +8121,8 @@
DF34898213FDAAF60026A711 /* HttpParser.cpp in Sources */,
18968DC814155D7C005BA742 /* ApplicationOperations.cpp in Sources */,
DF24A6B41406C7C500C7721E /* AFPDirectory.cpp in Sources */,
- DF24A6B51406C7C500C7721E /* FileAFP.cpp in Sources */,
32C631281423A90F00F18420 /* JpegIO.cpp in Sources */,
DF448457140048A60069344B /* AirTunesServer.cpp in Sources */,
- DF44845D140048C80069344B /* FilePipe.cpp in Sources */,
DF44845E140048C80069344B /* PipesManager.cpp in Sources */,
DF4484EE140054530069344B /* BXAcodec.cpp in Sources */,
DF98D98C1434F47D00A6EBE1 /* SkinVariable.cpp in Sources */,
@@ -8154,7 +8141,6 @@
F5E1125E14356B2400175026 /* pyrendercapture.cpp in Sources */,
F5E1138014357F3800175026 /* PeripheralCecAdapter.cpp in Sources */,
F54BCC5F1439345300F86B0F /* HotKeyController.m in Sources */,
- DF85BAB51443669A000686BE /* FileUPnP.cpp in Sources */,
DF673AA51443819600A5A509 /* AddonManager.cpp in Sources */,
F5BD02F6148D3A7E001B5583 /* CryptThreading.cpp in Sources */,
7CCFD98D151494E100211D82 /* PCMCodec.cpp in Sources */,
@@ -8172,6 +8158,36 @@
DFCA6AC9152245CD000BFAAE /* HTTPWebinterfaceAddonsHandler.cpp in Sources */,
DFCA6ACA152245CD000BFAAE /* HTTPWebinterfaceHandler.cpp in Sources */,
DFCA6ACB152245CD000BFAAE /* IHTTPRequestHandler.cpp in Sources */,
+ DF93D65D1444A7A3007C6459 /* SlingboxDirectory.cpp in Sources */,
+ DF93D6991444A8B1007C6459 /* AFPFile.cpp in Sources */,
+ DF93D69A1444A8B1007C6459 /* DirectoryCache.cpp in Sources */,
+ DF93D69B1444A8B1007C6459 /* FileCache.cpp in Sources */,
+ DF93D69C1444A8B1007C6459 /* CDDAFile.cpp in Sources */,
+ DF93D69D1444A8B1007C6459 /* CurlFile.cpp in Sources */,
+ DF93D69E1444A8B1007C6459 /* DAAPFile.cpp in Sources */,
+ DF93D69F1444A8B1007C6459 /* DirectoryFactory.cpp in Sources */,
+ DF93D6A01444A8B1007C6459 /* FileDirectoryFactory.cpp in Sources */,
+ DF93D6A11444A8B1007C6459 /* FileReaderFile.cpp in Sources */,
+ DF93D6A21444A8B1007C6459 /* HDFile.cpp in Sources */,
+ DF93D6A31444A8B1007C6459 /* ISOFile.cpp in Sources */,
+ DF93D6A41444A8B1007C6459 /* LastFMFile.cpp in Sources */,
+ DF93D6A51444A8B1007C6459 /* MusicDatabaseFile.cpp in Sources */,
+ DF93D6A61444A8B1007C6459 /* NFSFile.cpp in Sources */,
+ DF93D6A71444A8B1007C6459 /* PipeFile.cpp in Sources */,
+ DF93D6A81444A8B1007C6459 /* RarFile.cpp in Sources */,
+ DF93D6A91444A8B1007C6459 /* RTVFile.cpp in Sources */,
+ DF93D6AA1444A8B1007C6459 /* SFTPFile.cpp in Sources */,
+ DF93D6AB1444A8B1007C6459 /* ShoutcastFile.cpp in Sources */,
+ DF93D6AC1444A8B1007C6459 /* SlingboxFile.cpp in Sources */,
+ DF93D6AD1444A8B1007C6459 /* SmbFile.cpp in Sources */,
+ DF93D6AE1444A8B1007C6459 /* SpecialProtocolFile.cpp in Sources */,
+ DF93D6AF1444A8B1007C6459 /* TuxBoxDirectory.cpp in Sources */,
+ DF93D6B01444A8B1007C6459 /* TuxBoxFile.cpp in Sources */,
+ DF93D6B11444A8B1007C6459 /* UDFFile.cpp in Sources */,
+ DF93D6B21444A8B1007C6459 /* UPnPFile.cpp in Sources */,
+ DF93D6B31444A8B1007C6459 /* ZipFile.cpp in Sources */,
+ DF93D7F21444B54A007C6459 /* HDHomeRunFile.cpp in Sources */,
+ DF93D7F61444B568007C6459 /* HDHomeRunDirectory.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -8276,38 +8292,20 @@
F5A1C93E0F6B06CF00A96ABD /* DynamicDll.cpp in Sources */,
F5A1C9400F6B06CF00A96ABD /* Favourites.cpp in Sources */,
F5A1C9410F6B06CF00A96ABD /* FileItem.cpp in Sources */,
- F5A1C9420F6B06CF00A96ABD /* CacheMemBuffer.cpp in Sources */,
+ F5A1C9420F6B06CF00A96ABD /* MemBufferCache.cpp in Sources */,
F5A1C9430F6B06CF00A96ABD /* CacheStrategy.cpp in Sources */,
F5A1C9440F6B06CF00A96ABD /* CDDADirectory.cpp in Sources */,
F5A1C9450F6B06CF00A96ABD /* cddb.cpp in Sources */,
F5A1C9460F6B06CF00A96ABD /* cdioSupport.cpp in Sources */,
F5A1C9470F6B06CF00A96ABD /* DAAPDirectory.cpp in Sources */,
F5A1C9480F6B06CF00A96ABD /* Directory.cpp in Sources */,
- F5A1C9490F6B06CF00A96ABD /* DirectoryCache.cpp in Sources */,
F5A1C94A0F6B06CF00A96ABD /* DirectoryHistory.cpp in Sources */,
- F5A1C94B0F6B06CF00A96ABD /* DirectoryTuxBox.cpp in Sources */,
F5A1C94C0F6B06CF00A96ABD /* DllLibCurl.cpp in Sources */,
- F5A1C94D0F6B06CF00A96ABD /* FactoryDirectory.cpp in Sources */,
- F5A1C94E0F6B06CF00A96ABD /* FactoryFileDirectory.cpp in Sources */,
F5A1C94F0F6B06CF00A96ABD /* File.cpp in Sources */,
- F5A1C9500F6B06CF00A96ABD /* FileCache.cpp in Sources */,
- F5A1C9510F6B06CF00A96ABD /* FileCDDA.cpp in Sources */,
- F5A1C9520F6B06CF00A96ABD /* FileCurl.cpp in Sources */,
- F5A1C9530F6B06CF00A96ABD /* FileDAAP.cpp in Sources */,
F5A1C9540F6B06CF00A96ABD /* FileFactory.cpp in Sources */,
- F5A1C9550F6B06CF00A96ABD /* FileFileReader.cpp in Sources */,
- F5A1C9560F6B06CF00A96ABD /* FileHD.cpp in Sources */,
- F5A1C9570F6B06CF00A96ABD /* FileISO.cpp in Sources */,
- F5A1C9580F6B06CF00A96ABD /* FileLastFM.cpp in Sources */,
- F5A1C9590F6B06CF00A96ABD /* FileMusicDatabase.cpp in Sources */,
- F5A1C95A0F6B06CF00A96ABD /* FileRar.cpp in Sources */,
- F5A1C95B0F6B06CF00A96ABD /* FileRTV.cpp in Sources */,
- F5A1C95C0F6B06CF00A96ABD /* FileTuxBox.cpp in Sources */,
- F5A1C95D0F6B06CF00A96ABD /* FileZip.cpp in Sources */,
F5A1C95E0F6B06CF00A96ABD /* FTPDirectory.cpp in Sources */,
F5A1C95F0F6B06CF00A96ABD /* FTPParse.cpp in Sources */,
F5A1C9600F6B06CF00A96ABD /* HDDirectory.cpp in Sources */,
- F5A1C9610F6B06CF00A96ABD /* HDHomeRun.cpp in Sources */,
F5A1C9620F6B06CF00A96ABD /* IDirectory.cpp in Sources */,
F5A1C9630F6B06CF00A96ABD /* IFile.cpp in Sources */,
F5A1C9640F6B06CF00A96ABD /* iso9660.cpp in Sources */,
@@ -8632,14 +8630,12 @@
F5A1CB1A0F6B06CF00A96ABD /* DVDDemuxFFmpeg.cpp in Sources */,
F5A1CB1B0F6B06CF00A96ABD /* GUIDialogCache.cpp in Sources */,
F5A1CB1D0F6B06CF00A96ABD /* GUIDialogAccessPoints.cpp in Sources */,
- F5A1CB1F0F6B06CF00A96ABD /* FileShoutcast.cpp in Sources */,
F5A1CB220F6B06CF00A96ABD /* DVDPlayerCodec.cpp in Sources */,
F5A1CB230F6B06CF00A96ABD /* DVDDemuxVobsub.cpp in Sources */,
F5A1CB240F6B06CF00A96ABD /* DVDInputStreamTV.cpp in Sources */,
F5A1CB250F6B06CF00A96ABD /* PltMediaConnect.cpp in Sources */,
F5A1CB3C0F6B06CF00A96ABD /* MythDirectory.cpp in Sources */,
F5A1CB3D0F6B06CF00A96ABD /* MythFile.cpp in Sources */,
- F5A1CB3E0F6B06CF00A96ABD /* FileSmb.cpp in Sources */,
F5A1CB3F0F6B06CF00A96ABD /* SMBDirectory.cpp in Sources */,
F5A1CB410F6B06CF00A96ABD /* MythSession.cpp in Sources */,
F5A1CB420F6B06CF00A96ABD /* EventPacket.cpp in Sources */,
@@ -8682,7 +8678,6 @@
F5A1CB7F0F6B06CF00A96ABD /* AudioRendererFactory.cpp in Sources */,
F5A1CB800F6B06CF00A96ABD /* NullDirectSound.cpp in Sources */,
F5A1CB810F6B06CF00A96ABD /* ExternalPlayer.cpp in Sources */,
- F5A1CB820F6B06CF00A96ABD /* FileSpecialProtocol.cpp in Sources */,
F5A1CB830F6B06CF00A96ABD /* HTTPDirectory.cpp in Sources */,
F5A1CB840F6B06CF00A96ABD /* GUIDialogKaraokeSongSelector.cpp in Sources */,
F5A1CB850F6B06CF00A96ABD /* karaokelyricscdg.cpp in Sources */,
@@ -8831,7 +8826,6 @@
F5A7A703112893E50059D6AA /* AnnouncementManager.cpp in Sources */,
F5A7A85C112908F00059D6AA /* WebServer.cpp in Sources */,
7C7B2B311134F36400713D6D /* mysqldataset.cpp in Sources */,
- F5A7B377113AFB5F0059D6AA /* FileSFTP.cpp in Sources */,
F5A7B37F113AFB900059D6AA /* SFTPDirectory.cpp in Sources */,
F5A7B42D113CBB950059D6AA /* AddonsDirectory.cpp in Sources */,
18B4A0081152BFA5001AF8A6 /* Addon.cpp in Sources */,
@@ -9015,7 +9009,6 @@
18B7CA2C12944A8E009E7A26 /* tinyxmlparser.cpp in Sources */,
432D7CE512D86DA500CE4C49 /* NetworkLinux.cpp in Sources */,
432D7CF812D870E800CE4C49 /* TCPServer.cpp in Sources */,
- 433219DA12E4C6A500CD7486 /* FileUDF.cpp in Sources */,
433219DB12E4C6A500CD7486 /* udf25.cpp in Sources */,
433219DC12E4C6A500CD7486 /* UDFDirectory.cpp in Sources */,
7C4705AF12EF584C00369E51 /* AddonInstaller.cpp in Sources */,
@@ -9023,7 +9016,7 @@
7C84A59F12FA3C1600CD1714 /* SourcesDirectory.cpp in Sources */,
F57A1D1F1329B15300498CC7 /* AutoPool.mm in Sources */,
F5B13C8E1334056B0045076D /* DarwinUtils.mm in Sources */,
- 7C99B6A5133D342100FC2B16 /* CacheCircular.cpp in Sources */,
+ 7C99B6A5133D342100FC2B16 /* CircularCache.cpp in Sources */,
7C99B7961340723F00FC2B16 /* GUIDialogPlayEject.cpp in Sources */,
F5AE407A13415D8D0004BD79 /* HttpApi.cpp in Sources */,
F5AE407D13415D8D0004BD79 /* XBMChttp.cpp in Sources */,
@@ -9043,7 +9036,6 @@
43EA4297136C1D9E002C82A5 /* RenderCapture.cpp in Sources */,
43EA429B136C1E2F002C82A5 /* xbmcvfsmodule.cpp in Sources */,
43EA42B0136C2274002C82A5 /* InputOperations.cpp in Sources */,
- 18404E701396E05D00863BBA /* Slingbox.cpp in Sources */,
1840B74E13993D8A007C848B /* JSONVariantParser.cpp in Sources */,
1840B75413993DA0007C848B /* JSONVariantWriter.cpp in Sources */,
7C0A7EC113A5DBCE00AFC2BD /* AppParamParser.cpp in Sources */,
@@ -9052,7 +9044,6 @@
F558F27C13ABD56600631E12 /* DirtyRegionSolvers.cpp in Sources */,
F558F28013ABD57400631E12 /* DirtyRegionTracker.cpp in Sources */,
F558F29713ABD7DF00631E12 /* GUIWindowDebugInfo.cpp in Sources */,
- F558F3D013AE663300631E12 /* FileNFS.cpp in Sources */,
F558F3D113AE663A00631E12 /* NFSDirectory.cpp in Sources */,
7C89619313B6A16F003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
1830212913B8E2DC00770920 /* controledit.cpp in Sources */,
@@ -9068,10 +9059,8 @@
DF34898313FDAAF60026A711 /* HttpParser.cpp in Sources */,
18968DC914155D7C005BA742 /* ApplicationOperations.cpp in Sources */,
DF24A6B61406C7C500C7721E /* AFPDirectory.cpp in Sources */,
- DF24A6B71406C7C500C7721E /* FileAFP.cpp in Sources */,
F5E10D381428426B00175026 /* JpegIO.cpp in Sources */,
DF448458140048A60069344B /* AirTunesServer.cpp in Sources */,
- DF44845F140048C80069344B /* FilePipe.cpp in Sources */,
DF448460140048C80069344B /* PipesManager.cpp in Sources */,
DF4484EF140054530069344B /* BXAcodec.cpp in Sources */,
DF98D98D1434F47D00A6EBE1 /* SkinVariable.cpp in Sources */,
@@ -9090,7 +9079,6 @@
F5E1125F14356B2400175026 /* pyrendercapture.cpp in Sources */,
F5E1138114357F3900175026 /* PeripheralCecAdapter.cpp in Sources */,
F54BCC601439345300F86B0F /* HotKeyController.m in Sources */,
- DF85BAB61443669A000686BE /* FileUPnP.cpp in Sources */,
F5BD02F7148D3A7E001B5583 /* CryptThreading.cpp in Sources */,
7CCFD98C151494E100211D82 /* PCMCodec.cpp in Sources */,
DF527726151BAEDA00B5B63B /* Base64.cpp in Sources */,
@@ -9107,6 +9095,36 @@
DFCA6AD0152245CD000BFAAE /* HTTPWebinterfaceAddonsHandler.cpp in Sources */,
DFCA6AD1152245CD000BFAAE /* HTTPWebinterfaceHandler.cpp in Sources */,
DFCA6AD2152245CD000BFAAE /* IHTTPRequestHandler.cpp in Sources */,
+ DF93D65E1444A7A3007C6459 /* SlingboxDirectory.cpp in Sources */,
+ DF93D6B41444A8B1007C6459 /* AFPFile.cpp in Sources */,
+ DF93D6B51444A8B1007C6459 /* DirectoryCache.cpp in Sources */,
+ DF93D6B61444A8B1007C6459 /* FileCache.cpp in Sources */,
+ DF93D6B71444A8B1007C6459 /* CDDAFile.cpp in Sources */,
+ DF93D6B81444A8B1007C6459 /* CurlFile.cpp in Sources */,
+ DF93D6B91444A8B1007C6459 /* DAAPFile.cpp in Sources */,
+ DF93D6BA1444A8B1007C6459 /* DirectoryFactory.cpp in Sources */,
+ DF93D6BB1444A8B1007C6459 /* FileDirectoryFactory.cpp in Sources */,
+ DF93D6BC1444A8B1007C6459 /* FileReaderFile.cpp in Sources */,
+ DF93D6BD1444A8B1007C6459 /* HDFile.cpp in Sources */,
+ DF93D6BE1444A8B1007C6459 /* ISOFile.cpp in Sources */,
+ DF93D6BF1444A8B1007C6459 /* LastFMFile.cpp in Sources */,
+ DF93D6C01444A8B1007C6459 /* MusicDatabaseFile.cpp in Sources */,
+ DF93D6C11444A8B1007C6459 /* NFSFile.cpp in Sources */,
+ DF93D6C21444A8B1007C6459 /* PipeFile.cpp in Sources */,
+ DF93D6C31444A8B1007C6459 /* RarFile.cpp in Sources */,
+ DF93D6C41444A8B1007C6459 /* RTVFile.cpp in Sources */,
+ DF93D6C51444A8B1007C6459 /* SFTPFile.cpp in Sources */,
+ DF93D6C61444A8B1007C6459 /* ShoutcastFile.cpp in Sources */,
+ DF93D6C71444A8B1007C6459 /* SlingboxFile.cpp in Sources */,
+ DF93D6C81444A8B1007C6459 /* SmbFile.cpp in Sources */,
+ DF93D6C91444A8B1007C6459 /* SpecialProtocolFile.cpp in Sources */,
+ DF93D6CA1444A8B1007C6459 /* TuxBoxDirectory.cpp in Sources */,
+ DF93D6CB1444A8B1007C6459 /* TuxBoxFile.cpp in Sources */,
+ DF93D6CC1444A8B1007C6459 /* UDFFile.cpp in Sources */,
+ DF93D6CD1444A8B1007C6459 /* UPnPFile.cpp in Sources */,
+ DF93D6CE1444A8B1007C6459 /* ZipFile.cpp in Sources */,
+ DF93D7F31444B54A007C6459 /* HDHomeRunFile.cpp in Sources */,
+ DF93D7F71444B568007C6459 /* HDHomeRunDirectory.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index 864c7ae714..65d5158c2f 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -342,22 +342,103 @@
<ClCompile Include="..\..\xbmc\DynamicDll.cpp" />
<ClCompile Include="..\..\xbmc\Favourites.cpp" />
<ClCompile Include="..\..\xbmc\FileItem.cpp" />
- <ClCompile Include="..\..\xbmc\filesystem\CacheCircular.cpp" />
- <ClCompile Include="..\..\xbmc\filesystem\FileNFS.cpp" />
- <ClCompile Include="..\..\xbmc\filesystem\FilePipe.cpp" />
- <ClCompile Include="..\..\xbmc\filesystem\FileUPnP.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\iso9660.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\ISO9660Directory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileUDF.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\AddonsDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\AFPDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\AFPFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\ASAPFileDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\CacheStrategy.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\CDDADirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\CDDAFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\CircularCache.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\CurlFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\DAAPDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\DAAPFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\DAVDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\Directory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\DirectoryCache.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\DirectoryFactory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\DirectoryHistory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\DllLibCurl.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\File.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\FileCache.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\FileDirectoryFactory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\FileFactory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\FileReaderFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\FTPDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\FTPParse.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\HDDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\HDFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\HDHomeRunDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\HDHomeRunFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\HTSPDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\HTSPSession.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\HTTPDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\IDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\IFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\iso9660.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\ISO9660Directory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\ISOFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\LastFMDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\LastFMFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\MemBufferCache.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\MultiPathDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\MultiPathFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\MusicFileDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\MusicSearchDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\MythDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\MythFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\MythSession.cpp" />
<ClCompile Include="..\..\xbmc\filesystem\NFSDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\NFSFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\NptXbmcFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\NSFFileDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\OGGFileDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\PipeFile.cpp" />
<ClCompile Include="..\..\xbmc\filesystem\PipesManager.cpp" />
- <ClCompile Include="..\..\xbmc\filesystem\Slingbox.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\udf25.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\UDFDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\PlaylistDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\PlaylistFileDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\PluginDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\RarDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\RarFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\RarManager.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\RSSDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\RTVDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\RTVFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SAPDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SAPFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SFTPDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SFTPFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\ShoutcastFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SIDFileDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SlingboxDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SlingboxFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SmartPlaylistDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SourcesDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocol.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocolDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocolFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\StackDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\TuxBoxDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\TuxBoxFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\udf25.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\UDFDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\UDFFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\UPnPDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\UPnPFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\VideoDatabaseDirectory.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeCountry.cpp" />
<ClCompile Include="..\..\xbmc\filesystem\windows\WINFileSMB.cpp" />
<ClCompile Include="..\..\xbmc\filesystem\windows\WINSMBDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\VirtualDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\VTPDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\VTPFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\VTPSession.cpp" />
<ClCompile Include="..\..\xbmc\filesystem\ZeroconfDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\ZipDirectory.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\ZipFile.cpp" />
+ <ClCompile Include="..\..\xbmc\filesystem\ZipManager.cpp" />
<ClCompile Include="..\..\xbmc\GUIInfoManager.cpp" />
<ClCompile Include="..\..\xbmc\GUILargeTextureManager.cpp" />
<ClCompile Include="..\..\xbmc\guilib\AnimatedGif.cpp" />
@@ -794,7 +875,6 @@
<ClCompile Include="..\..\xbmc\threads\platform\Implementation.cpp" />
<ClInclude Include="..\..\xbmc\cores\AudioRenderers\IAudioRenderer.h" />
<ClInclude Include="..\..\xbmc\cores\paplayer\PCMCodec.h" />
- <ClInclude Include="..\..\xbmc\filesystem\FileUPnP.h" />
<ClInclude Include="..\..\xbmc\filesystem\windows\WINFileSMB.h" />
<ClInclude Include="..\..\xbmc\filesystem\windows\WINSMBDirectory.h" />
<ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\pythreadstate.h" />
@@ -811,6 +891,107 @@
<ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPWebinterfaceAddonsHandler.h" />
<ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPWebinterfaceHandler.h" />
<ClInclude Include="..\..\xbmc\network\httprequesthandler\IHTTPRequestHandler.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\CircularCache.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DirectoryCache.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\FileCache.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\MemBufferCache.h" />
+ <ClInclude Include="..\..\xbmc\interfaces\python\xbmcmodule\pythreadstate.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\AddonsDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\AFPDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\AFPFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\ASAPFileDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\CacheStrategy.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\CDDADirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\CDDAFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\CurlFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DAAPDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DAAPFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DAVDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\Directory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DirectoryFactory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DirectoryHistory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DllHDHomeRunDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DllHDHomeRunFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DllLibAfp.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DllLibCMyth.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DllLibCurl.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\DllLibNfs.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\File.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\FileDirectoryFactory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\FileFactory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\FileReaderFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\FTPDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\FTPParse.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\HDDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\HDFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\HDHomeRunDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\HDHomeRunFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\HTSPDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\HTSPSession.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\HTTPDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\IDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\IFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\IFileDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\ILiveTV.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\iso9660.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\ISO9660Directory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\ISOFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\LastFMDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\LastFMFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\MultiPathDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\MultiPathFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\MusicFileDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\MusicSearchDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\MythDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\MythFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\MythSession.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\NFSDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\NFSFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\NSFFileDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\OGGFileDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\PipeFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\PipesManager.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\PlaylistDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\PlaylistFileDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\PluginDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\RarDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\RarFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\RarManager.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\RSSDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\RTVDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\RTVFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SAPDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SAPFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SFTPDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SFTPFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\ShoutcastFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SIDFileDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SlingboxDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SlingboxFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SmartPlaylistDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SourcesDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocol.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocolDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocolFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\StackDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\TuxBoxDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\TuxBoxFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\udf25.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\UDFDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\UDFFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\UPnPDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\UPnPFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\VideoDatabaseDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\VirtualDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\VTPDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\VTPFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\VTPSession.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\ZeroconfDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\ZipDirectory.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\ZipFile.h" />
+ <ClInclude Include="..\..\xbmc\filesystem\ZipManager.h" />
<ClInclude Include="..\..\xbmc\threads\platform\win\Implementation.cpp" />
<ClCompile Include="..\..\xbmc\threads\SystemClock.cpp" />
<ClCompile Include="..\..\xbmc\threads\Thread.cpp" />
@@ -1078,83 +1259,6 @@
<ClCompile Include="..\..\xbmc\cores\ExternalPlayer\ExternalPlayer.cpp" />
<ClCompile Include="..\..\xbmc\cores\playercorefactory\PlayerCoreFactory.cpp" />
<ClCompile Include="..\..\xbmc\cores\playercorefactory\PlayerSelectionRule.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\AddonsDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\ASAPFileDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\CacheMemBuffer.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\CacheStrategy.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\CDDADirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\DAAPDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\DAVDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\Directory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\DirectoryCache.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\DirectoryHistory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\DirectoryTuxBox.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\DllLibCurl.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FactoryDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FactoryFileDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\File.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileCache.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileCDDA.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileCurl.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileDAAP.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileFactory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileFileReader.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileHD.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileISO.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileLastFM.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileMusicDatabase.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileRar.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileRTV.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileSFTP.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileShoutcast.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileSpecialProtocol.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileTuxBox.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FileZip.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FTPDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\FTPParse.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\HDDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\HDHomeRun.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\HTSPDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\HTSPSession.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\HTTPDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\IDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\IFile.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\LastFMDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\MultiPathDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\MultiPathFile.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\MusicFileDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\MusicSearchDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\MythDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\MythFile.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\MythSession.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\NptXbmcFile.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\NSFFileDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\OGGFileDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\PlaylistDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\PlaylistFileDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\PluginDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\RarDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\RarManager.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\RSSDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\RTVDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\SAPDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\SAPFile.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\SFTPDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\SIDFileDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\SmartPlaylistDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\SpecialProtocol.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\SpecialProtocolDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\StackDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\SourcesDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\UPnPDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\VirtualDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\VTPDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\VTPFile.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\VTPSession.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\ZipDirectory.cpp" />
- <ClCompile Include="..\..\xbmc\FileSystem\ZipManager.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNode.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbum.cpp" />
<ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilations.cpp" />
@@ -1329,31 +1433,7 @@
<ClInclude Include="..\..\xbmc\DynamicDll.h" />
<ClInclude Include="..\..\xbmc\Favourites.h" />
<ClInclude Include="..\..\xbmc\FileItem.h" />
- <ClInclude Include="..\..\xbmc\filesystem\CacheCircular.h" />
- <ClInclude Include="..\..\xbmc\filesystem\Directory.h" />
- <ClInclude Include="..\..\xbmc\filesystem\DirectoryHistory.h" />
- <ClInclude Include="..\..\xbmc\filesystem\FactoryDirectory.h" />
- <ClInclude Include="..\..\xbmc\filesystem\File.h" />
- <ClInclude Include="..\..\xbmc\filesystem\FileFactory.h" />
- <ClInclude Include="..\..\xbmc\filesystem\FileHD.h" />
- <ClInclude Include="..\..\xbmc\filesystem\FileNFS.h" />
- <ClInclude Include="..\..\xbmc\filesystem\FilePipe.h" />
- <ClInclude Include="..\..\xbmc\filesystem\HDDirectory.h" />
- <ClInclude Include="..\..\xbmc\filesystem\IDirectory.h" />
- <ClInclude Include="..\..\xbmc\filesystem\IFile.h" />
- <ClInclude Include="..\..\xbmc\filesystem\IFileDirectory.h" />
- <ClInclude Include="..\..\xbmc\filesystem\ILiveTV.h" />
- <ClInclude Include="..\..\xbmc\filesystem\iso9660.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\ISO9660Directory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileUDF.h" />
- <ClInclude Include="..\..\xbmc\filesystem\NFSDirectory.h" />
- <ClInclude Include="..\..\xbmc\filesystem\PipesManager.h" />
- <ClInclude Include="..\..\xbmc\filesystem\Slingbox.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\udf25.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\UDFDirectory.h" />
<ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory\DirectoryNodeCountry.h" />
- <ClInclude Include="..\..\xbmc\filesystem\VirtualDirectory.h" />
- <ClInclude Include="..\..\xbmc\filesystem\ZeroconfDirectory.h" />
<ClInclude Include="..\..\xbmc\GUIInfoManager.h" />
<ClInclude Include="..\..\xbmc\GUILargeTextureManager.h" />
<ClInclude Include="..\..\xbmc\guilib\AnimatedGif.h" />
@@ -2020,73 +2100,6 @@
<ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerCoreConfig.h" />
<ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerCoreFactory.h" />
<ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerSelectionRule.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\AddonsDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\ASAPFileDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\CacheMemBuffer.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\CacheStrategy.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\CDDADirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\DAAPDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\DAVDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\DirectoryCache.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\DirectoryTuxBox.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\DllLibCMyth.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\DllLibCurl.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FactoryFileDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileCache.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileCDDA.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileCurl.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileDAAP.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileFileReader.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileISO.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileLastFM.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileMusicDatabase.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileRar.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileRTV.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileSFTP.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileShoutcast.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileSpecialProtocol.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileTuxBox.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FileZip.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FTPDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\FTPParse.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\HDHomeRun.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\HTSPDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\HTSPSession.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\HTTPDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\LastFMDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\MultiPathDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\MultiPathFile.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\MusicFileDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\MusicSearchDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\MythDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\MythFile.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\MythSession.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\NSFFileDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\OGGFileDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\PlaylistDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\PlaylistFileDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\PluginDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\RarDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\RarManager.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\RSSDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\RTVDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\SAPDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\SAPFile.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\SFTPDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\SIDFileDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\SmartPlaylistDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\SpecialProtocol.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\SpecialProtocolDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\StackDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\SourcesDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\UPnPDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\VTPDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\VTPFile.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\VTPSession.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\ZipDirectory.h" />
- <ClInclude Include="..\..\xbmc\FileSystem\ZipManager.h" />
<ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNode.h" />
<ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbum.h" />
<ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNodeAlbumCompilations.h" />
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index f17d4624d8..9e8d3cff13 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -654,243 +654,6 @@
<ClCompile Include="..\..\xbmc\cores\playercorefactory\PlayerSelectionRule.cpp">
<Filter>cores\PlayerCoreFactory</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\AddonsDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\ASAPFileDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\CacheMemBuffer.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\CacheStrategy.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\CDDADirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\DAAPDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\DAVDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\Directory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\DirectoryCache.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\DirectoryHistory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\DirectoryTuxBox.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\DllLibCurl.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FactoryDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FactoryFileDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\File.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileCache.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileCDDA.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileCurl.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileDAAP.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileFactory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileFileReader.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileHD.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileISO.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileLastFM.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileMusicDatabase.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileRar.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileRTV.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileSFTP.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileShoutcast.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileSpecialProtocol.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileTuxBox.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileZip.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FTPDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FTPParse.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\HDDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\HDHomeRun.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\HTSPDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\HTSPSession.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\HTTPDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\IDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\IFile.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\iso9660.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\ISO9660Directory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\LastFMDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\MultiPathDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\MultiPathFile.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\MusicFileDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\MusicSearchDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\MythDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\MythFile.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\MythSession.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\NptXbmcFile.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\NSFFileDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\OGGFileDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\PlaylistDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\PlaylistFileDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\PluginDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\RarDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\RarManager.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\RSSDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\RTVDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\SAPDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\SAPFile.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\SFTPDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\SIDFileDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\SmartPlaylistDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\SpecialProtocol.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\SpecialProtocolDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\StackDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\SourcesDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\UPnPDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\VirtualDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\VTPDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\VTPFile.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\VTPSession.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\ZipDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\ZipManager.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNode.cpp">
<Filter>filesystem\MusicDatabaseDirectory</Filter>
</ClCompile>
@@ -1237,9 +1000,6 @@
<ClCompile Include="..\..\xbmc\dialogs\GUIDialogYesNo.cpp">
<Filter>dialogs</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\filesystem\ZeroconfDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\Application.cpp" />
<ClCompile Include="..\..\xbmc\MediaSource.cpp" />
<ClCompile Include="..\..\xbmc\SystemGlobals.cpp" />
@@ -2252,15 +2012,6 @@
<ClCompile Include="..\..\xbmc\utils\LangCodeExpander.cpp">
<Filter>utils</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\udf25.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\UDFDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\FileSystem\FileUDF.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\ApplicationMessenger.cpp">
<Filter>utils</Filter>
</ClCompile>
@@ -2429,9 +2180,6 @@
<ClCompile Include="..\..\lib\SlingboxLib\SlingboxLib.cpp">
<Filter>libs\SlingboxLib</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\filesystem\Slingbox.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\dialogs\GUIDialogPlayEject.cpp">
<Filter>dialogs</Filter>
</ClCompile>
@@ -2451,9 +2199,6 @@
<ClCompile Include="..\..\xbmc\interfaces\json-rpc\InputOperations.cpp">
<Filter>interfaces\json-rpc</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\filesystem\CacheCircular.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\input\XBMC_keytable.cpp">
<Filter>input</Filter>
</ClCompile>
@@ -2496,18 +2241,6 @@
<ClCompile Include="..\..\xbmc\guilib\JpegIO.cpp">
<Filter>guilib</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\filesystem\FileNFS.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\filesystem\NFSDirectory.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\filesystem\FilePipe.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
- <ClCompile Include="..\..\xbmc\filesystem\PipesManager.cpp">
- <Filter>filesystem</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\cores\paplayer\BXAcodec.cpp">
<Filter>cores\paplayer</Filter>
</ClCompile>
@@ -2565,11 +2298,14 @@
<ClCompile Include="..\..\xbmc\interfaces\python\xbmcmodule\pyrendercapture.cpp">
<Filter>interfaces\python\xbmcmodule</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\filesystem\FileUPnP.cpp">
+ <ClCompile Include="..\..\xbmc\filesystem\AddonsDirectory.cpp">
<Filter>filesystem</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\cores\paplayer\PCMCodec.cpp">
<Filter>cores\paplayer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\AFPDirectory.cpp">
+ <Filter>filesystem</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\network\httprequesthandler\HTTPApiHandler.cpp">
<Filter>network\httprequesthandler</Filter>
@@ -2618,6 +2354,282 @@
</ClCompile>
<ClCompile Include="..\..\xbmc\network\httprequesthandler\IHTTPRequestHandler.cpp">
<Filter>network\httprequesthandler</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\AFPFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\ASAPFileDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\CacheStrategy.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\CDDADirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\CDDAFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\CurlFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\DAAPDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\DAAPFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\DAVDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\Directory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\DirectoryFactory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\DirectoryHistory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\DllLibCurl.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\File.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\FileDirectoryFactory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\FileFactory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\FileReaderFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\FTPDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\FTPParse.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\HDDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\HDFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\HDHomeRunDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\HDHomeRunFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\HTSPDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\HTSPSession.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\HTTPDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\IDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\IFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\iso9660.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\ISO9660Directory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\ISOFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\LastFMDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\LastFMFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\MultiPathDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\MultiPathFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\MusicFileDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\MusicSearchDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\MythDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\MythFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\MythSession.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\NFSDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\NFSFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\NptXbmcFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\NSFFileDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\OGGFileDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\PipeFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\PipesManager.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\PlaylistDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\PlaylistFileDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\PluginDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\RarDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\RarFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\RarManager.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\RSSDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\RTVDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\RTVFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SAPDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SAPFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SFTPDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SFTPFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\ShoutcastFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SIDFileDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SlingboxDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SlingboxFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SmartPlaylistDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SourcesDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocol.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocolDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\SpecialProtocolFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\StackDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\TuxBoxDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\TuxBoxFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\udf25.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\UDFDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\UDFFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\UPnPDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\UPnPFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\VideoDatabaseDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\VirtualDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\VTPDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\VTPFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\VTPSession.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\ZeroconfDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\ZipDirectory.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\ZipFile.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\ZipManager.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\CircularCache.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\DirectoryCache.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\FileCache.cpp">
+ <Filter>filesystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\MemBufferCache.cpp">
+ <Filter>filesystem</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
@@ -2636,6 +2648,12 @@
<ClInclude Include="..\..\xbmc\win32\WindowHelper.h">
<Filter>win32</Filter>
</ClInclude>
+ <ClInclude Include="..\..\xbmc\win32\WINFileSMB.h">
+ <Filter>win32</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\win32\WINSMBDirectory.h">
+ <Filter>win32</Filter>
+ </ClInclude>
<ClInclude Include="..\..\xbmc\cores\DummyVideoPlayer.h">
<Filter>cores</Filter>
</ClInclude>
@@ -3146,210 +3164,6 @@
<ClInclude Include="..\..\xbmc\cores\playercorefactory\PlayerSelectionRule.h">
<Filter>cores\PlayerCoreFactory</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\AddonsDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\ASAPFileDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\CacheMemBuffer.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\CacheStrategy.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\CDDADirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\DAAPDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\DAVDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\DirectoryCache.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\DirectoryTuxBox.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\DllLibCMyth.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\DllLibCurl.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FactoryFileDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileCache.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileCDDA.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileCurl.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileDAAP.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileFileReader.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileISO.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileLastFM.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileMusicDatabase.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileRar.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileRTV.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileSFTP.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileShoutcast.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileSpecialProtocol.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileTuxBox.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileZip.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FTPDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FTPParse.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\HDHomeRun.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\HTSPDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\HTSPSession.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\HTTPDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\ISO9660Directory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\LastFMDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\MultiPathDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\MultiPathFile.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\MusicFileDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\MusicSearchDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\MythDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\MythFile.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\MythSession.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\NSFFileDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\OGGFileDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\PlaylistDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\PlaylistFileDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\PluginDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\RarDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\RarManager.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\RSSDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\RTVDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\SAPDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\SAPFile.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\SFTPDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\SIDFileDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\SmartPlaylistDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\SpecialProtocol.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\SpecialProtocolDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\StackDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\SourcesDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\UPnPDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\VideoDatabaseDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\VTPDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\VTPFile.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\VTPSession.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\ZipDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\ZipManager.h">
- <Filter>filesystem</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\FileSystem\MusicDatabaseDirectory\DirectoryNode.h">
<Filter>filesystem\MusicDatabaseDirectory</Filter>
</ClInclude>
@@ -3722,12 +3536,6 @@
<ClInclude Include="..\..\xbmc\dialogs\GUIDialogYesNo.h">
<Filter>dialogs</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\ILiveTV.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\ZeroconfDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\Application.h" />
<ClInclude Include="..\..\xbmc\system.h" />
<ClInclude Include="..\..\xbmc\guilib\AnimatedGif.h">
@@ -3967,42 +3775,6 @@
<ClInclude Include="..\..\xbmc\guilib\XBTFReader.h">
<Filter>guilib</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\Directory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\DirectoryHistory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\FactoryDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\File.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\FileFactory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\FileHD.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\HDDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\IDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\IFile.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\IFileDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\iso9660.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\VirtualDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\input\ButtonTranslator.h">
<Filter>input</Filter>
</ClInclude>
@@ -4837,15 +4609,6 @@
<ClInclude Include="..\..\xbmc\utils\LangCodeExpander.h">
<Filter>utils</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\udf25.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\UDFDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\FileSystem\FileUDF.h">
- <Filter>filesystem</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\ApplicationMessenger.h">
<Filter>utils</Filter>
</ClInclude>
@@ -5026,12 +4789,6 @@
<ClInclude Include="..\..\lib\SlingboxLib\SlingboxLib.h">
<Filter>libs\SlingboxLib</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\Slingbox.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\CacheCircular.h">
- <Filter>filesystem</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\dialogs\GUIDialogPlayEject.h">
<Filter>dialogs</Filter>
</ClInclude>
@@ -5117,18 +4874,6 @@
<ClInclude Include="..\..\xbmc\guilib\JpegIO.h">
<Filter>guilib</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\FileNFS.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\NFSDirectory.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\FilePipe.h">
- <Filter>filesystem</Filter>
- </ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\PipesManager.h">
- <Filter>filesystem</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\cores\paplayer\BXAcodec.h">
<Filter>cores\paplayer</Filter>
</ClInclude>
@@ -5195,7 +4940,292 @@
<ClInclude Include="..\..\xbmc\threads\platform\win\Implementation.cpp">
<Filter>threads\platform\win</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\filesystem\FileUPnP.h">
+ <ClInclude Include="..\..\xbmc\filesystem\ZipManager.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\AddonsDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\AFPDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\AFPFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\ASAPFileDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\CacheStrategy.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\CDDADirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\CDDAFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\CurlFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DAAPDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DAAPFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DAVDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\Directory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DirectoryFactory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DirectoryHistory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DllHDHomeRunDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DllHDHomeRunFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DllLibAfp.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DllLibCMyth.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DllLibCurl.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DllLibNfs.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\File.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\FileDirectoryFactory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\FileFactory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\FileReaderFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\FTPDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\FTPParse.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\HDDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\HDFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\HDHomeRunDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\HDHomeRunFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\HTSPDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\HTSPSession.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\HTTPDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\IDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\IFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\IFileDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\ILiveTV.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\iso9660.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\ISO9660Directory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\ISOFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\LastFMDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\LastFMFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\MultiPathDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\MultiPathFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\MusicFileDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\MusicSearchDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\MythDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\MythFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\MythSession.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\NFSDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\NFSFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\NSFFileDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\OGGFileDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\PipeFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\PipesManager.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\PlaylistDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\PlaylistFileDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\PluginDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\RarDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\RarFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\RarManager.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\RSSDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\RTVDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\RTVFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SAPDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SAPFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SFTPDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SFTPFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\ShoutcastFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SIDFileDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SlingboxDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SlingboxFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SmartPlaylistDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SourcesDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocol.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocolDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\SpecialProtocolFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\StackDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\TuxBoxDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\TuxBoxFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\udf25.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\UDFDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\UDFFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\UPnPDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\UPnPFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\VideoDatabaseDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\VirtualDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\VTPDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\VTPFile.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\VTPSession.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\ZeroconfDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\ZipDirectory.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\ZipFile.h">
<Filter>filesystem</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\cores\AudioRenderers\IAudioRenderer.h" />
@@ -5204,6 +5234,18 @@
</ClInclude>
<ClInclude Include="..\..\xbmc\cores\paplayer\PCMCodec.h">
<Filter>cores\paplayer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\MemBufferCache.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\CircularCache.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\DirectoryCache.h">
+ <Filter>filesystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\filesystem\FileCache.h">
+ <Filter>filesystem</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\utils\Base64.h">
<Filter>utils</Filter>
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 076d70524c..c148a904e1 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -72,7 +72,7 @@
#include "SectionLoader.h"
#include "cores/DllLoader/DllLoaderContainer.h"
#include "GUIUserMessages.h"
-#include "filesystem/DirectoryCache.h"
+#include "filesystem/CacheDirectory.h"
#include "filesystem/StackDirectory.h"
#include "filesystem/SpecialProtocol.h"
#include "filesystem/DllLibCurl.h"
@@ -118,13 +118,13 @@
#include "filesystem/SMBDirectory.h"
#endif
#ifdef HAS_FILESYSTEM_NFS
-#include "filesystem/FileNFS.h"
+#include "filesystem/NFSFile.h"
#endif
#ifdef HAS_FILESYSTEM_AFP
#include "filesystem/FileAFP.h"
#endif
#ifdef HAS_FILESYSTEM_SFTP
-#include "filesystem/FileSFTP.h"
+#include "filesystem/SFTPFile.h"
#endif
#include "PartyModeManager.h"
#ifdef HAS_VIDEO_PLAYBACK
diff --git a/xbmc/Autorun.cpp b/xbmc/Autorun.cpp
index 846b28d282..79b31a9e1a 100644
--- a/xbmc/Autorun.cpp
+++ b/xbmc/Autorun.cpp
@@ -31,7 +31,7 @@
#include "PlayListPlayer.h"
#include "filesystem/StackDirectory.h"
#include "filesystem/Directory.h"
-#include "filesystem/FactoryDirectory.h"
+#include "filesystem/DirectoryFactory.h"
#include "filesystem/File.h"
#include "settings/GUISettings.h"
#include "settings/AdvancedSettings.h"
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp
index 651f848fcc..f52f8a62ce 100644
--- a/xbmc/FileItem.cpp
+++ b/xbmc/FileItem.cpp
@@ -27,13 +27,13 @@
#include "pictures/Picture.h"
#include "playlists/PlayListFactory.h"
#include "utils/Crc32.h"
-#include "filesystem/DirectoryCache.h"
+#include "filesystem/CacheDirectory.h"
#include "filesystem/StackDirectory.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
#include "filesystem/MultiPathDirectory.h"
#include "filesystem/MusicDatabaseDirectory.h"
#include "filesystem/VideoDatabaseDirectory.h"
-#include "filesystem/FactoryDirectory.h"
+#include "filesystem/DirectoryFactory.h"
#include "music/tags/MusicInfoTagLoaderFactory.h"
#include "CueDocument.h"
#include "video/VideoDatabase.h"
diff --git a/xbmc/SystemGlobals.cpp b/xbmc/SystemGlobals.cpp
index 71aeca0300..a7cfcf1415 100644
--- a/xbmc/SystemGlobals.cpp
+++ b/xbmc/SystemGlobals.cpp
@@ -31,7 +31,7 @@
#include "utils/DownloadQueueManager.h"
#include "GUIInfoManager.h"
#include "filesystem/DllLibCurl.h"
-#include "filesystem/DirectoryCache.h"
+#include "filesystem/CacheDirectory.h"
#include "GUIPassword.h"
#include "LangInfo.h"
#include "utils/LangCodeExpander.h"
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index 271c8cb706..8aebaa7289 100644
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -45,7 +45,7 @@
#include "storage/IoSupport.h"
#include "filesystem/StackDirectory.h"
#include "filesystem/MultiPathDirectory.h"
-#include "filesystem/DirectoryCache.h"
+#include "filesystem/CacheDirectory.h"
#include "filesystem/SpecialProtocol.h"
#include "filesystem/RSSDirectory.h"
#include "ThumbnailCache.h"
diff --git a/xbmc/addons/Scraper.cpp b/xbmc/addons/Scraper.cpp
index 796a2c58b6..b7536d3a41 100644
--- a/xbmc/addons/Scraper.cpp
+++ b/xbmc/addons/Scraper.cpp
@@ -21,7 +21,7 @@
#include "Scraper.h"
#include "filesystem/File.h"
#include "filesystem/Directory.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
#include "AddonManager.h"
#include "utils/ScraperParser.h"
#include "utils/ScraperUrl.h"
diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
index 37406acb41..a20d48f9b9 100644
--- a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
+++ b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
@@ -30,7 +30,7 @@
#include "dialogs/GUIDialogOK.h"
#include "guilib/GUIWindowManager.h"
#include "Application.h"
-#include "filesystem/FileMusicDatabase.h"
+#include "filesystem/MusicDatabaseFile.h"
#include "FileItem.h"
#include "utils/RegExp.h"
#include "utils/StringUtils.h"
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp
index 812fbd40df..be4b720fe3 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp
@@ -21,7 +21,7 @@
#include "DVDInputStreamHttp.h"
#include "URL.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
using namespace XFILE;
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
index 5ed50a960f..30a02a8286 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
@@ -22,7 +22,7 @@
#include "DVDInputStreamTV.h"
#include "filesystem/MythFile.h"
#include "filesystem/VTPFile.h"
-#include "filesystem/Slingbox.h"
+#include "filesystem/SlingboxFile.h"
#include "URL.h"
using namespace XFILE;
diff --git a/xbmc/filesystem/AFPDirectory.cpp b/xbmc/filesystem/AFPDirectory.cpp
index d43b0f92d8..d5e3345310 100644
--- a/xbmc/filesystem/AFPDirectory.cpp
+++ b/xbmc/filesystem/AFPDirectory.cpp
@@ -23,7 +23,7 @@
#if defined(HAS_FILESYSTEM_AFP)
#include "AFPDirectory.h"
-#include "FileAFP.h"
+#include "AFPFile.h"
#include "Util.h"
#include "guilib/LocalizeStrings.h"
#include "Application.h"
diff --git a/xbmc/filesystem/FileAFP.cpp b/xbmc/filesystem/AFPFile.cpp
index ff45413aa5..fbfe0ec3d0 100644
--- a/xbmc/filesystem/FileAFP.cpp
+++ b/xbmc/filesystem/AFPFile.cpp
@@ -19,14 +19,14 @@
*
*/
-// FileAFP.cpp: implementation of the CFileAFP class.
+// FileAFP.cpp: implementation of the CAFPFile class.
//
//////////////////////////////////////////////////////////////////////
#ifdef _LINUX
#include "system.h"
#if defined(HAS_FILESYSTEM_AFP)
-#include "FileAFP.h"
+#include "AFPFile.h"
#include "PasswordManager.h"
#include "AFPDirectory.h"
#include "Util.h"
@@ -421,7 +421,7 @@ CStdString CAfpConnection::GetPath(const CURL &url)
CAfpConnection gAfpConnection;
-CFileAFP::CFileAFP()
+CAFPFile::CAFPFile()
: m_fileSize(0)
, m_fileOffset(0)
, m_pFp(NULL)
@@ -430,25 +430,25 @@ CFileAFP::CFileAFP()
gAfpConnection.AddActiveConnection();
}
-CFileAFP::~CFileAFP()
+CAFPFile::~CAFPFile()
{
gAfpConnection.AddIdleConnection();
Close();
}
-int64_t CFileAFP::GetPosition()
+int64_t CAFPFile::GetPosition()
{
if (m_pFp == NULL) return 0;
return m_fileOffset;
}
-int64_t CFileAFP::GetLength()
+int64_t CAFPFile::GetLength()
{
if (m_pFp == NULL) return 0;
return m_fileSize;
}
-bool CFileAFP::Open(const CURL& url)
+bool CAFPFile::Open(const CURL& url)
{
Close();
// we can't open files like afp://file.f or afp://server/file.f
@@ -471,12 +471,12 @@ bool CFileAFP::Open(const CURL& url)
if (gAfpConnection.GetImpl()->afp_wrap_open(m_pAfpVol, URLEncode(strPath.c_str()).c_str(), O_RDONLY, &m_pFp))
{
// write error to logfile
- CLog::Log(LOGINFO, "CFileAFP::Open: Unable to open file : '%s'\nunix_err:'%x' error : '%s'", strPath.c_str(), errno, strerror(errno));
+ CLog::Log(LOGINFO, "CAFPFile::Open: Unable to open file : '%s'\nunix_err:'%x' error : '%s'", strPath.c_str(), errno, strerror(errno));
return false;
}
}
- CLog::Log(LOGDEBUG,"CFileAFP::Open - opened %s, fd=%d",url.GetFileName().c_str(), m_pFp ? m_pFp->fileid:-1);
+ CLog::Log(LOGDEBUG,"CAFPFile::Open - opened %s, fd=%d",url.GetFileName().c_str(), m_pFp ? m_pFp->fileid:-1);
m_url = url;
#ifdef _LINUX
@@ -498,12 +498,12 @@ bool CFileAFP::Open(const CURL& url)
}
-bool CFileAFP::Exists(const CURL& url)
+bool CAFPFile::Exists(const CURL& url)
{
return Stat(url, NULL) == 0;
}
-int CFileAFP::Stat(struct __stat64* buffer)
+int CAFPFile::Stat(struct __stat64* buffer)
{
if (m_pFp == NULL)
return -1;
@@ -511,7 +511,7 @@ int CFileAFP::Stat(struct __stat64* buffer)
}
// TODO - maybe check returncode!
-int CFileAFP::Stat(const CURL& url, struct __stat64* buffer)
+int CAFPFile::Stat(const CURL& url, struct __stat64* buffer)
{
CSingleLock lock(gAfpConnection);
if (gAfpConnection.Connect(url) != CAfpConnection::AfpOk || !gAfpConnection.GetVolume())
@@ -541,7 +541,7 @@ int CFileAFP::Stat(const CURL& url, struct __stat64* buffer)
return iResult;
}
-unsigned int CFileAFP::Read(void *lpBuf, int64_t uiBufSize)
+unsigned int CAFPFile::Read(void *lpBuf, int64_t uiBufSize)
{
CSingleLock lock(gAfpConnection);
if (m_pFp == NULL || !m_pAfpVol)
@@ -573,7 +573,7 @@ unsigned int CFileAFP::Read(void *lpBuf, int64_t uiBufSize)
return (unsigned int)bytesRead;
}
-int64_t CFileAFP::Seek(int64_t iFilePosition, int iWhence)
+int64_t CAFPFile::Seek(int64_t iFilePosition, int iWhence)
{
off_t newOffset = m_fileOffset;
if (m_pFp == NULL) return -1;
@@ -601,12 +601,12 @@ int64_t CFileAFP::Seek(int64_t iFilePosition, int iWhence)
return (int64_t)m_fileOffset;
}
-void CFileAFP::Close()
+void CAFPFile::Close()
{
CSingleLock lock(gAfpConnection);
if (m_pFp != NULL && m_pAfpVol)
{
- CLog::Log(LOGDEBUG, "CFileAFP::Close closing fd %d", m_pFp->fileid);
+ CLog::Log(LOGDEBUG, "CAFPFile::Close closing fd %d", m_pFp->fileid);
#ifdef USE_CVS_AFPFS
char *name = m_pFp->basename;
#else
@@ -621,7 +621,7 @@ void CFileAFP::Close()
}
}
-int CFileAFP::Write(const void* lpBuf, int64_t uiBufSize)
+int CAFPFile::Write(const void* lpBuf, int64_t uiBufSize)
{
CSingleLock lock(gAfpConnection);
if (m_pFp == NULL || !m_pAfpVol)
@@ -647,7 +647,7 @@ int CFileAFP::Write(const void* lpBuf, int64_t uiBufSize)
return numberOfBytesWritten;
}
-bool CFileAFP::Delete(const CURL& url)
+bool CAFPFile::Delete(const CURL& url)
{
CSingleLock lock(gAfpConnection);
if (gAfpConnection.Connect(url) != CAfpConnection::AfpOk || !gAfpConnection.GetVolume())
@@ -663,7 +663,7 @@ bool CFileAFP::Delete(const CURL& url)
return (result == 0);
}
-bool CFileAFP::Rename(const CURL& url, const CURL& urlnew)
+bool CAFPFile::Rename(const CURL& url, const CURL& urlnew)
{
CSingleLock lock(gAfpConnection);
if (gAfpConnection.Connect(url) != CAfpConnection::AfpOk || !gAfpConnection.GetVolume())
@@ -680,7 +680,7 @@ bool CFileAFP::Rename(const CURL& url, const CURL& urlnew)
return (result == 0);
}
-bool CFileAFP::OpenForWrite(const CURL& url, bool bOverWrite)
+bool CAFPFile::OpenForWrite(const CURL& url, bool bOverWrite)
{
int ret = 0;
@@ -712,7 +712,7 @@ bool CFileAFP::OpenForWrite(const CURL& url, bool bOverWrite)
if (ret || m_pFp == NULL)
{
// write error to logfile
- CLog::Log(LOGERROR, "CFileAFP::Open: Unable to open file : '%s'\nunix_err:'%x' error : '%s'", strPath.c_str(), errno, strerror(errno));
+ CLog::Log(LOGERROR, "CAFPFile::Open: Unable to open file : '%s'\nunix_err:'%x' error : '%s'", strPath.c_str(), errno, strerror(errno));
return false;
}
@@ -720,7 +720,7 @@ bool CFileAFP::OpenForWrite(const CURL& url, bool bOverWrite)
return true;
}
-bool CFileAFP::IsValidFile(const CStdString& strFileName)
+bool CAFPFile::IsValidFile(const CStdString& strFileName)
{
if (strFileName.Find('/') == -1 || // doesn't have sharename
strFileName.Right(2) == "/." || // not current folder
diff --git a/xbmc/filesystem/FileAFP.h b/xbmc/filesystem/AFPFile.h
index bf6e0f92af..f9edc13227 100644
--- a/xbmc/filesystem/FileAFP.h
+++ b/xbmc/filesystem/AFPFile.h
@@ -19,7 +19,7 @@
*
*/
-// FileAFP.h: interface for the CFileAFP class.
+// FileAFP.h: interface for the CAFPFile class.
#ifndef FILEAFP_H_
#define FILEAFP_H_
@@ -96,11 +96,11 @@ extern CAfpConnection gAfpConnection;
namespace XFILE
{
-class CFileAFP : public IFile
+class CAFPFile : public IFile
{
public:
- CFileAFP();
- virtual ~CFileAFP();
+ CAFPFile();
+ virtual ~CAFPFile();
virtual void Close();
virtual int64_t Seek(int64_t iFilePosition, int iWhence = SEEK_SET);
virtual unsigned int Read(void* lpBuf, int64_t uiBufSize);
diff --git a/xbmc/filesystem/AddonsDirectory.cpp b/xbmc/filesystem/AddonsDirectory.cpp
index cdac766c17..68842c6583 100644
--- a/xbmc/filesystem/AddonsDirectory.cpp
+++ b/xbmc/filesystem/AddonsDirectory.cpp
@@ -22,9 +22,9 @@
#include "AddonsDirectory.h"
#include "addons/AddonDatabase.h"
-#include "FactoryDirectory.h"
+#include "DirectoryFactory.h"
#include "Directory.h"
-#include "DirectoryCache.h"
+#include "CacheDirectory.h"
#include "FileItem.h"
#include "addons/Repository.h"
#include "addons/AddonInstaller.h"
diff --git a/xbmc/filesystem/FileCDDA.cpp b/xbmc/filesystem/CDDAFile.cpp
index bae2d875ed..408efe1ea7 100644
--- a/xbmc/filesystem/FileCDDA.cpp
+++ b/xbmc/filesystem/CDDAFile.cpp
@@ -23,7 +23,7 @@
#ifdef HAS_DVD_DRIVE
-#include "FileCDDA.h"
+#include "CDDAFile.h"
#include <sys/stat.h>
#include "Util.h"
#include "URL.h"
diff --git a/xbmc/filesystem/FileCDDA.h b/xbmc/filesystem/CDDAFile.h
index e10e517dde..e10e517dde 100644
--- a/xbmc/filesystem/FileCDDA.h
+++ b/xbmc/filesystem/CDDAFile.h
diff --git a/xbmc/filesystem/CacheCircular.cpp b/xbmc/filesystem/CircularCache.cpp
index 1716927fc6..1716927fc6 100644
--- a/xbmc/filesystem/CacheCircular.cpp
+++ b/xbmc/filesystem/CircularCache.cpp
diff --git a/xbmc/filesystem/CacheCircular.h b/xbmc/filesystem/CircularCache.h
index 52981c6414..52981c6414 100644
--- a/xbmc/filesystem/CacheCircular.h
+++ b/xbmc/filesystem/CircularCache.h
diff --git a/xbmc/filesystem/FileCurl.cpp b/xbmc/filesystem/CurlFile.cpp
index e8783e70a4..29ae694411 100644
--- a/xbmc/filesystem/FileCurl.cpp
+++ b/xbmc/filesystem/CurlFile.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "FileCurl.h"
+#include "CurlFile.h"
#include "utils/URIUtils.h"
#include "Util.h"
#include "URL.h"
@@ -40,7 +40,7 @@
#endif
#include "DllLibCurl.h"
-#include "FileShoutcast.h"
+#include "ShoutcastFile.h"
#include "SpecialProtocol.h"
#include "utils/CharsetConverter.h"
#include "utils/log.h"
@@ -84,13 +84,13 @@ extern "C" size_t write_callback(char *buffer,
{
if(userp == NULL) return 0;
- CFileCurl::CReadState *state = (CFileCurl::CReadState *)userp;
+ CCurlFile::CReadState *state = (CCurlFile::CReadState *)userp;
return state->WriteCallback(buffer, size, nitems);
}
extern "C" size_t header_callback(void *ptr, size_t size, size_t nmemb, void *stream)
{
- CFileCurl::CReadState *state = (CFileCurl::CReadState *)stream;
+ CCurlFile::CReadState *state = (CCurlFile::CReadState *)stream;
return state->HeaderCallback(ptr, size, nmemb);
}
@@ -107,7 +107,7 @@ static inline void* realloc_simple(void *ptr, size_t size)
return ptr2;
}
-size_t CFileCurl::CReadState::HeaderCallback(void *ptr, size_t size, size_t nmemb)
+size_t CCurlFile::CReadState::HeaderCallback(void *ptr, size_t size, size_t nmemb)
{
// clear any previous header
if(m_headerdone)
@@ -138,10 +138,10 @@ size_t CFileCurl::CReadState::HeaderCallback(void *ptr, size_t size, size_t nmem
return iSize;
}
-size_t CFileCurl::CReadState::WriteCallback(char *buffer, size_t size, size_t nitems)
+size_t CCurlFile::CReadState::WriteCallback(char *buffer, size_t size, size_t nitems)
{
unsigned int amount = size * nitems;
-// CLog::Log(LOGDEBUG, "CFileCurl::WriteCallback (%p) with %i bytes, readsize = %i, writesize = %i", this, amount, m_buffer.getMaxReadSize(), m_buffer.getMaxWriteSize() - m_overflowSize);
+// CLog::Log(LOGDEBUG, "CCurlFile::WriteCallback (%p) with %i bytes, readsize = %i, writesize = %i", this, amount, m_buffer.getMaxReadSize(), m_buffer.getMaxWriteSize() - m_overflowSize);
if (m_overflowSize)
{
// we have our overflow buffer - first get rid of as much as we can
@@ -173,7 +173,7 @@ size_t CFileCurl::CReadState::WriteCallback(char *buffer, size_t size, size_t ni
}
if (amount)
{
-// CLog::Log(LOGDEBUG, "CFileCurl::WriteCallback(%p) not enough free space for %i bytes", (void*)this, amount);
+// CLog::Log(LOGDEBUG, "CCurlFile::WriteCallback(%p) not enough free space for %i bytes", (void*)this, amount);
m_overflowBuffer = (char*)realloc_simple(m_overflowBuffer, amount + m_overflowSize);
if(m_overflowBuffer == NULL)
@@ -187,7 +187,7 @@ size_t CFileCurl::CReadState::WriteCallback(char *buffer, size_t size, size_t ni
return size * nitems;
}
-CFileCurl::CReadState::CReadState()
+CCurlFile::CReadState::CReadState()
{
m_easyHandle = NULL;
m_multiHandle = NULL;
@@ -201,7 +201,7 @@ CFileCurl::CReadState::CReadState()
m_headerdone = false;
}
-CFileCurl::CReadState::~CReadState()
+CCurlFile::CReadState::~CReadState()
{
Disconnect();
@@ -209,7 +209,7 @@ CFileCurl::CReadState::~CReadState()
g_curlInterface.easy_release(&m_easyHandle, &m_multiHandle);
}
-bool CFileCurl::CReadState::Seek(int64_t pos)
+bool CCurlFile::CReadState::Seek(int64_t pos)
{
if(pos == m_filePos)
return true;
@@ -249,7 +249,7 @@ bool CFileCurl::CReadState::Seek(int64_t pos)
return false;
}
-long CFileCurl::CReadState::Connect(unsigned int size)
+long CCurlFile::CReadState::Connect(unsigned int size)
{
g_curlInterface.easy_setopt(m_easyHandle, CURLOPT_RESUME_FROM_LARGE, m_filePos);
g_curlInterface.multi_add_handle(m_multiHandle, m_easyHandle);
@@ -264,7 +264,7 @@ long CFileCurl::CReadState::Connect(unsigned int size)
m_stillRunning = 1;
if (!FillBuffer(1))
{
- CLog::Log(LOGERROR, "CFileCurl::CReadState::Open, didn't get any data from stream.");
+ CLog::Log(LOGERROR, "CCurlFile::CReadState::Open, didn't get any data from stream.");
return -1;
}
@@ -283,7 +283,7 @@ long CFileCurl::CReadState::Connect(unsigned int size)
return -1;
}
-void CFileCurl::CReadState::Disconnect()
+void CCurlFile::CReadState::Disconnect()
{
if(m_multiHandle && m_easyHandle)
g_curlInterface.multi_remove_handle(m_multiHandle, m_easyHandle);
@@ -298,7 +298,7 @@ void CFileCurl::CReadState::Disconnect()
}
-CFileCurl::~CFileCurl()
+CCurlFile::~CCurlFile()
{
if (m_opened)
Close();
@@ -306,7 +306,7 @@ CFileCurl::~CFileCurl()
g_curlInterface.Unload();
}
-CFileCurl::CFileCurl()
+CCurlFile::CCurlFile()
{
g_curlInterface.Load(); // loads the curl dll and resolves exports etc.
m_curlAliasList = NULL;
@@ -331,12 +331,12 @@ CFileCurl::CFileCurl()
}
//Has to be called before Open()
-void CFileCurl::SetBufferSize(unsigned int size)
+void CCurlFile::SetBufferSize(unsigned int size)
{
m_bufferSize = size;
}
-void CFileCurl::Close()
+void CCurlFile::Close()
{
m_state->Disconnect();
@@ -355,7 +355,7 @@ void CFileCurl::Close()
m_opened = false;
}
-void CFileCurl::SetCommonOptions(CReadState* state)
+void CCurlFile::SetCommonOptions(CReadState* state)
{
CURL_HANDLE* h = state->m_easyHandle;
@@ -521,7 +521,7 @@ void CFileCurl::SetCommonOptions(CReadState* state)
g_curlInterface.easy_setopt(h, CURLOPT_LOW_SPEED_TIME, m_lowspeedtime);
}
-void CFileCurl::SetRequestHeaders(CReadState* state)
+void CCurlFile::SetRequestHeaders(CReadState* state)
{
if(m_curlHeaderList)
{
@@ -542,7 +542,7 @@ void CFileCurl::SetRequestHeaders(CReadState* state)
}
-void CFileCurl::SetCorrectHeaders(CReadState* state)
+void CCurlFile::SetCorrectHeaders(CReadState* state)
{
CHttpHeader& h = state->m_httpheader;
/* workaround for shoutcast server wich doesn't set content type on standard mp3 */
@@ -564,7 +564,7 @@ void CFileCurl::SetCorrectHeaders(CReadState* state)
}
}
-void CFileCurl::ParseAndCorrectUrl(CURL &url2)
+void CCurlFile::ParseAndCorrectUrl(CURL &url2)
{
CStdString strProtocol = url2.GetTranslatedProtocol();
url2.SetProtocol(strProtocol);
@@ -726,17 +726,17 @@ void CFileCurl::ParseAndCorrectUrl(CURL &url2)
m_url = url2.Get();
}
-bool CFileCurl::Post(const CStdString& strURL, const CStdString& strPostData, CStdString& strHTML)
+bool CCurlFile::Post(const CStdString& strURL, const CStdString& strPostData, CStdString& strHTML)
{
return Service(strURL, strPostData, strHTML);
}
-bool CFileCurl::Get(const CStdString& strURL, CStdString& strHTML)
+bool CCurlFile::Get(const CStdString& strURL, CStdString& strHTML)
{
return Service(strURL, "", strHTML);
}
-bool CFileCurl::Service(const CStdString& strURL, const CStdString& strPostData, CStdString& strHTML)
+bool CCurlFile::Service(const CStdString& strURL, const CStdString& strPostData, CStdString& strHTML)
{
m_postdata = strPostData;
if (Open(strURL))
@@ -751,7 +751,7 @@ bool CFileCurl::Service(const CStdString& strURL, const CStdString& strPostData,
return false;
}
-bool CFileCurl::ReadData(CStdString& strHTML)
+bool CCurlFile::ReadData(CStdString& strHTML)
{
int size_read = 0;
int data_size = 0;
@@ -768,7 +768,7 @@ bool CFileCurl::ReadData(CStdString& strHTML)
return true;
}
-bool CFileCurl::Download(const CStdString& strURL, const CStdString& strFileName, LPDWORD pdwSize)
+bool CCurlFile::Download(const CStdString& strURL, const CStdString& strFileName, LPDWORD pdwSize)
{
CLog::Log(LOGINFO, "Download: %s->%s", strURL.c_str(), strFileName.c_str());
@@ -796,7 +796,7 @@ bool CFileCurl::Download(const CStdString& strURL, const CStdString& strFileName
}
// Detect whether we are "online" or not! Very simple and dirty!
-bool CFileCurl::IsInternet(bool checkDNS /* = true */)
+bool CCurlFile::IsInternet(bool checkDNS /* = true */)
{
CStdString strURL = "http://www.google.com";
if (!checkDNS)
@@ -808,19 +808,19 @@ bool CFileCurl::IsInternet(bool checkDNS /* = true */)
return found;
}
-void CFileCurl::Cancel()
+void CCurlFile::Cancel()
{
m_state->m_cancelled = true;
while (m_opened)
Sleep(1);
}
-void CFileCurl::Reset()
+void CCurlFile::Reset()
{
m_state->m_cancelled = false;
}
-bool CFileCurl::Open(const CURL& url)
+bool CCurlFile::Open(const CURL& url)
{
m_opened = true;
@@ -828,7 +828,7 @@ bool CFileCurl::Open(const CURL& url)
CURL url2(url);
ParseAndCorrectUrl(url2);
- CLog::Log(LOGDEBUG, "FileCurl::Open(%p) %s", (void*)this, m_url.c_str());
+ CLog::Log(LOGDEBUG, "CurlFile::Open(%p) %s", (void*)this, m_url.c_str());
ASSERT(!(!m_state->m_easyHandle ^ !m_state->m_multiHandle));
if( m_state->m_easyHandle == NULL )
@@ -856,8 +856,8 @@ bool CFileCurl::Open(const CURL& url)
|| !m_state->m_httpheader.GetValue("icy-name").IsEmpty()
|| !m_state->m_httpheader.GetValue("icy-br").IsEmpty()) && !m_skipshout)
{
- CLog::Log(LOGDEBUG,"FileCurl - file <%s> is a shoutcast stream. re-opening", m_url.c_str());
- throw new CRedirectException(new CFileShoutcast);
+ CLog::Log(LOGDEBUG,"CurlFile - file <%s> is a shoutcast stream. re-opening", m_url.c_str());
+ throw new CRedirectException(new CShoutcastFile);
}
m_multisession = false;
@@ -866,7 +866,7 @@ bool CFileCurl::Open(const CURL& url)
m_multisession = true;
if(m_state->m_httpheader.GetValue("Server").Find("Portable SDK for UPnP devices") >= 0)
{
- CLog::Log(LOGWARNING, "FileCurl - disabling multi session due to broken libupnp server");
+ CLog::Log(LOGWARNING, "CurlFile - disabling multi session due to broken libupnp server");
m_multisession = false;
}
}
@@ -895,7 +895,7 @@ bool CFileCurl::Open(const CURL& url)
return true;
}
-bool CFileCurl::CReadState::ReadString(char *szLine, int iLineLength)
+bool CCurlFile::CReadState::ReadString(char *szLine, int iLineLength)
{
unsigned int want = (unsigned int)iLineLength;
@@ -927,7 +927,7 @@ bool CFileCurl::CReadState::ReadString(char *szLine, int iLineLength)
return (bool)((pLine - szLine) > 0);
}
-bool CFileCurl::Exists(const CURL& url)
+bool CCurlFile::Exists(const CURL& url)
{
// if file is already running, get info from it
if( m_opened )
@@ -964,7 +964,7 @@ bool CFileCurl::Exists(const CURL& url)
return false;
}
-int64_t CFileCurl::Seek(int64_t iFilePosition, int iWhence)
+int64_t CCurlFile::Seek(int64_t iFilePosition, int iWhence)
{
int64_t nextPos = m_state->m_filePos;
switch(iWhence)
@@ -1034,19 +1034,19 @@ int64_t CFileCurl::Seek(int64_t iFilePosition, int iWhence)
return m_state->m_filePos;
}
-int64_t CFileCurl::GetLength()
+int64_t CCurlFile::GetLength()
{
if (!m_opened) return 0;
return m_state->m_fileSize;
}
-int64_t CFileCurl::GetPosition()
+int64_t CCurlFile::GetPosition()
{
if (!m_opened) return 0;
return m_state->m_filePos;
}
-int CFileCurl::Stat(const CURL& url, struct __stat64* buffer)
+int CCurlFile::Stat(const CURL& url, struct __stat64* buffer)
{
// if file is already running, get info from it
if( m_opened )
@@ -1156,7 +1156,7 @@ int CFileCurl::Stat(const CURL& url, struct __stat64* buffer)
return 0;
}
-unsigned int CFileCurl::CReadState::Read(void* lpBuf, int64_t uiBufSize)
+unsigned int CCurlFile::CReadState::Read(void* lpBuf, int64_t uiBufSize)
{
/* only request 1 byte, for truncated reads (only if not eof) */
if((m_fileSize == 0 || m_filePos < m_fileSize) && !FillBuffer(1))
@@ -1183,7 +1183,7 @@ unsigned int CFileCurl::CReadState::Read(void* lpBuf, int64_t uiBufSize)
}
/* use to attempt to fill the read buffer up to requested number of bytes */
-bool CFileCurl::CReadState::FillBuffer(unsigned int want)
+bool CCurlFile::CReadState::FillBuffer(unsigned int want)
{
int retry=0;
fd_set fdread;
@@ -1333,17 +1333,17 @@ bool CFileCurl::CReadState::FillBuffer(unsigned int want)
return true;
}
-void CFileCurl::ClearRequestHeaders()
+void CCurlFile::ClearRequestHeaders()
{
m_requestheaders.clear();
}
-void CFileCurl::SetRequestHeader(CStdString header, CStdString value)
+void CCurlFile::SetRequestHeader(CStdString header, CStdString value)
{
m_requestheaders[header] = value;
}
-void CFileCurl::SetRequestHeader(CStdString header, long value)
+void CCurlFile::SetRequestHeader(CStdString header, long value)
{
CStdString buffer;
buffer.Format("%ld", value);
@@ -1351,11 +1351,11 @@ void CFileCurl::SetRequestHeader(CStdString header, long value)
}
/* STATIC FUNCTIONS */
-bool CFileCurl::GetHttpHeader(const CURL &url, CHttpHeader &headers)
+bool CCurlFile::GetHttpHeader(const CURL &url, CHttpHeader &headers)
{
try
{
- CFileCurl file;
+ CCurlFile file;
if(file.Stat(url, NULL) == 0)
{
headers = file.GetHttpHeader();
@@ -1370,9 +1370,9 @@ bool CFileCurl::GetHttpHeader(const CURL &url, CHttpHeader &headers)
}
}
-bool CFileCurl::GetMimeType(const CURL &url, CStdString &content, CStdString useragent)
+bool CCurlFile::GetMimeType(const CURL &url, CStdString &content, CStdString useragent)
{
- CFileCurl file;
+ CCurlFile file;
if (!useragent.IsEmpty())
file.SetUserAgent(useragent);
@@ -1383,15 +1383,15 @@ bool CFileCurl::GetMimeType(const CURL &url, CStdString &content, CStdString use
content = "x-directory/normal";
else
content = file.GetMimeType();
- CLog::Log(LOGDEBUG, "CFileCurl::GetMimeType - %s -> %s", url.Get().c_str(), content.c_str());
+ CLog::Log(LOGDEBUG, "CCurlFile::GetMimeType - %s -> %s", url.Get().c_str(), content.c_str());
return true;
}
- CLog::Log(LOGDEBUG, "CFileCurl::GetMimeType - %s -> failed", url.Get().c_str());
+ CLog::Log(LOGDEBUG, "CCurlFile::GetMimeType - %s -> failed", url.Get().c_str());
content = "";
return false;
}
-int CFileCurl::IoControl(EIoControl request, void* param)
+int CCurlFile::IoControl(EIoControl request, void* param)
{
if(request == IOCTRL_SEEK_POSSIBLE)
return m_seekable ? 1 : 0;
diff --git a/xbmc/filesystem/FileCurl.h b/xbmc/filesystem/CurlFile.h
index 126f7bf0f3..158e750ccc 100644
--- a/xbmc/filesystem/FileCurl.h
+++ b/xbmc/filesystem/CurlFile.h
@@ -36,11 +36,11 @@ class CHttpHeader;
namespace XFILE
{
- class CFileCurl : public IFile
+ class CCurlFile : public IFile
{
public:
- CFileCurl();
- virtual ~CFileCurl();
+ CCurlFile();
+ virtual ~CCurlFile();
virtual bool Open(const CURL& url);
virtual bool Exists(const CURL& url);
virtual int64_t Seek(int64_t iFilePosition, int iWhence=SEEK_SET);
diff --git a/xbmc/filesystem/DAAPDirectory.cpp b/xbmc/filesystem/DAAPDirectory.cpp
index ddb6183f14..492abcbbdc 100644
--- a/xbmc/filesystem/DAAPDirectory.cpp
+++ b/xbmc/filesystem/DAAPDirectory.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "FileDAAP.h"
+#include "DAAPFile.h"
#include "DAAPDirectory.h"
#include "music/tags/MusicInfoTag.h"
#include "FileItem.h"
diff --git a/xbmc/filesystem/FileDAAP.cpp b/xbmc/filesystem/DAAPFile.cpp
index 0f8b522ecf..46b222011c 100644
--- a/xbmc/filesystem/FileDAAP.cpp
+++ b/xbmc/filesystem/DAAPFile.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "FileDAAP.h"
+#include "DAAPFile.h"
#include "SectionLoader.h"
#include "threads/SingleLock.h"
#include "utils/log.h"
@@ -138,7 +138,7 @@ void CDaapClient::StatusCallback(DAAP_SClient *pClient, DAAP_Status status, int
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-CFileDAAP::CFileDAAP()
+CDAAPFile::CDAAPFile()
{
m_thisHost = NULL;
m_thisClient = NULL;
@@ -146,7 +146,7 @@ CFileDAAP::CFileDAAP()
m_bOpened = false;
}
-CFileDAAP::~CFileDAAP()
+CDAAPFile::~CDAAPFile()
{
Close();
}
@@ -154,7 +154,7 @@ CFileDAAP::~CFileDAAP()
//*********************************************************************************************
-bool CFileDAAP::Open(const CURL& url)
+bool CDAAPFile::Open(const CURL& url)
{
CSingleLock lock(g_DaapClient);
@@ -162,7 +162,7 @@ bool CFileDAAP::Open(const CURL& url)
m_url = url;
- CLog::Log(LOGDEBUG, "CFileDAAP::Open(%s)", url.GetFileName().c_str());
+ CLog::Log(LOGDEBUG, "CDAAPFile::Open(%s)", url.GetFileName().c_str());
CStdString host = url.GetHostName();
if (url.HasPort())
host.Format("%s:%i",url.GetHostName(),url.GetPort());
@@ -198,20 +198,20 @@ bool CFileDAAP::Open(const CURL& url)
//*********************************************************************************************
-unsigned int CFileDAAP::Read(void *lpBuf, int64_t uiBufSize)
+unsigned int CDAAPFile::Read(void *lpBuf, int64_t uiBufSize)
{
return m_curl.Read(lpBuf, uiBufSize);
}
//*********************************************************************************************
-void CFileDAAP::Close()
+void CDAAPFile::Close()
{
m_curl.Close();
m_bOpened = false;
}
//*********************************************************************************************
-int64_t CFileDAAP::Seek(int64_t iFilePosition, int iWhence)
+int64_t CDAAPFile::Seek(int64_t iFilePosition, int iWhence)
{
CSingleLock lock(g_DaapClient);
@@ -227,28 +227,28 @@ int64_t CFileDAAP::Seek(int64_t iFilePosition, int iWhence)
}
//*********************************************************************************************
-int64_t CFileDAAP::GetLength()
+int64_t CDAAPFile::GetLength()
{
return m_curl.GetLength();
}
//*********************************************************************************************
-int64_t CFileDAAP::GetPosition()
+int64_t CDAAPFile::GetPosition()
{
return m_curl.GetPosition();
}
-bool CFileDAAP::Exists(const CURL& url)
+bool CDAAPFile::Exists(const CURL& url)
{
return false;
}
-int CFileDAAP::Stat(const CURL& url, struct __stat64* buffer)
+int CDAAPFile::Stat(const CURL& url, struct __stat64* buffer)
{
return -1;
}
-int CFileDAAP::IoControl(EIoControl request, void* param)
+int CDAAPFile::IoControl(EIoControl request, void* param)
{
if(request == IOCTRL_SEEK_POSSIBLE)
return 1;
diff --git a/xbmc/filesystem/FileDAAP.h b/xbmc/filesystem/DAAPFile.h
index efa6f15619..e347bbe211 100644
--- a/xbmc/filesystem/FileDAAP.h
+++ b/xbmc/filesystem/DAAPFile.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-// FileDAAP.h: interface for the CFileDAAP class.
+// FileDAAP.h: interface for the CDAAPFile class.
//
//////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@
#endif // _MSC_VER > 1000
#include "lib/libXDAAP/client.h"
-#include "FileCurl.h"
+#include "CurlFile.h"
#include "URL.h"
#include "threads/CriticalSection.h"
@@ -64,11 +64,11 @@ extern CDaapClient g_DaapClient;
namespace XFILE
{
-class CFileDAAP : public IFile
+class CDAAPFile : public IFile
{
public:
- CFileDAAP();
- virtual ~CFileDAAP();
+ CDAAPFile();
+ virtual ~CDAAPFile();
virtual int64_t GetPosition();
virtual int64_t GetLength();
virtual bool Open(const CURL& url);
@@ -96,7 +96,7 @@ protected:
CStdString m_hashurl; // the url that should be used in hash calculation
CURL m_url; // the complete url we have connected too
- CFileCurl m_curl;
+ CCurlFile m_curl;
};
}
diff --git a/xbmc/filesystem/DAVDirectory.cpp b/xbmc/filesystem/DAVDirectory.cpp
index 9a456c8a46..94e901cebb 100644
--- a/xbmc/filesystem/DAVDirectory.cpp
+++ b/xbmc/filesystem/DAVDirectory.cpp
@@ -21,7 +21,7 @@
#include "DAVDirectory.h"
#include "URL.h"
-#include "FileCurl.h"
+#include "CurlFile.h"
#include "FileItem.h"
#include "utils/RegExp.h"
#include "utils/StringUtils.h"
diff --git a/xbmc/filesystem/Directory.cpp b/xbmc/filesystem/Directory.cpp
index 75102674d4..b996e7554a 100644
--- a/xbmc/filesystem/Directory.cpp
+++ b/xbmc/filesystem/Directory.cpp
@@ -20,13 +20,13 @@
*/
#include "Directory.h"
-#include "FactoryDirectory.h"
-#include "FactoryFileDirectory.h"
+#include "DirectoryFactory.h"
+#include "FileDirectoryFactory.h"
#ifndef _LINUX
#include "utils/Win32Exception.h"
#endif
#include "FileItem.h"
-#include "DirectoryCache.h"
+#include "CacheDirectory.h"
#include "settings/GUISettings.h"
#include "utils/log.h"
#include "utils/Job.h"
diff --git a/xbmc/filesystem/DirectoryCache.cpp b/xbmc/filesystem/DirectoryCache.cpp
index 84bc32e6ba..c4a60cb05e 100644
--- a/xbmc/filesystem/DirectoryCache.cpp
+++ b/xbmc/filesystem/DirectoryCache.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "DirectoryCache.h"
+#include "CacheDirectory.h"
#include "settings/Settings.h"
#include "FileItem.h"
#include "threads/SingleLock.h"
@@ -30,7 +30,7 @@
using namespace std;
using namespace XFILE;
-CDirectoryCache::CDir::CDir(DIR_CACHE_TYPE cacheType)
+CCacheDirectory::CDir::CDir(DIR_CACHE_TYPE cacheType)
{
m_cacheType = cacheType;
m_lastAccess = 0;
@@ -38,17 +38,17 @@ CDirectoryCache::CDir::CDir(DIR_CACHE_TYPE cacheType)
m_Items->SetFastLookup(true);
}
-CDirectoryCache::CDir::~CDir()
+CCacheDirectory::CDir::~CDir()
{
delete m_Items;
}
-void CDirectoryCache::CDir::SetLastAccess(unsigned int &accessCounter)
+void CCacheDirectory::CDir::SetLastAccess(unsigned int &accessCounter)
{
m_lastAccess = accessCounter++;
}
-CDirectoryCache::CDirectoryCache(void)
+CCacheDirectory::CCacheDirectory(void)
{
m_iThumbCacheRefCount = 0;
m_iMusicThumbCacheRefCount = 0;
@@ -59,11 +59,11 @@ CDirectoryCache::CDirectoryCache(void)
#endif
}
-CDirectoryCache::~CDirectoryCache(void)
+CCacheDirectory::~CCacheDirectory(void)
{
}
-bool CDirectoryCache::GetDirectory(const CStdString& strPath, CFileItemList &items, bool retrieveAll)
+bool CCacheDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items, bool retrieveAll)
{
CSingleLock lock (m_cs);
@@ -88,7 +88,7 @@ bool CDirectoryCache::GetDirectory(const CStdString& strPath, CFileItemList &ite
return false;
}
-void CDirectoryCache::SetDirectory(const CStdString& strPath, const CFileItemList &items, DIR_CACHE_TYPE cacheType)
+void CCacheDirectory::SetDirectory(const CStdString& strPath, const CFileItemList &items, DIR_CACHE_TYPE cacheType)
{
if (cacheType == DIR_CACHE_NEVER)
return; // nothing to do
@@ -98,7 +98,7 @@ void CDirectoryCache::SetDirectory(const CStdString& strPath, const CFileItemLis
// processing on the items (stacking, transparent rars/zips for instance) that
// alters the URL of the items. If we shared the pointers, we'd have problems
// as the URLs in the cache would have changed, so things such as
- // CDirectoryCache::FileExists() would fail for files that really do exist (just their
+ // CCacheDirectory::FileExists() would fail for files that really do exist (just their
// URL's have been altered). This is called from CFile::Exists() which causes
// all sorts of hassles.
// IDEALLY, any further processing on the item would actually create a new item
@@ -119,14 +119,14 @@ void CDirectoryCache::SetDirectory(const CStdString& strPath, const CFileItemLis
m_cache.insert(pair<CStdString, CDir*>(storedPath, dir));
}
-void CDirectoryCache::ClearFile(const CStdString& strFile)
+void CCacheDirectory::ClearFile(const CStdString& strFile)
{
CStdString strPath;
URIUtils::GetDirectory(strFile, strPath);
ClearDirectory(strPath);
}
-void CDirectoryCache::ClearDirectory(const CStdString& strPath)
+void CCacheDirectory::ClearDirectory(const CStdString& strPath)
{
CSingleLock lock (m_cs);
@@ -138,7 +138,7 @@ void CDirectoryCache::ClearDirectory(const CStdString& strPath)
Delete(i);
}
-void CDirectoryCache::ClearSubPaths(const CStdString& strPath)
+void CCacheDirectory::ClearSubPaths(const CStdString& strPath)
{
CSingleLock lock (m_cs);
@@ -156,7 +156,7 @@ void CDirectoryCache::ClearSubPaths(const CStdString& strPath)
}
}
-void CDirectoryCache::AddFile(const CStdString& strFile)
+void CCacheDirectory::AddFile(const CStdString& strFile)
{
CSingleLock lock (m_cs);
@@ -174,7 +174,7 @@ void CDirectoryCache::AddFile(const CStdString& strFile)
}
}
-bool CDirectoryCache::FileExists(const CStdString& strFile, bool& bInCache)
+bool CCacheDirectory::FileExists(const CStdString& strFile, bool& bInCache)
{
CSingleLock lock (m_cs);
bInCache = false;
@@ -200,7 +200,7 @@ bool CDirectoryCache::FileExists(const CStdString& strFile, bool& bInCache)
return false;
}
-void CDirectoryCache::Clear()
+void CCacheDirectory::Clear()
{
// this routine clears everything except things we always cache
CSingleLock lock (m_cs);
@@ -215,7 +215,7 @@ void CDirectoryCache::Clear()
}
}
-void CDirectoryCache::InitCache(set<CStdString>& dirs)
+void CCacheDirectory::InitCache(set<CStdString>& dirs)
{
set<CStdString>::iterator it;
for (it = dirs.begin(); it != dirs.end(); ++it)
@@ -227,7 +227,7 @@ void CDirectoryCache::InitCache(set<CStdString>& dirs)
}
}
-void CDirectoryCache::ClearCache(set<CStdString>& dirs)
+void CCacheDirectory::ClearCache(set<CStdString>& dirs)
{
iCache i = m_cache.begin();
while (i != m_cache.end())
@@ -239,7 +239,7 @@ void CDirectoryCache::ClearCache(set<CStdString>& dirs)
}
}
-bool CDirectoryCache::IsCacheDir(const CStdString &strPath) const
+bool CCacheDirectory::IsCacheDir(const CStdString &strPath) const
{
if (m_thumbDirs.find(strPath) == m_thumbDirs.end())
return false;
@@ -249,7 +249,7 @@ bool CDirectoryCache::IsCacheDir(const CStdString &strPath) const
return true;
}
-void CDirectoryCache::InitThumbCache()
+void CCacheDirectory::InitThumbCache()
{
CSingleLock lock (m_cs);
@@ -276,7 +276,7 @@ void CDirectoryCache::InitThumbCache()
InitCache(m_thumbDirs);
}
-void CDirectoryCache::ClearThumbCache()
+void CCacheDirectory::ClearThumbCache()
{
CSingleLock lock (m_cs);
@@ -290,7 +290,7 @@ void CDirectoryCache::ClearThumbCache()
ClearCache(m_thumbDirs);
}
-void CDirectoryCache::InitMusicThumbCache()
+void CCacheDirectory::InitMusicThumbCache()
{
CSingleLock lock (m_cs);
@@ -317,7 +317,7 @@ void CDirectoryCache::InitMusicThumbCache()
InitCache(m_musicThumbDirs);
}
-void CDirectoryCache::ClearMusicThumbCache()
+void CCacheDirectory::ClearMusicThumbCache()
{
CSingleLock lock (m_cs);
@@ -331,7 +331,7 @@ void CDirectoryCache::ClearMusicThumbCache()
ClearCache(m_musicThumbDirs);
}
-void CDirectoryCache::CheckIfFull()
+void CCacheDirectory::CheckIfFull()
{
CSingleLock lock (m_cs);
static const unsigned int max_cached_dirs = 10;
@@ -353,7 +353,7 @@ void CDirectoryCache::CheckIfFull()
Delete(lastAccessed);
}
-void CDirectoryCache::Delete(iCache it)
+void CCacheDirectory::Delete(iCache it)
{
CDir* dir = it->second;
delete dir;
@@ -361,7 +361,7 @@ void CDirectoryCache::Delete(iCache it)
}
#ifdef _DEBUG
-void CDirectoryCache::PrintStats() const
+void CCacheDirectory::PrintStats() const
{
CSingleLock lock (m_cs);
CLog::Log(LOGDEBUG, "%s - total of %u cache hits, and %u cache misses", __FUNCTION__, m_cacheHits, m_cacheMisses);
diff --git a/xbmc/filesystem/DirectoryCache.h b/xbmc/filesystem/DirectoryCache.h
index 075333f1f0..4efe9c3cd5 100644
--- a/xbmc/filesystem/DirectoryCache.h
+++ b/xbmc/filesystem/DirectoryCache.h
@@ -31,7 +31,7 @@ class CFileItem;
namespace XFILE
{
- class CDirectoryCache
+ class CCacheDirectory
{
class CDir
{
@@ -48,8 +48,8 @@ namespace XFILE
unsigned int m_lastAccess;
};
public:
- CDirectoryCache(void);
- virtual ~CDirectoryCache(void);
+ CCacheDirectory(void);
+ virtual ~CCacheDirectory(void);
bool GetDirectory(const CStdString& strPath, CFileItemList &items, bool retrieveAll = false);
void SetDirectory(const CStdString& strPath, const CFileItemList &items, DIR_CACHE_TYPE cacheType);
void ClearDirectory(const CStdString& strPath);
@@ -90,4 +90,4 @@ namespace XFILE
#endif
};
}
-extern XFILE::CDirectoryCache g_directoryCache;
+extern XFILE::CCacheDirectory g_directoryCache;
diff --git a/xbmc/filesystem/FactoryDirectory.cpp b/xbmc/filesystem/DirectoryFactory.cpp
index 4eff97fb4c..d7ba5a5527 100644
--- a/xbmc/filesystem/FactoryDirectory.cpp
+++ b/xbmc/filesystem/DirectoryFactory.cpp
@@ -23,12 +23,12 @@
#include "config.h"
#endif
#include "system.h"
-#include "FactoryDirectory.h"
+#include "DirectoryFactory.h"
#include "HDDirectory.h"
#include "SpecialProtocolDirectory.h"
#include "MultiPathDirectory.h"
#include "StackDirectory.h"
-#include "FactoryFileDirectory.h"
+#include "FileDirectoryFactory.h"
#include "PlaylistDirectory.h"
#include "MusicDatabaseDirectory.h"
#include "MusicSearchDirectory.h"
@@ -80,9 +80,9 @@
#ifdef HAS_FILESYSTEM_RAR
#include "RarDirectory.h"
#endif
-#include "DirectoryTuxBox.h"
-#include "HDHomeRun.h"
-#include "Slingbox.h"
+#include "TuxBoxDirectory.h"
+#include "HDHomeRunDirectory.h"
+#include "SlingboxDirectory.h"
#include "MythDirectory.h"
#include "FileItem.h"
#include "URL.h"
@@ -108,12 +108,12 @@ using namespace XFILE;
\return IDirectory object to access the directories on the share.
\sa IDirectory
*/
-IDirectory* CFactoryDirectory::Create(const CStdString& strPath)
+IDirectory* CDirectoryFactory::Create(const CStdString& strPath)
{
CURL url(strPath);
CFileItem item(strPath, false);
- IFileDirectory* pDir=CFactoryFileDirectory::Create(strPath, &item);
+ IFileDirectory* pDir=CFileDirectoryFactory::Create(strPath, &item);
if (pDir)
return pDir;
@@ -143,12 +143,12 @@ IDirectory* CFactoryDirectory::Create(const CStdString& strPath)
if (strProtocol == "musicsearch") return new CMusicSearchDirectory();
if (strProtocol == "videodb") return new CVideoDatabaseDirectory();
if (strProtocol == "filereader")
- return CFactoryDirectory::Create(url.GetFileName());
+ return CDirectoryFactory::Create(url.GetFileName());
if( g_application.getNetwork().IsAvailable(true) ) // true to wait for the network (if possible)
{
if (strProtocol == "lastfm") return new CLastFMDirectory();
- if (strProtocol == "tuxbox") return new CDirectoryTuxBox();
+ if (strProtocol == "tuxbox") return new CTuxBoxDirectory();
if (strProtocol == "ftp" || strProtocol == "ftpx" || strProtocol == "ftps") return new CFTPDirectory();
if (strProtocol == "http" || strProtocol == "https") return new CHTTPDirectory();
if (strProtocol == "dav" || strProtocol == "davs") return new CDAVDirectory();
@@ -173,7 +173,7 @@ IDirectory* CFactoryDirectory::Create(const CStdString& strPath)
#ifdef HAS_UPNP
if (strProtocol == "upnp") return new CUPnPDirectory();
#endif
- if (strProtocol == "hdhomerun") return new CDirectoryHomeRun();
+ if (strProtocol == "hdhomerun") return new CHomeRunDirectory();
if (strProtocol == "sling") return new CSlingboxDirectory();
if (strProtocol == "myth") return new CMythDirectory();
if (strProtocol == "cmyth") return new CMythDirectory();
diff --git a/xbmc/filesystem/FactoryDirectory.h b/xbmc/filesystem/DirectoryFactory.h
index f5259173fa..6ff0776e3c 100644
--- a/xbmc/filesystem/FactoryDirectory.h
+++ b/xbmc/filesystem/DirectoryFactory.h
@@ -36,14 +36,14 @@ namespace XFILE
\verbatim
CStdString strShare="iso9660://";
- IDirectory* pDir=CFactoryDirectory::Create(strShare);
+ IDirectory* pDir=CDirectoryFactory::Create(strShare);
\endverbatim
The \e pDir pointer can be used to access a directory and retrieve it's content.
When different types of shares have to be accessed use CVirtualDirectory.
\sa IDirectory
*/
-class CFactoryDirectory
+class CDirectoryFactory
{
public:
static IDirectory* Create(const CStdString& strPath);
diff --git a/xbmc/filesystem/FTPDirectory.cpp b/xbmc/filesystem/FTPDirectory.cpp
index 4b7ce401c8..e46792a232 100644
--- a/xbmc/filesystem/FTPDirectory.cpp
+++ b/xbmc/filesystem/FTPDirectory.cpp
@@ -23,7 +23,7 @@
#include "FTPParse.h"
#include "URL.h"
#include "utils/URIUtils.h"
-#include "FileCurl.h"
+#include "CurlFile.h"
#include "FileItem.h"
#include "utils/StringUtils.h"
#include "utils/CharsetConverter.h"
diff --git a/xbmc/filesystem/File.cpp b/xbmc/filesystem/File.cpp
index 6bfe7dac07..389033810e 100644
--- a/xbmc/filesystem/File.cpp
+++ b/xbmc/filesystem/File.cpp
@@ -21,9 +21,9 @@
#include "File.h"
#include "FileFactory.h"
#include "Application.h"
-#include "DirectoryCache.h"
+#include "CacheDirectory.h"
#include "Directory.h"
-#include "FileCache.h"
+#include "CacheFile.h"
#include "utils/log.h"
#include "utils/URIUtils.h"
#include "utils/BitstreamStats.h"
diff --git a/xbmc/filesystem/FileCache.cpp b/xbmc/filesystem/FileCache.cpp
index fa47836001..2911f0f18a 100644
--- a/xbmc/filesystem/FileCache.cpp
+++ b/xbmc/filesystem/FileCache.cpp
@@ -21,7 +21,7 @@
#include "threads/SystemClock.h"
#include "utils/AutoPtrHandle.h"
-#include "FileCache.h"
+#include "CacheFile.h"
#include "threads/Thread.h"
#include "File.h"
#include "URL.h"
@@ -79,7 +79,7 @@ private:
};
-CFileCache::CFileCache()
+CCacheFile::CCacheFile()
{
m_bDeleteCache = true;
m_nSeekResult = 0;
@@ -95,7 +95,7 @@ CFileCache::CFileCache()
m_cacheFull = false;
}
-CFileCache::CFileCache(CCacheStrategy *pCache, bool bDeleteCache)
+CCacheFile::CCacheFile(CCacheStrategy *pCache, bool bDeleteCache)
{
m_pCache = pCache;
m_bDeleteCache = bDeleteCache;
@@ -106,7 +106,7 @@ CFileCache::CFileCache(CCacheStrategy *pCache, bool bDeleteCache)
m_chunkSize = 0;
}
-CFileCache::~CFileCache()
+CCacheFile::~CCacheFile()
{
Close();
@@ -116,7 +116,7 @@ CFileCache::~CFileCache()
m_pCache = NULL;
}
-void CFileCache::SetCacheStrategy(CCacheStrategy *pCache, bool bDeleteCache)
+void CCacheFile::SetCacheStrategy(CCacheStrategy *pCache, bool bDeleteCache)
{
if (m_bDeleteCache && m_pCache)
delete m_pCache;
@@ -125,22 +125,22 @@ void CFileCache::SetCacheStrategy(CCacheStrategy *pCache, bool bDeleteCache)
m_bDeleteCache = bDeleteCache;
}
-IFile *CFileCache::GetFileImp()
+IFile *CCacheFile::GetFileImp()
{
return m_source.GetImplemenation();
}
-bool CFileCache::Open(const CURL& url)
+bool CCacheFile::Open(const CURL& url)
{
Close();
CSingleLock lock(m_sync);
- CLog::Log(LOGDEBUG,"CFileCache::Open - opening <%s> using cache", url.GetFileName().c_str());
+ CLog::Log(LOGDEBUG,"CCacheFile::Open - opening <%s> using cache", url.GetFileName().c_str());
if (!m_pCache)
{
- CLog::Log(LOGERROR,"CFileCache::Open - no cache strategy defined");
+ CLog::Log(LOGERROR,"CCacheFile::Open - no cache strategy defined");
return false;
}
@@ -149,7 +149,7 @@ bool CFileCache::Open(const CURL& url)
// open cache strategy
if (m_pCache->Open() != CACHE_RC_OK)
{
- CLog::Log(LOGERROR,"CFileCache::Open - failed to open cache");
+ CLog::Log(LOGERROR,"CCacheFile::Open - failed to open cache");
Close();
return false;
}
@@ -179,11 +179,11 @@ bool CFileCache::Open(const CURL& url)
return true;
}
-void CFileCache::Process()
+void CCacheFile::Process()
{
if (!m_pCache)
{
- CLog::Log(LOGERROR,"CFileCache::Process - sanity failed. no cache strategy");
+ CLog::Log(LOGERROR,"CCacheFile::Process - sanity failed. no cache strategy");
return;
}
@@ -245,7 +245,7 @@ void CFileCache::Process()
int iRead = m_source.Read(buffer.get(), m_chunkSize);
if (iRead == 0)
{
- CLog::Log(LOGINFO, "CFileCache::Process - Hit eof.");
+ CLog::Log(LOGINFO, "CCacheFile::Process - Hit eof.");
m_pCache->EndOfInput();
// The thread event will now also cause the wait of an event to return a false.
@@ -270,7 +270,7 @@ void CFileCache::Process()
// done inside the cache strategy. only if unrecoverable error happened, WriteToCache would return error and we break.
if (iWrite < 0)
{
- CLog::Log(LOGERROR,"CFileCache::Process - error writing to cache");
+ CLog::Log(LOGERROR,"CCacheFile::Process - error writing to cache");
m_bStop = true;
break;
}
@@ -302,7 +302,7 @@ void CFileCache::Process()
}
}
-void CFileCache::OnExit()
+void CCacheFile::OnExit()
{
m_bStop = true;
@@ -314,17 +314,17 @@ void CFileCache::OnExit()
m_seekEnded.Set();
}
-bool CFileCache::Exists(const CURL& url)
+bool CCacheFile::Exists(const CURL& url)
{
return CFile::Exists(url.Get());
}
-int CFileCache::Stat(const CURL& url, struct __stat64* buffer)
+int CCacheFile::Stat(const CURL& url, struct __stat64* buffer)
{
return CFile::Stat(url.Get(), buffer);
}
-unsigned int CFileCache::Read(void* lpBuf, int64_t uiBufSize)
+unsigned int CCacheFile::Read(void* lpBuf, int64_t uiBufSize)
{
CSingleLock lock(m_sync);
if (!m_pCache)
@@ -365,7 +365,7 @@ retry:
return 0;
}
-int64_t CFileCache::Seek(int64_t iFilePosition, int iWhence)
+int64_t CCacheFile::Seek(int64_t iFilePosition, int iWhence)
{
CSingleLock lock(m_sync);
@@ -422,7 +422,7 @@ int64_t CFileCache::Seek(int64_t iFilePosition, int iWhence)
return m_nSeekResult;
}
-void CFileCache::Close()
+void CCacheFile::Close()
{
StopThread();
@@ -433,17 +433,17 @@ void CFileCache::Close()
m_source.Close();
}
-int64_t CFileCache::GetPosition()
+int64_t CCacheFile::GetPosition()
{
return m_readPos;
}
-int64_t CFileCache::GetLength()
+int64_t CCacheFile::GetLength()
{
return m_source.GetLength();
}
-void CFileCache::StopThread(bool bWait /*= true*/)
+void CCacheFile::StopThread(bool bWait /*= true*/)
{
m_bStop = true;
//Process could be waiting for seekEvent
@@ -451,7 +451,7 @@ void CFileCache::StopThread(bool bWait /*= true*/)
CThread::StopThread(bWait);
}
-CStdString CFileCache::GetContent()
+CStdString CCacheFile::GetContent()
{
if (!m_source.GetImplemenation())
return IFile::GetContent();
@@ -459,7 +459,7 @@ CStdString CFileCache::GetContent()
return m_source.GetImplemenation()->GetContent();
}
-int CFileCache::IoControl(EIoControl request, void* param)
+int CCacheFile::IoControl(EIoControl request, void* param)
{
if (request == IOCTRL_CACHE_STATUS)
{
diff --git a/xbmc/filesystem/FileCache.h b/xbmc/filesystem/FileCache.h
index 5509f82296..c4b414d3b1 100644
--- a/xbmc/filesystem/FileCache.h
+++ b/xbmc/filesystem/FileCache.h
@@ -29,12 +29,12 @@
namespace XFILE
{
- class CFileCache : public IFile, public CThread
+ class CCacheFile : public IFile, public CThread
{
public:
- CFileCache();
- CFileCache(CCacheStrategy *pCache, bool bDeleteCache=true);
- virtual ~CFileCache();
+ CCacheFile();
+ CCacheFile(CCacheStrategy *pCache, bool bDeleteCache=true);
+ virtual ~CCacheFile();
void SetCacheStrategy(CCacheStrategy *pCache, bool bDeleteCache=true);
diff --git a/xbmc/filesystem/FactoryFileDirectory.cpp b/xbmc/filesystem/FileDirectoryFactory.cpp
index 7b36b3a2c4..843691bc96 100644
--- a/xbmc/filesystem/FactoryFileDirectory.cpp
+++ b/xbmc/filesystem/FileDirectoryFactory.cpp
@@ -23,7 +23,7 @@
#include "system.h"
#include "Util.h"
#include "utils/URIUtils.h"
-#include "FactoryFileDirectory.h"
+#include "FileDirectoryFactory.h"
#ifdef HAS_FILESYSTEM
#include "OGGFileDirectory.h"
#include "NSFFileDirectory.h"
@@ -50,14 +50,14 @@ using namespace XFILE;
using namespace PLAYLIST;
using namespace std;
-CFactoryFileDirectory::CFactoryFileDirectory(void)
+CFileDirectoryFactory::CFileDirectoryFactory(void)
{}
-CFactoryFileDirectory::~CFactoryFileDirectory(void)
+CFileDirectoryFactory::~CFileDirectoryFactory(void)
{}
// return NULL + set pItem->m_bIsFolder to remove it completely from list.
-IFileDirectory* CFactoryFileDirectory::Create(const CStdString& strPath, CFileItem* pItem, const CStdString& strMask)
+IFileDirectory* CFileDirectoryFactory::Create(const CStdString& strPath, CFileItem* pItem, const CStdString& strMask)
{
CStdString strExtension=URIUtils::GetExtension(strPath);
strExtension.MakeLower();
diff --git a/xbmc/filesystem/FactoryFileDirectory.h b/xbmc/filesystem/FileDirectoryFactory.h
index d426430c61..4c816efe31 100644
--- a/xbmc/filesystem/FactoryFileDirectory.h
+++ b/xbmc/filesystem/FileDirectoryFactory.h
@@ -26,11 +26,11 @@ class CFileItem;
namespace XFILE
{
-class CFactoryFileDirectory
+class CFileDirectoryFactory
{
public:
- CFactoryFileDirectory(void);
- virtual ~CFactoryFileDirectory(void);
+ CFileDirectoryFactory(void);
+ virtual ~CFileDirectoryFactory(void);
static IFileDirectory* Create(const CStdString& strPath, CFileItem* pItem, const CStdString& strMask="");
};
}
diff --git a/xbmc/filesystem/FileFactory.cpp b/xbmc/filesystem/FileFactory.cpp
index 7fc2e36483..e51fc50285 100644
--- a/xbmc/filesystem/FileFactory.cpp
+++ b/xbmc/filesystem/FileFactory.cpp
@@ -25,28 +25,28 @@
#endif
#include "system.h"
#include "FileFactory.h"
-#include "FileHD.h"
-#include "FileCurl.h"
-#include "FileShoutcast.h"
-#include "FileLastFM.h"
-#include "FileFileReader.h"
+#include "HDFile.h"
+#include "CurlFile.h"
+#include "ShoutcastFile.h"
+#include "LastFMFile.h"
+#include "FileReaderFile.h"
#ifdef HAS_FILESYSTEM_SMB
#ifdef _WIN32
#include "windows/WINFileSmb.h"
#else
-#include "FileSmb.h"
+#include "SmbFile.h"
#endif
#endif
#ifdef HAS_FILESYSTEM_CDDA
-#include "FileCDDA.h"
+#include "CDDAFile.h"
#endif
#ifdef HAS_FILESYSTEM
-#include "FileISO.h"
+#include "ISOFile.h"
#ifdef HAS_FILESYSTEM_RTV
-#include "FileRTV.h"
+#include "RTVFile.h"
#endif
#ifdef HAS_FILESYSTEM_DAAP
-#include "FileDAAP.h"
+#include "DAAPFile.h"
#endif
#endif
#ifdef HAS_FILESYSTEM_SAP
@@ -55,30 +55,30 @@
#ifdef HAS_FILESYSTEM_VTP
#include "VTPFile.h"
#endif
-#include "FileZip.h"
+#include "ZipFile.h"
#ifdef HAS_FILESYSTEM_RAR
-#include "FileRar.h"
+#include "RarFile.h"
#endif
#ifdef HAS_FILESYSTEM_SFTP
-#include "FileSFTP.h"
+#include "SFTPFile.h"
#endif
#ifdef HAS_FILESYSTEM_NFS
-#include "FileNFS.h"
+#include "NFSFile.h"
#endif
#ifdef HAS_FILESYSTEM_AFP
-#include "FileAFP.h"
+#include "AFPFile.h"
#endif
-#include "FileUPnP.h"
+#include "UPnPFile.h"
#include "PipesManager.h"
-#include "FilePipe.h"
-#include "FileMusicDatabase.h"
-#include "FileSpecialProtocol.h"
+#include "PipeFile.h"
+#include "MusicDatabaseFile.h"
+#include "SpecialProtocolFile.h"
#include "MultiPathFile.h"
-#include "FileTuxBox.h"
-#include "FileUDF.h"
+#include "TuxBoxFile.h"
+#include "UDFFile.h"
#include "MythFile.h"
-#include "HDHomeRun.h"
-#include "Slingbox.h"
+#include "HDHomeRunFile.h"
+#include "SlingboxFile.h"
#include "Application.h"
#include "URL.h"
#include "utils/log.h"
diff --git a/xbmc/filesystem/FileFileReader.cpp b/xbmc/filesystem/FileReaderFile.cpp
index 1579939fbc..2da9d57cc7 100644
--- a/xbmc/filesystem/FileFileReader.cpp
+++ b/xbmc/filesystem/FileReaderFile.cpp
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "FileFileReader.h"
+#include "FileReaderFile.h"
#include "URL.h"
using namespace XFILE;
@@ -27,73 +27,73 @@ using namespace XFILE;
//////////////////////////////////////////////////////////////////////
//*********************************************************************************************
-CFileFileReader::CFileFileReader()
+CFileReaderFile::CFileReaderFile()
{
}
//*********************************************************************************************
-CFileFileReader::~CFileFileReader()
+CFileReaderFile::~CFileReaderFile()
{
Close();
}
//*********************************************************************************************
-bool CFileFileReader::Open(const CURL& url)
+bool CFileReaderFile::Open(const CURL& url)
{
CStdString strURL = url.Get();
strURL = strURL.Mid(13);
return m_reader.Open(strURL,READ_CACHED);
}
-bool CFileFileReader::Exists(const CURL& url)
+bool CFileReaderFile::Exists(const CURL& url)
{
return CFile::Exists(url.Get().Mid(13));
}
-int CFileFileReader::Stat(const CURL& url, struct __stat64* buffer)
+int CFileReaderFile::Stat(const CURL& url, struct __stat64* buffer)
{
return CFile::Stat(url.Get().Mid(13),buffer);
}
//*********************************************************************************************
-bool CFileFileReader::OpenForWrite(const CURL& url, bool bOverWrite)
+bool CFileReaderFile::OpenForWrite(const CURL& url, bool bOverWrite)
{
return false;
}
//*********************************************************************************************
-unsigned int CFileFileReader::Read(void *lpBuf, int64_t uiBufSize)
+unsigned int CFileReaderFile::Read(void *lpBuf, int64_t uiBufSize)
{
return m_reader.Read(lpBuf,uiBufSize);
}
//*********************************************************************************************
-int CFileFileReader::Write(const void *lpBuf, int64_t uiBufSize)
+int CFileReaderFile::Write(const void *lpBuf, int64_t uiBufSize)
{
return 0;
}
//*********************************************************************************************
-void CFileFileReader::Close()
+void CFileReaderFile::Close()
{
m_reader.Close();
}
//*********************************************************************************************
-int64_t CFileFileReader::Seek(int64_t iFilePosition, int iWhence)
+int64_t CFileReaderFile::Seek(int64_t iFilePosition, int iWhence)
{
return m_reader.Seek(iFilePosition,iWhence);
}
//*********************************************************************************************
-int64_t CFileFileReader::GetLength()
+int64_t CFileReaderFile::GetLength()
{
return m_reader.GetLength();
}
//*********************************************************************************************
-int64_t CFileFileReader::GetPosition()
+int64_t CFileReaderFile::GetPosition()
{
return m_reader.GetPosition();
}
diff --git a/xbmc/filesystem/FileFileReader.h b/xbmc/filesystem/FileReaderFile.h
index b9c9234e28..9ad8c9bb42 100644
--- a/xbmc/filesystem/FileFileReader.h
+++ b/xbmc/filesystem/FileReaderFile.h
@@ -23,11 +23,11 @@
namespace XFILE
{
-class CFileFileReader : public IFile
+class CFileReaderFile : public IFile
{
public:
- CFileFileReader();
- virtual ~CFileFileReader();
+ CFileReaderFile();
+ virtual ~CFileReaderFile();
virtual int64_t GetPosition();
virtual int64_t GetLength();
virtual bool Open(const CURL& url);
diff --git a/xbmc/filesystem/FileHD.cpp b/xbmc/filesystem/HDFile.cpp
index 438079722c..e47980a7d2 100644
--- a/xbmc/filesystem/FileHD.cpp
+++ b/xbmc/filesystem/HDFile.cpp
@@ -19,7 +19,7 @@
*/
#include "system.h"
-#include "FileHD.h"
+#include "HDFile.h"
#include "Util.h"
#include "URL.h"
#include "utils/AliasShortcutUtils.h"
@@ -45,17 +45,17 @@ using namespace XFILE;
//////////////////////////////////////////////////////////////////////
//*********************************************************************************************
-CFileHD::CFileHD()
+CHDFile::CHDFile()
: m_hFile(INVALID_HANDLE_VALUE)
{}
//*********************************************************************************************
-CFileHD::~CFileHD()
+CHDFile::~CHDFile()
{
if (m_hFile != INVALID_HANDLE_VALUE) Close();
}
//*********************************************************************************************
-CStdString CFileHD::GetLocal(const CURL &url)
+CStdString CHDFile::GetLocal(const CURL &url)
{
CStdString path( url.GetFileName() );
@@ -85,7 +85,7 @@ CStdString CFileHD::GetLocal(const CURL &url)
}
//*********************************************************************************************
-bool CFileHD::Open(const CURL& url)
+bool CHDFile::Open(const CURL& url)
{
CStdString strFile = GetLocal(url);
@@ -104,7 +104,7 @@ bool CFileHD::Open(const CURL& url)
return true;
}
-bool CFileHD::Exists(const CURL& url)
+bool CHDFile::Exists(const CURL& url)
{
struct __stat64 buffer;
CStdString strFile = GetLocal(url);
@@ -119,7 +119,7 @@ bool CFileHD::Exists(const CURL& url)
#endif
}
-int CFileHD::Stat(struct __stat64* buffer)
+int CHDFile::Stat(struct __stat64* buffer)
{
#ifdef _LINUX
return _fstat64((*m_hFile).fd, buffer);
@@ -145,7 +145,7 @@ int CFileHD::Stat(struct __stat64* buffer)
#endif
}
-int CFileHD::Stat(const CURL& url, struct __stat64* buffer)
+int CHDFile::Stat(const CURL& url, struct __stat64* buffer)
{
CStdString strFile = GetLocal(url);
@@ -165,7 +165,7 @@ int CFileHD::Stat(const CURL& url, struct __stat64* buffer)
#endif
}
-bool CFileHD::SetHidden(const CURL &url, bool hidden)
+bool CHDFile::SetHidden(const CURL &url, bool hidden)
{
#ifdef _WIN32
CStdStringW path;
@@ -178,7 +178,7 @@ bool CFileHD::SetHidden(const CURL &url, bool hidden)
}
//*********************************************************************************************
-bool CFileHD::OpenForWrite(const CURL& url, bool bOverWrite)
+bool CHDFile::OpenForWrite(const CURL& url, bool bOverWrite)
{
// make sure it's a legal FATX filename (we are writing to the harddisk)
CStdString strPath = GetLocal(url);
@@ -200,7 +200,7 @@ bool CFileHD::OpenForWrite(const CURL& url, bool bOverWrite)
}
//*********************************************************************************************
-unsigned int CFileHD::Read(void *lpBuf, int64_t uiBufSize)
+unsigned int CHDFile::Read(void *lpBuf, int64_t uiBufSize)
{
if (!m_hFile.isValid()) return 0;
DWORD nBytesRead;
@@ -213,7 +213,7 @@ unsigned int CFileHD::Read(void *lpBuf, int64_t uiBufSize)
}
//*********************************************************************************************
-int CFileHD::Write(const void *lpBuf, int64_t uiBufSize)
+int CHDFile::Write(const void *lpBuf, int64_t uiBufSize)
{
if (!m_hFile.isValid())
return 0;
@@ -226,13 +226,13 @@ int CFileHD::Write(const void *lpBuf, int64_t uiBufSize)
}
//*********************************************************************************************
-void CFileHD::Close()
+void CHDFile::Close()
{
m_hFile.reset();
}
//*********************************************************************************************
-int64_t CFileHD::Seek(int64_t iFilePosition, int iWhence)
+int64_t CHDFile::Seek(int64_t iFilePosition, int iWhence)
{
LARGE_INTEGER lPos, lNewPos;
lPos.QuadPart = iFilePosition;
@@ -265,7 +265,7 @@ int64_t CFileHD::Seek(int64_t iFilePosition, int iWhence)
}
//*********************************************************************************************
-int64_t CFileHD::GetLength()
+int64_t CHDFile::GetLength()
{
if(m_i64FileLen <= m_i64FilePos || m_i64FileLen == 0)
{
@@ -273,18 +273,18 @@ int64_t CFileHD::GetLength()
if(GetFileSizeEx((HANDLE)m_hFile, &i64Size))
m_i64FileLen = i64Size.QuadPart;
else
- CLog::Log(LOGERROR, "CFileHD::GetLength - GetFileSizeEx failed with error %d", GetLastError());
+ CLog::Log(LOGERROR, "CHDFile::GetLength - GetFileSizeEx failed with error %d", GetLastError());
}
return m_i64FileLen;
}
//*********************************************************************************************
-int64_t CFileHD::GetPosition()
+int64_t CHDFile::GetPosition()
{
return m_i64FilePos;
}
-bool CFileHD::Delete(const CURL& url)
+bool CHDFile::Delete(const CURL& url)
{
CStdString strFile=GetLocal(url);
@@ -297,7 +297,7 @@ bool CFileHD::Delete(const CURL& url)
#endif
}
-bool CFileHD::Rename(const CURL& url, const CURL& urlnew)
+bool CHDFile::Rename(const CURL& url, const CURL& urlnew)
{
CStdString strFile=GetLocal(url);
CStdString strNewFile=GetLocal(urlnew);
@@ -313,12 +313,12 @@ bool CFileHD::Rename(const CURL& url, const CURL& urlnew)
#endif
}
-void CFileHD::Flush()
+void CHDFile::Flush()
{
::FlushFileBuffers(m_hFile);
}
-int CFileHD::IoControl(EIoControl request, void* param)
+int CHDFile::IoControl(EIoControl request, void* param)
{
#ifdef _LINUX
if(request == IOCTRL_NATIVE && param)
diff --git a/xbmc/filesystem/FileHD.h b/xbmc/filesystem/HDFile.h
index 84f7db8b6d..ababf9e2df 100644
--- a/xbmc/filesystem/FileHD.h
+++ b/xbmc/filesystem/HDFile.h
@@ -18,7 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-// FileHD.h: interface for the CFileHD class.
+// FileHD.h: interface for the CHDFile class.
//
//////////////////////////////////////////////////////////////////////
@@ -34,11 +34,11 @@
namespace XFILE
{
-class CFileHD : public IFile
+class CHDFile : public IFile
{
public:
- CFileHD();
- virtual ~CFileHD();
+ CHDFile();
+ virtual ~CHDFile();
virtual int64_t GetPosition();
virtual int64_t GetLength();
virtual bool Open(const CURL& url);
diff --git a/xbmc/filesystem/HDHomeRunDirectory.cpp b/xbmc/filesystem/HDHomeRunDirectory.cpp
new file mode 100644
index 0000000000..b3864d1899
--- /dev/null
+++ b/xbmc/filesystem/HDHomeRunDirectory.cpp
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2011 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 "DllHDHomeRun.h"
+#include "HDHomeRunDirectory.h"
+#include "URL.h"
+#include "FileItem.h"
+#include "utils/URIUtils.h"
+
+using namespace XFILE;
+using namespace std;
+
+// -------------------------------------------
+// ---------------- Directory ----------------
+// -------------------------------------------
+
+CHomeRunDirectory::CHomeRunDirectory()
+{
+ m_pdll = new DllHdHomeRun;
+ m_pdll->Load();
+}
+
+CHomeRunDirectory::~CHomeRunDirectory()
+{
+ m_pdll->Unload();
+ delete m_pdll;
+}
+
+bool CHomeRunDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items)
+{
+ if(!m_pdll->IsLoaded())
+ return false;
+
+ CURL url(strPath);
+
+ if(url.GetHostName().IsEmpty())
+ {
+ // no hostname, list all available devices
+ int target_ip = 0;
+ struct hdhomerun_discover_device_t result_list[64];
+ int count = m_pdll->discover_find_devices_custom(target_ip, HDHOMERUN_DEVICE_TYPE_TUNER, HDHOMERUN_DEVICE_ID_WILDCARD, result_list, 64);
+ if (count < 0)
+ return false;
+
+ for(int i=0;i<count;i++)
+ {
+ CStdString device, ip;
+ CFileItemPtr item;
+ unsigned int ip_addr = result_list[i].ip_addr;
+
+ device.Format("%x", result_list[i].device_id);
+ ip.Format("%u.%u.%u.%u",
+ (unsigned int)(ip_addr >> 24) & 0xFF, (unsigned int)(ip_addr >> 16) & 0xFF,
+ (unsigned int)(ip_addr >> 8) & 0xFF, (unsigned int)(ip_addr >> 0) & 0xFF);
+
+ item.reset(new CFileItem("hdhomerun://" + device + "/tuner0/", true));
+ item->SetLabel(device + "-0 On " + ip);
+ item->SetLabelPreformated(true);
+ items.Add(item);
+
+ item.reset(new CFileItem("hdhomerun://" + device + "/tuner1/", true));
+ item->SetLabel(device + "-1 On " + ip);
+ item->SetLabelPreformated(true);
+ items.Add(item);
+ }
+ return true;
+ }
+ else
+ {
+ hdhomerun_device_t* device = m_pdll->device_create_from_str(url.GetHostName().c_str(), NULL);
+ if(!device)
+ return false;
+
+ m_pdll->device_set_tuner_from_str(device, url.GetFileName().c_str());
+
+ hdhomerun_tuner_status_t status;
+ if(!m_pdll->device_get_tuner_status(device, NULL, &status))
+ {
+ m_pdll->device_destroy(device);
+ return true;
+ }
+
+ CStdString label;
+ if(status.signal_present)
+ label.Format("Current Stream: N/A");
+ else
+ label.Format("Current Stream: Channel %s, SNR %d", status.channel, status.signal_to_noise_quality);
+
+ CStdString path = "hdhomerun://" + url.GetHostName() + "/" + url.GetFileName();
+ URIUtils::RemoveSlashAtEnd(path);
+ CFileItemPtr item(new CFileItem(path, false));
+ item->SetLabel(label);
+ item->SetLabelPreformated(true);
+ items.Add(item);
+
+ m_pdll->device_destroy(device);
+ return true;
+ }
+
+ return false;
+}
diff --git a/xbmc/filesystem/HDHomeRunDirectory.h b/xbmc/filesystem/HDHomeRunDirectory.h
new file mode 100644
index 0000000000..44ff76b9c2
--- /dev/null
+++ b/xbmc/filesystem/HDHomeRunDirectory.h
@@ -0,0 +1,39 @@
+#pragma once
+/*
+ * Copyright (C) 2011 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 DllHdHomeRun;
+
+namespace XFILE
+{
+ class CHomeRunDirectory : public IDirectory
+ {
+ public:
+ CHomeRunDirectory(void);
+ virtual ~CHomeRunDirectory(void);
+ virtual bool IsAllowed(const CStdString &strFile) const { return true; };
+ virtual bool GetDirectory(const CStdString& strPath, CFileItemList &items);
+ private:
+ DllHdHomeRun* m_pdll;
+ };
+}
diff --git a/xbmc/filesystem/HDHomeRun.cpp b/xbmc/filesystem/HDHomeRunFile.cpp
index ea141d227b..5ab518d08c 100644
--- a/xbmc/filesystem/HDHomeRun.cpp
+++ b/xbmc/filesystem/HDHomeRunFile.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2008 Team XBMC
+ * Copyright (C) 2011 Team XBMC
* http://www.xbmc.org
*
* This Program is free software; you can redistribute it and/or modify
@@ -24,7 +24,7 @@
#include "URL.h"
#include "FileItem.h"
#include "DllHDHomeRun.h"
-#include "HDHomeRun.h"
+#include "HDHomeRunFile.h"
#include "utils/TimeUtils.h"
#include "utils/log.h"
#include "utils/URIUtils.h"
@@ -63,115 +63,23 @@ public:
}
};
-
-// -------------------------------------------
-// ---------------- Directory ----------------
-// -------------------------------------------
-
-CDirectoryHomeRun::CDirectoryHomeRun()
-{
- m_pdll = new DllHdHomeRun;
- m_pdll->Load();
-}
-
-CDirectoryHomeRun::~CDirectoryHomeRun()
-{
- m_pdll->Unload();
- delete m_pdll;
-}
-
-bool CDirectoryHomeRun::GetDirectory(const CStdString& strPath, CFileItemList &items)
-{
- if(!m_pdll->IsLoaded())
- return false;
-
- CURL url(strPath);
-
- if(url.GetHostName().IsEmpty())
- {
- // no hostname, list all available devices
- int target_ip = 0;
- struct hdhomerun_discover_device_t result_list[64];
- int count = m_pdll->discover_find_devices_custom(target_ip, HDHOMERUN_DEVICE_TYPE_TUNER, HDHOMERUN_DEVICE_ID_WILDCARD, result_list, 64);
- if (count < 0)
- return false;
-
- for(int i=0;i<count;i++)
- {
- CStdString device, ip;
- CFileItemPtr item;
- unsigned int ip_addr = result_list[i].ip_addr;
-
- device.Format("%x", result_list[i].device_id);
- ip.Format("%u.%u.%u.%u",
- (unsigned int)(ip_addr >> 24) & 0xFF, (unsigned int)(ip_addr >> 16) & 0xFF,
- (unsigned int)(ip_addr >> 8) & 0xFF, (unsigned int)(ip_addr >> 0) & 0xFF);
-
- item.reset(new CFileItem("hdhomerun://" + device + "/tuner0/", true));
- item->SetLabel(device + "-0 On " + ip);
- item->SetLabelPreformated(true);
- items.Add(item);
-
- item.reset(new CFileItem("hdhomerun://" + device + "/tuner1/", true));
- item->SetLabel(device + "-1 On " + ip);
- item->SetLabelPreformated(true);
- items.Add(item);
- }
- return true;
- }
- else
- {
- hdhomerun_device_t* device = m_pdll->device_create_from_str(url.GetHostName().c_str(), NULL);
- if(!device)
- return false;
-
- m_pdll->device_set_tuner_from_str(device, url.GetFileName().c_str());
-
- hdhomerun_tuner_status_t status;
- if(!m_pdll->device_get_tuner_status(device, NULL, &status))
- {
- m_pdll->device_destroy(device);
- return true;
- }
-
- CStdString label;
- if(status.signal_present)
- label.Format("Current Stream: N/A");
- else
- label.Format("Current Stream: Channel %s, SNR %d", status.channel, status.signal_to_noise_quality);
-
- CStdString path = "hdhomerun://" + url.GetHostName() + "/" + url.GetFileName();
- URIUtils::RemoveSlashAtEnd(path);
- CFileItemPtr item(new CFileItem(path, false));
- item->SetLabel(label);
- item->SetLabelPreformated(true);
- items.Add(item);
-
- m_pdll->device_destroy(device);
- return true;
- }
-
- return false;
-}
-
-
// -------------------------------------------
// ------------------ File -------------------
// -------------------------------------------
-CFileHomeRun::CFileHomeRun()
+CHomeRunFile::CHomeRunFile()
{
m_device = NULL;
m_pdll = new DllHdHomeRun;
m_pdll->Load();
}
-CFileHomeRun::~CFileHomeRun()
+CHomeRunFile::~CHomeRunFile()
{
Close();
delete m_pdll;
}
-bool CFileHomeRun::Exists(const CURL& url)
+bool CHomeRunFile::Exists(const CURL& url)
{
CStdString path(url.GetFileName());
@@ -187,28 +95,28 @@ bool CFileHomeRun::Exists(const CURL& url)
return false;
}
-int64_t CFileHomeRun::Seek(int64_t iFilePosition, int iWhence)
+int64_t CHomeRunFile::Seek(int64_t iFilePosition, int iWhence)
{
return -1;
}
-int CFileHomeRun::Stat(const CURL& url, struct __stat64* buffer)
+int CHomeRunFile::Stat(const CURL& url, struct __stat64* buffer)
{
memset(buffer, 0, sizeof(struct __stat64));
return 0;
}
-int64_t CFileHomeRun::GetPosition()
+int64_t CHomeRunFile::GetPosition()
{
return 0;
}
-int64_t CFileHomeRun::GetLength()
+int64_t CHomeRunFile::GetLength()
{
return 0;
}
-bool CFileHomeRun::Open(const CURL &url)
+bool CHomeRunFile::Open(const CURL &url)
{
if(!m_pdll->IsLoaded())
return false;
@@ -235,12 +143,12 @@ bool CFileHomeRun::Open(const CURL &url)
return true;
}
-unsigned int CFileHomeRun::Read(void* lpBuf, int64_t uiBufSize)
+unsigned int CHomeRunFile::Read(void* lpBuf, int64_t uiBufSize)
{
size_t datasize;
if(uiBufSize < VIDEO_DATA_PACKET_SIZE)
- CLog::Log(LOGWARNING, "CFileHomeRun::Read - buffer size too small, will most likely fail");
+ CLog::Log(LOGWARNING, "CHomeRunFile::Read - buffer size too small, will most likely fail");
// for now, let it it time out after 5 seconds,
// neither of the players can be forced to
@@ -265,7 +173,7 @@ unsigned int CFileHomeRun::Read(void* lpBuf, int64_t uiBufSize)
return (unsigned int)datasize;
}
-void CFileHomeRun::Close()
+void CHomeRunFile::Close()
{
if(m_device)
{
@@ -275,7 +183,7 @@ void CFileHomeRun::Close()
}
}
-int CFileHomeRun::GetChunkSize()
+int CHomeRunFile::GetChunkSize()
{
return VIDEO_DATA_PACKET_SIZE;
}
diff --git a/xbmc/filesystem/HDHomeRun.h b/xbmc/filesystem/HDHomeRunFile.h
index e3e3a51b3a..abb1688e83 100644
--- a/xbmc/filesystem/HDHomeRun.h
+++ b/xbmc/filesystem/HDHomeRunFile.h
@@ -1,6 +1,6 @@
#pragma once
/*
- * Copyright (C) 2005-2008 Team XBMC
+ * Copyright (C) 2011 Team XBMC
* http://www.xbmc.org
*
* This Program is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
*
*/
-#include "IDirectory.h"
#include "IFile.h"
struct hdhomerun_device;
@@ -28,25 +27,11 @@ class DllHdHomeRun;
namespace XFILE
{
- class CDirectoryHomeRun : public IDirectory
+ class CHomeRunFile : public IFile
{
public:
- CDirectoryHomeRun(void);
- virtual ~CDirectoryHomeRun(void);
- virtual bool IsAllowed(const CStdString &strFile) const { return true; };
- virtual bool GetDirectory(const CStdString& strPath, CFileItemList &items);
- private:
- DllHdHomeRun* m_pdll;
- };
-}
-
-namespace XFILE
-{
- class CFileHomeRun : public IFile
- {
- public:
- CFileHomeRun();
- ~CFileHomeRun();
+ CHomeRunFile();
+ ~CHomeRunFile();
virtual bool Exists(const CURL& url);
virtual int64_t Seek(int64_t iFilePosition, int iWhence);
diff --git a/xbmc/filesystem/HTTPDirectory.cpp b/xbmc/filesystem/HTTPDirectory.cpp
index 6b703a40b5..9a209bdc72 100644
--- a/xbmc/filesystem/HTTPDirectory.cpp
+++ b/xbmc/filesystem/HTTPDirectory.cpp
@@ -21,7 +21,7 @@
#include "HTTPDirectory.h"
#include "URL.h"
-#include "FileCurl.h"
+#include "CurlFile.h"
#include "FileItem.h"
#include "utils/RegExp.h"
#include "settings/AdvancedSettings.h"
diff --git a/xbmc/filesystem/FileISO.cpp b/xbmc/filesystem/ISOFile.cpp
index 61f047f826..9baa95d81e 100644
--- a/xbmc/filesystem/FileISO.cpp
+++ b/xbmc/filesystem/ISOFile.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "FileISO.h"
+#include "ISOFile.h"
#include "URL.h"
#include "iso9660.h"
@@ -31,13 +31,13 @@ using namespace XFILE;
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
//*********************************************************************************************
-CFileISO::CFileISO()
+CISOFile::CISOFile()
{
m_bOpened = false;
}
//*********************************************************************************************
-CFileISO::~CFileISO()
+CISOFile::~CISOFile()
{
if (m_bOpened)
{
@@ -45,7 +45,7 @@ CFileISO::~CFileISO()
}
}
//*********************************************************************************************
-bool CFileISO::Open(const CURL& url)
+bool CISOFile::Open(const CURL& url)
{
string strFName = "\\";
strFName += url.GetFileName();
@@ -65,7 +65,7 @@ bool CFileISO::Open(const CURL& url)
}
//*********************************************************************************************
-unsigned int CFileISO::Read(void *lpBuf, int64_t uiBufSize)
+unsigned int CISOFile::Read(void *lpBuf, int64_t uiBufSize)
{
if (!m_bOpened) return 0;
char *pData = (char *)lpBuf;
@@ -104,14 +104,14 @@ unsigned int CFileISO::Read(void *lpBuf, int64_t uiBufSize)
}
//*********************************************************************************************
-void CFileISO::Close()
+void CISOFile::Close()
{
if (!m_bOpened) return ;
m_isoReader.CloseFile( m_hFile);
}
//*********************************************************************************************
-int64_t CFileISO::Seek(int64_t iFilePosition, int iWhence)
+int64_t CISOFile::Seek(int64_t iFilePosition, int iWhence)
{
if (!m_bOpened) return -1;
int64_t lNewPos = m_isoReader.Seek(m_hFile, iFilePosition, iWhence);
@@ -121,20 +121,20 @@ int64_t CFileISO::Seek(int64_t iFilePosition, int iWhence)
}
//*********************************************************************************************
-int64_t CFileISO::GetLength()
+int64_t CISOFile::GetLength()
{
if (!m_bOpened) return -1;
return m_isoReader.GetFileSize(m_hFile);
}
//*********************************************************************************************
-int64_t CFileISO::GetPosition()
+int64_t CISOFile::GetPosition()
{
if (!m_bOpened) return -1;
return m_isoReader.GetFilePosition(m_hFile);
}
-bool CFileISO::Exists(const CURL& url)
+bool CISOFile::Exists(const CURL& url)
{
string strFName = "\\";
strFName += url.GetFileName();
@@ -150,7 +150,7 @@ bool CFileISO::Exists(const CURL& url)
return true;
}
-int CFileISO::Stat(const CURL& url, struct __stat64* buffer)
+int CISOFile::Stat(const CURL& url, struct __stat64* buffer)
{
string strFName = "\\";
strFName += url.GetFileName();
diff --git a/xbmc/filesystem/FileISO.h b/xbmc/filesystem/ISOFile.h
index 8fec9217bd..6e87dff92a 100644
--- a/xbmc/filesystem/FileISO.h
+++ b/xbmc/filesystem/ISOFile.h
@@ -18,7 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-// FileISO.h: interface for the CFileISO class.
+// FileISO.h: interface for the CISOFile class.
//
//////////////////////////////////////////////////////////////////////
@@ -35,11 +35,11 @@
namespace XFILE
{
-class CFileISO : public IFile
+class CISOFile : public IFile
{
public:
- CFileISO();
- virtual ~CFileISO();
+ CISOFile();
+ virtual ~CISOFile();
virtual int64_t GetPosition();
virtual int64_t GetLength();
virtual bool Open(const CURL& url);
diff --git a/xbmc/filesystem/LastFMDirectory.cpp b/xbmc/filesystem/LastFMDirectory.cpp
index af5621cad6..983d6dfe36 100644
--- a/xbmc/filesystem/LastFMDirectory.cpp
+++ b/xbmc/filesystem/LastFMDirectory.cpp
@@ -20,14 +20,14 @@
*/
#include "LastFMDirectory.h"
-#include "DirectoryCache.h"
+#include "CacheDirectory.h"
#include "music/tags/MusicInfoTag.h"
#include "URL.h"
#include "guilib/GUIWindowManager.h"
#include "dialogs/GUIDialogProgress.h"
#include "settings/GUISettings.h"
#include "FileItem.h"
-#include "FileCurl.h"
+#include "CurlFile.h"
#include "utils/StringUtils.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
diff --git a/xbmc/filesystem/LastFMDirectory.h b/xbmc/filesystem/LastFMDirectory.h
index e50178dac6..fc9eab61fe 100644
--- a/xbmc/filesystem/LastFMDirectory.h
+++ b/xbmc/filesystem/LastFMDirectory.h
@@ -21,7 +21,7 @@
*/
#include "IDirectory.h"
-#include "FileCurl.h"
+#include "CurlFile.h"
#include "tinyXML/tinyxml.h"
#include "threads/Thread.h"
diff --git a/xbmc/filesystem/FileLastFM.cpp b/xbmc/filesystem/LastFMFile.cpp
index d1c4cbdc11..1586e265de 100644
--- a/xbmc/filesystem/FileLastFM.cpp
+++ b/xbmc/filesystem/LastFMFile.cpp
@@ -19,18 +19,18 @@
*
*/
-#include "FileLastFM.h"
+#include "LastFMFile.h"
namespace XFILE
{
-CFileLastFM::CFileLastFM() : CFileCurl()
+CLastFMFile::CLastFMFile() : CCurlFile()
{
SetUserAgent("");
SetBufferSize(8192);
}
-CFileLastFM::~CFileLastFM()
+CLastFMFile::~CLastFMFile()
{
}
diff --git a/xbmc/filesystem/FileLastFM.h b/xbmc/filesystem/LastFMFile.h
index b12839ed2a..7746799094 100644
--- a/xbmc/filesystem/FileLastFM.h
+++ b/xbmc/filesystem/LastFMFile.h
@@ -20,17 +20,17 @@
*
*/
-#include "FileCurl.h"
+#include "CurlFile.h"
#include "utils/RingBuffer.h"
namespace XFILE
{
- class CFileLastFM : public CFileCurl
+ class CLastFMFile : public CCurlFile
{
public:
- CFileLastFM();
- virtual ~CFileLastFM();
+ CLastFMFile();
+ virtual ~CLastFMFile();
protected:
};
diff --git a/xbmc/filesystem/Makefile.in b/xbmc/filesystem/Makefile.in
index 467df2b8c8..7a500542d5 100644
--- a/xbmc/filesystem/Makefile.in
+++ b/xbmc/filesystem/Makefile.in
@@ -4,43 +4,30 @@ CXXFLAGS+=-D__STDC_FORMAT_MACROS \
SRCS=AddonsDirectory.cpp \
ASAPFileDirectory.cpp \
- CacheCircular.cpp \
- CacheMemBuffer.cpp \
CacheStrategy.cpp \
+ CircularCache.cpp \
CDDADirectory.cpp \
+ CDDAFile.cpp \
+ CurlFile.cpp \
DAAPDirectory.cpp \
+ DAAPFile.cpp \
DAVDirectory.cpp \
- DirectoryCache.cpp \
Directory.cpp \
+ DirectoryCache.cpp \
+ DirectoryFactory.cpp \
DirectoryHistory.cpp \
- DirectoryTuxBox.cpp \
DllLibCurl.cpp \
- FactoryDirectory.cpp \
- FactoryFileDirectory.cpp \
- FileCache.cpp \
- FileCDDA.cpp \
File.cpp \
- FileCurl.cpp \
- FileDAAP.cpp \
+ FileCache.cpp \
+ FileDirectoryFactory.cpp \
FileFactory.cpp \
- FileFileReader.cpp \
- FileHD.cpp \
- FileISO.cpp \
- FileLastFM.cpp \
- FileMusicDatabase.cpp \
- FilePipe.cpp \
- FileRTV.cpp \
- FileShoutcast.cpp \
- FileSFTP.cpp \
- FileSpecialProtocol.cpp \
- FileTuxBox.cpp \
- FileUDF.cpp \
- FileUPnP.cpp \
- FileZip.cpp \
+ FileReaderFile.cpp \
FTPDirectory.cpp \
FTPParse.cpp \
HDDirectory.cpp \
- HDHomeRun.cpp \
+ HDFile.cpp \
+ HDHomeRunDirectory.cpp \
+ HDHomeRunFile.cpp \
HTSPDirectory.cpp \
HTSPSession.cpp \
HTTPDirectory.cpp \
@@ -48,10 +35,14 @@ SRCS=AddonsDirectory.cpp \
IFile.cpp \
iso9660.cpp \
ISO9660Directory.cpp \
+ ISOFile.cpp \
LastFMDirectory.cpp \
+ LastFMFile.cpp \
+ MemBufferCache.cpp \
MultiPathDirectory.cpp \
MultiPathFile.cpp \
MusicDatabaseDirectory.cpp \
+ MusicDatabaseFile.cpp \
MusicFileDirectory.cpp \
MusicSearchDirectory.cpp \
MythDirectory.cpp \
@@ -62,23 +53,33 @@ SRCS=AddonsDirectory.cpp \
OGGFileDirectory.cpp \
PlaylistDirectory.cpp \
PlaylistFileDirectory.cpp \
+ PipeFile.cpp \
PipesManager.cpp \
PluginDirectory.cpp \
RSSDirectory.cpp \
RTVDirectory.cpp \
+ RTVFile.cpp \
SAPDirectory.cpp \
SAPFile.cpp \
SFTPDirectory.cpp \
+ SFTPFile.cpp \
SIDFileDirectory.cpp \
- Slingbox.cpp \
+ ShoutcastFile.cpp \
+ SlingboxDirectory.cpp \
+ SlingboxFile.cpp \
SmartPlaylistDirectory.cpp \
SourcesDirectory.cpp \
SpecialProtocol.cpp \
SpecialProtocolDirectory.cpp \
+ SpecialProtocolFile.cpp \
StackDirectory.cpp \
+ TuxBoxDirectory.cpp \
+ TuxBoxFile.cpp \
udf25.cpp \
UDFDirectory.cpp \
+ UDFFile.cpp \
UPnPDirectory.cpp \
+ UPnPFile.cpp \
VideoDatabaseDirectory.cpp \
VirtualDirectory.cpp \
VTPDirectory.cpp \
@@ -86,26 +87,27 @@ SRCS=AddonsDirectory.cpp \
VTPSession.cpp \
ZeroconfDirectory.cpp \
ZipDirectory.cpp \
+ ZipFile.cpp \
ZipManager.cpp
ifeq (@HAVE_XBMC_NONFREE@,1)
-SRCS+=FileRar.cpp
+SRCS+=RarFile.cpp
SRCS+=RarDirectory.cpp
SRCS+=RarManager.cpp
endif
ifeq (@USE_LIBSMBCLIENT@,1)
-SRCS+=FileSmb.cpp
+SRCS+=SmbFile.cpp
SRCS+=SMBDirectory.cpp
endif
ifeq (@USE_LIBNFS@,1)
-SRCS+=FileNFS.cpp
+SRCS+=NFSFile.cpp
SRCS+=NFSDirectory.cpp
endif
ifeq (@USE_LIBAFPCLIENT@,1)
-SRCS+=FileAFP.cpp
+SRCS+=AFPFile.cpp
SRCS+=AFPDirectory.cpp
endif
diff --git a/xbmc/filesystem/CacheMemBuffer.cpp b/xbmc/filesystem/MemBufferCache.cpp
index 65bd0052e6..65bd0052e6 100644
--- a/xbmc/filesystem/CacheMemBuffer.cpp
+++ b/xbmc/filesystem/MemBufferCache.cpp
diff --git a/xbmc/filesystem/CacheMemBuffer.h b/xbmc/filesystem/MemBufferCache.h
index c2fc109fa3..c2fc109fa3 100644
--- a/xbmc/filesystem/CacheMemBuffer.h
+++ b/xbmc/filesystem/MemBufferCache.h
diff --git a/xbmc/filesystem/FileMusicDatabase.cpp b/xbmc/filesystem/MusicDatabaseFile.cpp
index 5273d4ff09..1711520fac 100644
--- a/xbmc/filesystem/FileMusicDatabase.cpp
+++ b/xbmc/filesystem/MusicDatabaseFile.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "FileMusicDatabase.h"
+#include "MusicDatabaseFile.h"
#include "music/MusicDatabase.h"
#include "URL.h"
#include "utils/StringUtils.h"
@@ -29,16 +29,16 @@
using namespace XFILE;
-CFileMusicDatabase::CFileMusicDatabase(void)
+CMusicDatabaseFile::CMusicDatabaseFile(void)
{
}
-CFileMusicDatabase::~CFileMusicDatabase(void)
+CMusicDatabaseFile::~CMusicDatabaseFile(void)
{
Close();
}
-CStdString CFileMusicDatabase::TranslateUrl(const CURL& url)
+CStdString CMusicDatabaseFile::TranslateUrl(const CURL& url)
{
CMusicDatabase musicDatabase;
if (!musicDatabase.Open())
@@ -67,42 +67,42 @@ CStdString CFileMusicDatabase::TranslateUrl(const CURL& url)
return song.strFileName;
}
-bool CFileMusicDatabase::Open(const CURL& url)
+bool CMusicDatabaseFile::Open(const CURL& url)
{
return m_file.Open(TranslateUrl(url));
}
-bool CFileMusicDatabase::Exists(const CURL& url)
+bool CMusicDatabaseFile::Exists(const CURL& url)
{
return !TranslateUrl(url).IsEmpty();
}
-int CFileMusicDatabase::Stat(const CURL& url, struct __stat64* buffer)
+int CMusicDatabaseFile::Stat(const CURL& url, struct __stat64* buffer)
{
return m_file.Stat(TranslateUrl(url), buffer);
}
-unsigned int CFileMusicDatabase::Read(void* lpBuf, int64_t uiBufSize)
+unsigned int CMusicDatabaseFile::Read(void* lpBuf, int64_t uiBufSize)
{
return m_file.Read(lpBuf, uiBufSize);
}
-int64_t CFileMusicDatabase::Seek(int64_t iFilePosition, int iWhence /*=SEEK_SET*/)
+int64_t CMusicDatabaseFile::Seek(int64_t iFilePosition, int iWhence /*=SEEK_SET*/)
{
return m_file.Seek(iFilePosition, iWhence);
}
-void CFileMusicDatabase::Close()
+void CMusicDatabaseFile::Close()
{
m_file.Close();
}
-int64_t CFileMusicDatabase::GetPosition()
+int64_t CMusicDatabaseFile::GetPosition()
{
return m_file.GetPosition();
}
-int64_t CFileMusicDatabase::GetLength()
+int64_t CMusicDatabaseFile::GetLength()
{
return m_file.GetLength();
}
diff --git a/xbmc/filesystem/FileMusicDatabase.h b/xbmc/filesystem/MusicDatabaseFile.h
index 3d890bb814..ccc555be96 100644
--- a/xbmc/filesystem/FileMusicDatabase.h
+++ b/xbmc/filesystem/MusicDatabaseFile.h
@@ -24,11 +24,11 @@
namespace XFILE
{
-class CFileMusicDatabase : public IFile
+class CMusicDatabaseFile : public IFile
{
public:
- CFileMusicDatabase(void);
- virtual ~CFileMusicDatabase(void);
+ CMusicDatabaseFile(void);
+ virtual ~CMusicDatabaseFile(void);
virtual bool Open(const CURL& url);
virtual bool Exists(const CURL& url);
virtual int Stat(const CURL& url, struct __stat64* buffer);
diff --git a/xbmc/filesystem/MythDirectory.cpp b/xbmc/filesystem/MythDirectory.cpp
index 3478b3dfd7..d8b0cc5998 100644
--- a/xbmc/filesystem/MythDirectory.cpp
+++ b/xbmc/filesystem/MythDirectory.cpp
@@ -31,7 +31,7 @@
#include "utils/StringUtils.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
-#include "DirectoryCache.h"
+#include "CacheDirectory.h"
#include "utils/TimeUtils.h"
extern "C"
diff --git a/xbmc/filesystem/MythFile.cpp b/xbmc/filesystem/MythFile.cpp
index 9711981370..d4328c0af4 100644
--- a/xbmc/filesystem/MythFile.cpp
+++ b/xbmc/filesystem/MythFile.cpp
@@ -26,7 +26,7 @@
#include "utils/URIUtils.h"
#include "DllLibCMyth.h"
#include "URL.h"
-#include "DirectoryCache.h"
+#include "CacheDirectory.h"
#include "threads/SingleLock.h"
#include "utils/log.h"
#include "utils/TimeUtils.h"
diff --git a/xbmc/filesystem/NFSDirectory.h b/xbmc/filesystem/NFSDirectory.h
index 6337c321a9..16b21f5c21 100644
--- a/xbmc/filesystem/NFSDirectory.h
+++ b/xbmc/filesystem/NFSDirectory.h
@@ -21,7 +21,7 @@
*/
#include "IDirectory.h"
-#include "FileNFS.h"
+#include "NFSFile.h"
namespace XFILE
{
diff --git a/xbmc/filesystem/FileNFS.cpp b/xbmc/filesystem/NFSFile.cpp
index 271c36301e..b6136d40a0 100644
--- a/xbmc/filesystem/FileNFS.cpp
+++ b/xbmc/filesystem/NFSFile.cpp
@@ -19,14 +19,14 @@
*
*/
-// FileNFS.cpp: implementation of the CFileNFS class.
+// FileNFS.cpp: implementation of the CNFSFile class.
//
//////////////////////////////////////////////////////////////////////
#include "system.h"
#ifdef HAS_FILESYSTEM_NFS
#include "DllLibNfs.h"
-#include "FileNFS.h"
+#include "NFSFile.h"
#include "threads/SingleLock.h"
#include "utils/log.h"
#include "utils/URIUtils.h"
@@ -434,7 +434,7 @@ void CNfsConnection::AddIdleConnection()
CNfsConnection gNfsConnection;
-CFileNFS::CFileNFS()
+CNFSFile::CNFSFile()
: m_fileSize(0)
, m_pFileHandle(NULL)
, m_pNfsContext(NULL)
@@ -442,13 +442,13 @@ CFileNFS::CFileNFS()
gNfsConnection.AddActiveConnection();
}
-CFileNFS::~CFileNFS()
+CNFSFile::~CNFSFile()
{
Close();
gNfsConnection.AddIdleConnection();
}
-int64_t CFileNFS::GetPosition()
+int64_t CNFSFile::GetPosition()
{
int ret = 0;
off64_t offset = 0;
@@ -465,13 +465,13 @@ int64_t CFileNFS::GetPosition()
return offset;
}
-int64_t CFileNFS::GetLength()
+int64_t CNFSFile::GetLength()
{
if (m_pFileHandle == NULL) return 0;
return m_fileSize;
}
-bool CFileNFS::Open(const CURL& url)
+bool CNFSFile::Open(const CURL& url)
{
int ret = 0;
Close();
@@ -496,11 +496,11 @@ bool CFileNFS::Open(const CURL& url)
if (ret != 0)
{
- CLog::Log(LOGINFO, "CFileNFS::Open: Unable to open file : '%s' error : '%s'", url.GetFileName().c_str(), gNfsConnection.GetImpl()->nfs_get_error(m_pNfsContext));
+ CLog::Log(LOGINFO, "CNFSFile::Open: Unable to open file : '%s' error : '%s'", url.GetFileName().c_str(), gNfsConnection.GetImpl()->nfs_get_error(m_pNfsContext));
return false;
}
- CLog::Log(LOGDEBUG,"CFileNFS::Open - opened %s",url.GetFileName().c_str());
+ CLog::Log(LOGDEBUG,"CNFSFile::Open - opened %s",url.GetFileName().c_str());
m_url=url;
struct __stat64 tmpBuffer;
@@ -518,18 +518,18 @@ bool CFileNFS::Open(const CURL& url)
}
-bool CFileNFS::Exists(const CURL& url)
+bool CNFSFile::Exists(const CURL& url)
{
return Stat(url,NULL) == 0;
}
-int CFileNFS::Stat(struct __stat64* buffer)
+int CNFSFile::Stat(struct __stat64* buffer)
{
return Stat(m_url,buffer);
}
-int CFileNFS::Stat(const CURL& url, struct __stat64* buffer)
+int CNFSFile::Stat(const CURL& url, struct __stat64* buffer)
{
int ret = 0;
CSingleLock lock(gNfsConnection);
@@ -570,7 +570,7 @@ int CFileNFS::Stat(const CURL& url, struct __stat64* buffer)
return ret;
}
-unsigned int CFileNFS::Read(void *lpBuf, int64_t uiBufSize)
+unsigned int CNFSFile::Read(void *lpBuf, int64_t uiBufSize)
{
int numberOfBytesRead = 0;
CSingleLock lock(gNfsConnection);
@@ -592,7 +592,7 @@ unsigned int CFileNFS::Read(void *lpBuf, int64_t uiBufSize)
return (unsigned int)numberOfBytesRead;
}
-int64_t CFileNFS::Seek(int64_t iFilePosition, int iWhence)
+int64_t CNFSFile::Seek(int64_t iFilePosition, int iWhence)
{
int ret = 0;
off64_t offset = 0;
@@ -610,14 +610,14 @@ int64_t CFileNFS::Seek(int64_t iFilePosition, int iWhence)
return (int64_t)offset;
}
-void CFileNFS::Close()
+void CNFSFile::Close()
{
CSingleLock lock(gNfsConnection);
if (m_pFileHandle != NULL && m_pNfsContext != NULL)
{
int ret = 0;
- CLog::Log(LOGDEBUG,"CFileNFS::Close closing file %s", m_url.GetFileName().c_str());
+ CLog::Log(LOGDEBUG,"CNFSFile::Close closing file %s", m_url.GetFileName().c_str());
ret = gNfsConnection.GetImpl()->nfs_close(m_pNfsContext, m_pFileHandle);
gNfsConnection.removeFromKeepAliveList(m_pFileHandle);
@@ -634,7 +634,7 @@ void CFileNFS::Close()
//this was a bitch!
//for nfs write to work we have to write chunked
//otherwise this could crash on big files
-int CFileNFS::Write(const void* lpBuf, int64_t uiBufSize)
+int CNFSFile::Write(const void* lpBuf, int64_t uiBufSize)
{
int numberOfBytesWritten = 0;
int writtenBytes = 0;
@@ -675,7 +675,7 @@ int CFileNFS::Write(const void* lpBuf, int64_t uiBufSize)
return numberOfBytesWritten;
}
-bool CFileNFS::Delete(const CURL& url)
+bool CNFSFile::Delete(const CURL& url)
{
int ret = 0;
CSingleLock lock(gNfsConnection);
@@ -694,7 +694,7 @@ bool CFileNFS::Delete(const CURL& url)
return (ret == 0);
}
-bool CFileNFS::Rename(const CURL& url, const CURL& urlnew)
+bool CNFSFile::Rename(const CURL& url, const CURL& urlnew)
{
int ret = 0;
CSingleLock lock(gNfsConnection);
@@ -716,7 +716,7 @@ bool CFileNFS::Rename(const CURL& url, const CURL& urlnew)
return (ret == 0);
}
-bool CFileNFS::OpenForWrite(const CURL& url, bool bOverWrite)
+bool CNFSFile::OpenForWrite(const CURL& url, bool bOverWrite)
{
int ret = 0;
// we can't open files like nfs://file.f or nfs://server/file.f
@@ -749,7 +749,7 @@ bool CFileNFS::OpenForWrite(const CURL& url, bool bOverWrite)
if (ret || m_pFileHandle == NULL)
{
// write error to logfile
- CLog::Log(LOGERROR, "CFileNFS::Open: Unable to open file : '%s' error : '%s'", filename.c_str(), gNfsConnection.GetImpl()->nfs_get_error(gNfsConnection.GetNfsContext()));
+ CLog::Log(LOGERROR, "CNFSFile::Open: Unable to open file : '%s' error : '%s'", filename.c_str(), gNfsConnection.GetImpl()->nfs_get_error(gNfsConnection.GetNfsContext()));
return false;
}
m_url=url;
@@ -776,7 +776,7 @@ bool CFileNFS::OpenForWrite(const CURL& url, bool bOverWrite)
return true;
}
-bool CFileNFS::IsValidFile(const CStdString& strFileName)
+bool CNFSFile::IsValidFile(const CStdString& strFileName)
{
if (strFileName.Find('/') == -1 || /* doesn't have sharename */
strFileName.Right(2) == "/." || /* not current folder */
diff --git a/xbmc/filesystem/FileNFS.h b/xbmc/filesystem/NFSFile.h
index ca42686945..67c7e82e14 100644
--- a/xbmc/filesystem/FileNFS.h
+++ b/xbmc/filesystem/NFSFile.h
@@ -19,7 +19,7 @@
*
*/
-// FileNFS.h: interface for the CFileNFS class.
+// FileNFS.h: interface for the CNFSFile class.
#ifndef FILENFS_H_
#define FILENFS_H_
@@ -118,11 +118,11 @@ extern CNfsConnection gNfsConnection;
namespace XFILE
{
- class CFileNFS : public IFile
+ class CNFSFile : public IFile
{
public:
- CFileNFS();
- virtual ~CFileNFS();
+ CNFSFile();
+ virtual ~CNFSFile();
virtual void Close();
virtual int64_t Seek(int64_t iFilePosition, int iWhence = SEEK_SET);
virtual unsigned int Read(void* lpBuf, int64_t uiBufSize);
diff --git a/xbmc/filesystem/FilePipe.cpp b/xbmc/filesystem/PipeFile.cpp
index 1a55336bd5..7fb39ab3f5 100644
--- a/xbmc/filesystem/FilePipe.cpp
+++ b/xbmc/filesystem/PipeFile.cpp
@@ -19,38 +19,38 @@
*
*/
-#include "FilePipe.h"
+#include "PipeFile.h"
#include "threads/SingleLock.h"
#include "PipesManager.h"
#include "utils/StringUtils.h"
using namespace XFILE;
-CFilePipe::CFilePipe() : m_pos(0), m_length(-1), m_pipe(NULL)
+CPipeFile::CPipeFile() : m_pos(0), m_length(-1), m_pipe(NULL)
{
}
-CFilePipe::~CFilePipe()
+CPipeFile::~CPipeFile()
{
Close();
}
-int64_t CFilePipe::GetPosition()
+int64_t CPipeFile::GetPosition()
{
return m_pos;
}
-int64_t CFilePipe::GetLength()
+int64_t CPipeFile::GetLength()
{
return m_length;
}
-void CFilePipe::SetLength(int64_t len)
+void CPipeFile::SetLength(int64_t len)
{
m_length = len;
}
-bool CFilePipe::Open(const CURL& url)
+bool CPipeFile::Open(const CURL& url)
{
CStdString name = url.Get();
m_pipe = PipesManager::GetInstance().OpenPipe(name);
@@ -59,25 +59,25 @@ bool CFilePipe::Open(const CURL& url)
return (m_pipe != NULL);
}
-bool CFilePipe::Exists(const CURL& url)
+bool CPipeFile::Exists(const CURL& url)
{
CStdString name = url.Get();
return PipesManager::GetInstance().Exists(name);
}
-int CFilePipe::Stat(const CURL& url, struct __stat64* buffer)
+int CPipeFile::Stat(const CURL& url, struct __stat64* buffer)
{
return -1;
}
-int CFilePipe::Stat(struct __stat64* buffer)
+int CPipeFile::Stat(struct __stat64* buffer)
{
memset(buffer,0,sizeof(struct __stat64));
buffer->st_size = m_length;
return 0;
}
-unsigned int CFilePipe::Read(void* lpBuf, int64_t uiBufSize)
+unsigned int CPipeFile::Read(void* lpBuf, int64_t uiBufSize)
{
if (!m_pipe)
return -1;
@@ -85,7 +85,7 @@ unsigned int CFilePipe::Read(void* lpBuf, int64_t uiBufSize)
return m_pipe->Read((char *)lpBuf,(int)uiBufSize,INFINITE);
}
-int CFilePipe::Write(const void* lpBuf, int64_t uiBufSize)
+int CPipeFile::Write(const void* lpBuf, int64_t uiBufSize)
{
if (!m_pipe)
return -1;
@@ -93,33 +93,33 @@ int CFilePipe::Write(const void* lpBuf, int64_t uiBufSize)
return (int)(m_pipe->Write((const char *)lpBuf,(int)uiBufSize,INFINITE)); // its not the size. its bool. either all was written or not.
}
-void CFilePipe::SetEof()
+void CPipeFile::SetEof()
{
if (!m_pipe)
return ;
m_pipe->SetEof();
}
-bool CFilePipe::IsEof()
+bool CPipeFile::IsEof()
{
if (!m_pipe)
return true;
return m_pipe->IsEof();
}
-bool CFilePipe::IsEmpty()
+bool CPipeFile::IsEmpty()
{
if (!m_pipe)
return true;
return m_pipe->IsEmpty();
}
-int64_t CFilePipe::Seek(int64_t iFilePosition, int iWhence)
+int64_t CPipeFile::Seek(int64_t iFilePosition, int iWhence)
{
return -1;
}
-void CFilePipe::Close()
+void CPipeFile::Close()
{
if (m_pipe)
{
@@ -129,18 +129,18 @@ void CFilePipe::Close()
m_pipe = NULL;
}
-bool CFilePipe::IsClosed()
+bool CPipeFile::IsClosed()
{
return (m_pipe == NULL);
}
-void CFilePipe::Flush()
+void CPipeFile::Flush()
{
if (m_pipe)
m_pipe->Flush();
}
-bool CFilePipe::OpenForWrite(const CURL& url, bool bOverWrite)
+bool CPipeFile::OpenForWrite(const CURL& url, bool bOverWrite)
{
CStdString name = url.Get();
@@ -150,47 +150,47 @@ bool CFilePipe::OpenForWrite(const CURL& url, bool bOverWrite)
return (m_pipe != NULL);
}
-bool CFilePipe::Delete(const CURL& url)
+bool CPipeFile::Delete(const CURL& url)
{
return false;
}
-bool CFilePipe::Rename(const CURL& url, const CURL& urlnew)
+bool CPipeFile::Rename(const CURL& url, const CURL& urlnew)
{
return false;
}
-int CFilePipe::IoControl(int request, void* param)
+int CPipeFile::IoControl(int request, void* param)
{
return -1;
}
-CStdString CFilePipe::GetName() const
+CStdString CPipeFile::GetName() const
{
if (!m_pipe)
return StringUtils::EmptyString;
return m_pipe->GetName();
}
-void CFilePipe::OnPipeOverFlow()
+void CPipeFile::OnPipeOverFlow()
{
CSingleLock lock(m_lock);
for (size_t l=0; l<m_listeners.size(); l++)
m_listeners[l]->OnPipeOverFlow();
}
-__int64 CFilePipe::GetAvailableRead()
+__int64 CPipeFile::GetAvailableRead()
{
return m_pipe->GetAvailableRead();
}
-void CFilePipe::OnPipeUnderFlow()
+void CPipeFile::OnPipeUnderFlow()
{
for (size_t l=0; l<m_listeners.size(); l++)
m_listeners[l]->OnPipeUnderFlow();
}
-void CFilePipe::AddListener(IPipeListener *l)
+void CPipeFile::AddListener(IPipeListener *l)
{
CSingleLock lock(m_lock);
for (size_t i=0; i<m_listeners.size(); i++)
@@ -201,7 +201,7 @@ void CFilePipe::AddListener(IPipeListener *l)
m_listeners.push_back(l);
}
-void CFilePipe::RemoveListener(IPipeListener *l)
+void CPipeFile::RemoveListener(IPipeListener *l)
{
CSingleLock lock(m_lock);
std::vector<XFILE::IPipeListener *>::iterator i = m_listeners.begin();
@@ -214,7 +214,7 @@ void CFilePipe::RemoveListener(IPipeListener *l)
}
}
-void CFilePipe::SetOpenThreashold(int threashold)
+void CPipeFile::SetOpenThreashold(int threashold)
{
m_pipe->SetOpenThreashold(threashold);
}
diff --git a/xbmc/filesystem/FilePipe.h b/xbmc/filesystem/PipeFile.h
index 01a09577a5..62ebdc0db1 100644
--- a/xbmc/filesystem/FilePipe.h
+++ b/xbmc/filesystem/PipeFile.h
@@ -18,7 +18,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-// FilePipe.h: interface for the CFilePipe class.
+// FilePipe.h: interface for the CPipeFile class.
//
//////////////////////////////////////////////////////////////////////
@@ -40,11 +40,11 @@
namespace XFILE
{
-class CFilePipe : public IFile, public IPipeListener
+class CPipeFile : public IFile, public IPipeListener
{
public:
- CFilePipe();
- virtual ~CFilePipe();
+ CPipeFile();
+ virtual ~CPipeFile();
virtual int64_t GetPosition();
virtual int64_t GetLength();
virtual void SetLength(int64_t len);
diff --git a/xbmc/filesystem/RSSDirectory.cpp b/xbmc/filesystem/RSSDirectory.cpp
index 4bbd2657c8..a4ef8c59c3 100644
--- a/xbmc/filesystem/RSSDirectory.cpp
+++ b/xbmc/filesystem/RSSDirectory.cpp
@@ -21,7 +21,7 @@
#include "RSSDirectory.h"
#include "FileItem.h"
-#include "FileCurl.h"
+#include "CurlFile.h"
#include "settings/Settings.h"
#include "utils/URIUtils.h"
#include "tinyXML/tinyxml.h"
diff --git a/xbmc/filesystem/FileRTV.cpp b/xbmc/filesystem/RTVFile.cpp
index b1a7e4fcbc..2eee45b47d 100644
--- a/xbmc/filesystem/FileRTV.cpp
+++ b/xbmc/filesystem/RTVFile.cpp
@@ -19,11 +19,11 @@
*
*/
-// FileRTV.cpp: implementation of the CFileRTV class.
+// FileRTV.cpp: implementation of the CRTVFile class.
//
//////////////////////////////////////////////////////////////////////
-#include "FileRTV.h"
+#include "RTVFile.h"
#include "SectionLoader.h"
#include "URL.h"
#include "utils/log.h"
@@ -44,7 +44,7 @@ using namespace XFILE;
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-CFileRTV::CFileRTV()
+CRTVFile::CRTVFile()
{
CSectionLoader::Load("LIBRTV");
m_filePos = 0;
@@ -53,14 +53,14 @@ CFileRTV::CFileRTV()
m_rtvd = NULL;
}
-CFileRTV::~CFileRTV()
+CRTVFile::~CRTVFile()
{
Close();
CSectionLoader::Unload("LIBRTV");
}
//*********************************************************************************************
-bool CFileRTV::Open(const char* strHostName, const char* strFileName, int iport)
+bool CRTVFile::Open(const char* strHostName, const char* strFileName, int iport)
{
// Close any existing connection
if (m_bOpened) Close();
@@ -109,24 +109,24 @@ bool CFileRTV::Open(const char* strHostName, const char* strFileName, int iport)
return true;
}
-bool CFileRTV::Open(const CURL& url)
+bool CRTVFile::Open(const CURL& url)
{
return Open(url.GetHostName(), url.GetFileName(), url.GetPort());
}
-bool CFileRTV::Exists(const CURL& url)
+bool CRTVFile::Exists(const CURL& url)
{
return true;
}
-int CFileRTV::Stat(const CURL& url, struct __stat64* buffer)
+int CRTVFile::Stat(const CURL& url, struct __stat64* buffer)
{
errno = ENOENT;
return -1;
}
//*********************************************************************************************
-unsigned int CFileRTV::Read(void *lpBuf, int64_t uiBufSize)
+unsigned int CRTVFile::Read(void *lpBuf, int64_t uiBufSize)
{
size_t lenread;
@@ -155,7 +155,7 @@ unsigned int CFileRTV::Read(void *lpBuf, int64_t uiBufSize)
}
//*********************************************************************************************
-void CFileRTV::Close()
+void CRTVFile::Close()
{
m_bOpened = false;
@@ -168,7 +168,7 @@ void CFileRTV::Close()
}
//*********************************************************************************************
-int64_t CFileRTV::Seek(int64_t iFilePosition, int iWhence)
+int64_t CRTVFile::Seek(int64_t iFilePosition, int iWhence)
{
UINT64 newpos;
@@ -218,14 +218,14 @@ int64_t CFileRTV::Seek(int64_t iFilePosition, int iWhence)
}
//*********************************************************************************************
-int64_t CFileRTV::GetLength()
+int64_t CRTVFile::GetLength()
{
if (!m_bOpened) return 0;
return m_fileSize;
}
//*********************************************************************************************
-int64_t CFileRTV::GetPosition()
+int64_t CRTVFile::GetPosition()
{
if (!m_bOpened) return 0;
return m_filePos;
diff --git a/xbmc/filesystem/FileRTV.h b/xbmc/filesystem/RTVFile.h
index 40c5ae83a8..cadf3d8a02 100644
--- a/xbmc/filesystem/FileRTV.h
+++ b/xbmc/filesystem/RTVFile.h
@@ -19,7 +19,7 @@
*
*/
-// FileRTV.h: interface for the CFileRTV class.
+// FileRTV.h: interface for the CRTVFile class.
//
//////////////////////////////////////////////////////////////////////
@@ -37,11 +37,11 @@ typedef struct rtv_data * RTVD;
namespace XFILE
{
-class CFileRTV : public IFile
+class CRTVFile : public IFile
{
public:
- CFileRTV();
- virtual ~CFileRTV();
+ CRTVFile();
+ virtual ~CRTVFile();
virtual int64_t GetPosition();
virtual int64_t GetLength();
virtual bool Open(const CURL& url);
diff --git a/xbmc/filesystem/FileRar.cpp b/xbmc/filesystem/RarFile.cpp
index 9c87a35216..3fca340b84 100644
--- a/xbmc/filesystem/FileRar.cpp
+++ b/xbmc/filesystem/RarFile.cpp
@@ -20,7 +20,7 @@
*/
#include "system.h"
-#include "FileRar.h"
+#include "RarFile.h"
#include <sys/stat.h>
#include "Util.h"
#include "utils/CharsetConverter.h"
@@ -43,7 +43,7 @@ using namespace std;
#define SEEKTIMOUT 30000
#ifdef HAS_FILESYSTEM_RAR
-CFileRarExtractThread::CFileRarExtractThread() : hRunning(true), hQuit(true)
+CRarFileExtractThread::CRarFileExtractThread() : hRunning(true), hQuit(true)
{
m_pArc = NULL;
m_pCmd = NULL;
@@ -52,14 +52,14 @@ CFileRarExtractThread::CFileRarExtractThread() : hRunning(true), hQuit(true)
Create();
}
-CFileRarExtractThread::~CFileRarExtractThread()
+CRarFileExtractThread::~CRarFileExtractThread()
{
hQuit.Set();
AbortableWait(hRestart);
StopThread();
}
-void CFileRarExtractThread::Start(Archive* pArc, CommandData* pCmd, CmdExtract* pExtract, int iSize)
+void CRarFileExtractThread::Start(Archive* pArc, CommandData* pCmd, CmdExtract* pExtract, int iSize)
{
m_pArc = pArc;
m_pCmd = pCmd;
@@ -76,15 +76,15 @@ void CFileRarExtractThread::Start(Archive* pArc, CommandData* pCmd, CmdExtract*
hRestart.Set();
}
-void CFileRarExtractThread::OnStartup()
+void CRarFileExtractThread::OnStartup()
{
}
-void CFileRarExtractThread::OnExit()
+void CRarFileExtractThread::OnExit()
{
}
-void CFileRarExtractThread::Process()
+void CRarFileExtractThread::Process()
{
while (AbortableWait(hQuit,1) != WAIT_SIGNALED)
{
@@ -111,7 +111,7 @@ void CFileRarExtractThread::Process()
}
#endif
-CFileRar::CFileRar()
+CRarFile::CRarFile()
{
m_strCacheDir.Empty();
m_strRarPath.Empty();
@@ -132,7 +132,7 @@ CFileRar::CFileRar()
m_bSeekable = true;
}
-CFileRar::~CFileRar()
+CRarFile::~CRarFile()
{
#ifdef HAS_FILESYSTEM_RAR
if (!m_bOpen)
@@ -155,7 +155,7 @@ CFileRar::~CFileRar()
#endif
}
-bool CFileRar::Open(const CURL& url)
+bool CRarFile::Open(const CURL& url)
{
InitFromUrl(url);
CFileItemList items;
@@ -223,7 +223,7 @@ bool CFileRar::Open(const CURL& url)
return false;
}
-bool CFileRar::Exists(const CURL& url)
+bool CRarFile::Exists(const CURL& url)
{
InitFromUrl(url);
bool bResult;
@@ -234,7 +234,7 @@ bool CFileRar::Exists(const CURL& url)
return bResult;
}
-int CFileRar::Stat(const CURL& url, struct __stat64* buffer)
+int CRarFile::Stat(const CURL& url, struct __stat64* buffer)
{
memset(buffer, 0, sizeof(struct __stat64));
if (Open(url))
@@ -256,12 +256,12 @@ int CFileRar::Stat(const CURL& url, struct __stat64* buffer)
return -1;
}
-bool CFileRar::OpenForWrite(const CURL& url)
+bool CRarFile::OpenForWrite(const CURL& url)
{
return false;
}
-unsigned int CFileRar::Read(void *lpBuf, int64_t uiBufSize)
+unsigned int CRarFile::Read(void *lpBuf, int64_t uiBufSize)
{
#ifdef HAS_FILESYSTEM_RAR
if (!m_bOpen)
@@ -341,12 +341,12 @@ unsigned int CFileRar::Read(void *lpBuf, int64_t uiBufSize)
#endif
}
-unsigned int CFileRar::Write(void *lpBuf, int64_t uiBufSize)
+unsigned int CRarFile::Write(void *lpBuf, int64_t uiBufSize)
{
return 0;
}
-void CFileRar::Close()
+void CRarFile::Close()
{
#ifdef HAS_FILESYSTEM_RAR
if (!m_bOpen)
@@ -371,7 +371,7 @@ void CFileRar::Close()
#endif
}
-int64_t CFileRar::Seek(int64_t iFilePosition, int iWhence)
+int64_t CRarFile::Seek(int64_t iFilePosition, int iWhence)
{
#ifdef HAS_FILESYSTEM_RAR
if (!m_bOpen)
@@ -480,7 +480,7 @@ int64_t CFileRar::Seek(int64_t iFilePosition, int iWhence)
#endif
}
-int64_t CFileRar::GetLength()
+int64_t CRarFile::GetLength()
{
if (!m_bOpen)
return 0;
@@ -491,7 +491,7 @@ int64_t CFileRar::GetLength()
return m_iFileSize;
}
-int64_t CFileRar::GetPosition()
+int64_t CRarFile::GetPosition()
{
if (!m_bOpen)
return -1;
@@ -502,18 +502,18 @@ int64_t CFileRar::GetPosition()
return m_iFilePosition;
}
-int CFileRar::Write(const void* lpBuf, int64_t uiBufSize)
+int CRarFile::Write(const void* lpBuf, int64_t uiBufSize)
{
return -1;
}
-void CFileRar::Flush()
+void CRarFile::Flush()
{
if (m_bUseFile)
m_File.Flush();
}
-void CFileRar::InitFromUrl(const CURL& url)
+void CRarFile::InitFromUrl(const CURL& url)
{
m_strCacheDir = g_advancedSettings.m_cachePath;//url.GetDomain();
URIUtils::AddSlashAtEnd(m_strCacheDir);
@@ -543,7 +543,7 @@ void CFileRar::InitFromUrl(const CURL& url)
}
-void CFileRar::CleanUp()
+void CRarFile::CleanUp()
{
#ifdef HAS_FILESYSTEM_RAR
try
@@ -595,7 +595,7 @@ void CFileRar::CleanUp()
#endif
}
-bool CFileRar::OpenInArchive()
+bool CRarFile::OpenInArchive()
{
#ifdef HAS_FILESYSTEM_RAR
try
@@ -702,7 +702,7 @@ bool CFileRar::OpenInArchive()
m_iBufferStart = 0;
delete m_pExtractThread;
- m_pExtractThread = new CFileRarExtractThread();
+ m_pExtractThread = new CRarFileExtractThread();
m_pExtractThread->Start(m_pArc,m_pCmd,m_pExtract,iHeaderSize);
return true;
diff --git a/xbmc/filesystem/FileRar.h b/xbmc/filesystem/RarFile.h
index 83941dcd9b..30beab466a 100644
--- a/xbmc/filesystem/FileRar.h
+++ b/xbmc/filesystem/RarFile.h
@@ -19,7 +19,7 @@
*
*/
-// FileRar.h: interface for the CFileRar class.
+// FileRar.h: interface for the CRarFile class.
#pragma once
#ifndef FILERAR_H_
@@ -36,11 +36,11 @@ class Archive;
namespace XFILE
{
#ifdef HAS_FILESYSTEM_RAR
- class CFileRarExtractThread : public CThread
+ class CRarFileExtractThread : public CThread
{
public:
- CFileRarExtractThread();
- ~CFileRarExtractThread();
+ CRarFileExtractThread();
+ ~CRarFileExtractThread();
void Start(Archive* pArc, CommandData* pCmd, CmdExtract* pExtract, int iSize);
@@ -60,12 +60,12 @@ namespace XFILE
};
#endif
- class CFileRar : public IFile
+ class CRarFile : public IFile
{
public:
- CFileRar();
- CFileRar(bool bSeekable); // used for caching files
- virtual ~CFileRar();
+ CRarFile();
+ CRarFile(bool bSeekable); // used for caching files
+ virtual ~CRarFile();
virtual int64_t GetPosition();
virtual int64_t GetLength();
virtual bool Open(const CURL& url);
@@ -102,7 +102,7 @@ namespace XFILE
Archive* m_pArc;
CommandData* m_pCmd;
CmdExtract* m_pExtract;
- CFileRarExtractThread* m_pExtractThread;
+ CRarFileExtractThread* m_pExtractThread;
#endif
byte* m_szBuffer;
byte* m_szStartOfBuffer;
diff --git a/xbmc/filesystem/SFTPDirectory.h b/xbmc/filesystem/SFTPDirectory.h
index a0eb1a4747..8a50ea5328 100644
--- a/xbmc/filesystem/SFTPDirectory.h
+++ b/xbmc/filesystem/SFTPDirectory.h
@@ -23,7 +23,7 @@
#include "system.h"
#ifdef HAS_FILESYSTEM_SFTP
#include "IDirectory.h"
-#include "FileSFTP.h"
+#include "SFTPFile.h"
class CURL;
class TiXmlElement;
diff --git a/xbmc/filesystem/FileSFTP.cpp b/xbmc/filesystem/SFTPFile.cpp
index 36c622e261..a948b4fbfd 100644
--- a/xbmc/filesystem/FileSFTP.cpp
+++ b/xbmc/filesystem/SFTPFile.cpp
@@ -21,7 +21,7 @@
#include "threads/SystemClock.h"
-#include "FileSFTP.h"
+#include "SFTPFile.h"
#ifdef HAS_FILESYSTEM_SFTP
#include "threads/SingleLock.h"
#include "utils/log.h"
@@ -472,17 +472,17 @@ void CSFTPSessionManager::DisconnectAllSessions()
sessions.clear();
}
-CFileSFTP::CFileSFTP()
+CSFTPFile::CSFTPFile()
{
m_sftp_handle = NULL;
}
-CFileSFTP::~CFileSFTP()
+CSFTPFile::~CSFTPFile()
{
Close();
}
-bool CFileSFTP::Open(const CURL& url)
+bool CSFTPFile::Open(const CURL& url)
{
m_session = CSFTPSessionManager::CreateSession(url);
if (m_session)
@@ -499,7 +499,7 @@ bool CFileSFTP::Open(const CURL& url)
}
}
-void CFileSFTP::Close()
+void CSFTPFile::Close()
{
if (m_session && m_sftp_handle)
{
@@ -509,7 +509,7 @@ void CFileSFTP::Close()
}
}
-int64_t CFileSFTP::Seek(int64_t iFilePosition, int iWhence)
+int64_t CSFTPFile::Seek(int64_t iFilePosition, int iWhence)
{
if (m_session && m_sftp_handle)
{
@@ -533,7 +533,7 @@ int64_t CFileSFTP::Seek(int64_t iFilePosition, int iWhence)
}
}
-unsigned int CFileSFTP::Read(void* lpBuf, int64_t uiBufSize)
+unsigned int CSFTPFile::Read(void* lpBuf, int64_t uiBufSize)
{
if (m_session && m_sftp_handle)
{
@@ -550,7 +550,7 @@ unsigned int CFileSFTP::Read(void* lpBuf, int64_t uiBufSize)
return 0;
}
-bool CFileSFTP::Exists(const CURL& url)
+bool CSFTPFile::Exists(const CURL& url)
{
CSFTPSessionPtr session = CSFTPSessionManager::CreateSession(url);
if (session)
@@ -562,7 +562,7 @@ bool CFileSFTP::Exists(const CURL& url)
}
}
-int CFileSFTP::Stat(const CURL& url, struct __stat64* buffer)
+int CSFTPFile::Stat(const CURL& url, struct __stat64* buffer)
{
CSFTPSessionPtr session = CSFTPSessionManager::CreateSession(url);
if (session)
@@ -574,7 +574,7 @@ int CFileSFTP::Stat(const CURL& url, struct __stat64* buffer)
}
}
-int CFileSFTP::Stat(struct __stat64* buffer)
+int CSFTPFile::Stat(struct __stat64* buffer)
{
if (m_session)
return m_session->Stat(m_file.c_str(), buffer);
@@ -583,7 +583,7 @@ int CFileSFTP::Stat(struct __stat64* buffer)
return -1;
}
-int64_t CFileSFTP::GetLength()
+int64_t CSFTPFile::GetLength()
{
struct __stat64 buffer;
if (Stat(&buffer) != 0)
@@ -595,7 +595,7 @@ int64_t CFileSFTP::GetLength()
}
}
-int64_t CFileSFTP::GetPosition()
+int64_t CSFTPFile::GetPosition()
{
if (m_session && m_sftp_handle)
return m_session->GetPosition(m_sftp_handle);
@@ -604,7 +604,7 @@ int64_t CFileSFTP::GetPosition()
return 0;
}
-int CFileSFTP::IoControl(EIoControl request, void* param)
+int CSFTPFile::IoControl(EIoControl request, void* param)
{
if(request == IOCTRL_SEEK_POSSIBLE)
return 1;
diff --git a/xbmc/filesystem/FileSFTP.h b/xbmc/filesystem/SFTPFile.h
index 1ff25ba6fa..bf29db6ebd 100644
--- a/xbmc/filesystem/FileSFTP.h
+++ b/xbmc/filesystem/SFTPFile.h
@@ -92,11 +92,11 @@ private:
namespace XFILE
{
- class CFileSFTP : public IFile
+ class CSFTPFile : public IFile
{
public:
- CFileSFTP();
- virtual ~CFileSFTP();
+ CSFTPFile();
+ virtual ~CSFTPFile();
virtual void Close();
virtual int64_t Seek(int64_t iFilePosition, int iWhence = SEEK_SET);
virtual unsigned int Read(void* lpBuf, int64_t uiBufSize);
diff --git a/xbmc/filesystem/SMBDirectory.h b/xbmc/filesystem/SMBDirectory.h
index 3232f6c852..49fa7e5541 100644
--- a/xbmc/filesystem/SMBDirectory.h
+++ b/xbmc/filesystem/SMBDirectory.h
@@ -21,7 +21,7 @@
*/
#include "IDirectory.h"
-#include "FileSmb.h"
+#include "SmbFile.h"
#include "MediaSource.h"
namespace XFILE
diff --git a/xbmc/filesystem/FileShoutcast.cpp b/xbmc/filesystem/ShoutcastFile.cpp
index 79fa6ac25d..eeb461f10e 100644
--- a/xbmc/filesystem/FileShoutcast.cpp
+++ b/xbmc/filesystem/ShoutcastFile.cpp
@@ -20,14 +20,14 @@
*/
-// FileShoutcast.cpp: implementation of the CFileShoutcast class.
+// FileShoutcast.cpp: implementation of the CShoutcastFile class.
//
//////////////////////////////////////////////////////////////////////
#include "threads/SystemClock.h"
#include "system.h"
#include "Application.h"
-#include "FileShoutcast.h"
+#include "ShoutcastFile.h"
#include "settings/GUISettings.h"
#include "guilib/GUIWindowManager.h"
#include "URL.h"
@@ -41,7 +41,7 @@
using namespace XFILE;
using namespace MUSIC_INFO;
-CFileShoutcast::CFileShoutcast()
+CShoutcastFile::CShoutcastFile()
{
m_lastTime = XbmcThreads::SystemClockMillis();
m_discarded = 0;
@@ -49,22 +49,22 @@ CFileShoutcast::CFileShoutcast()
m_buffer = NULL;
}
-CFileShoutcast::~CFileShoutcast()
+CShoutcastFile::~CShoutcastFile()
{
Close();
}
-int64_t CFileShoutcast::GetPosition()
+int64_t CShoutcastFile::GetPosition()
{
return m_file.GetPosition()-m_discarded;
}
-int64_t CFileShoutcast::GetLength()
+int64_t CShoutcastFile::GetLength()
{
return 0;
}
-bool CFileShoutcast::Open(const CURL& url)
+bool CShoutcastFile::Open(const CURL& url)
{
CURL url2(url);
url2.SetProtocolOptions("noshout=true&Icy-MetaData=1");
@@ -90,7 +90,7 @@ bool CFileShoutcast::Open(const CURL& url)
return result;
}
-unsigned int CFileShoutcast::Read(void* lpBuf, int64_t uiBufSize)
+unsigned int CShoutcastFile::Read(void* lpBuf, int64_t uiBufSize)
{
if (m_currint >= m_metaint && m_metaint > 0)
{
@@ -117,18 +117,18 @@ unsigned int CFileShoutcast::Read(void* lpBuf, int64_t uiBufSize)
return toRead;
}
-int64_t CFileShoutcast::Seek(int64_t iFilePosition, int iWhence)
+int64_t CShoutcastFile::Seek(int64_t iFilePosition, int iWhence)
{
return -1;
}
-void CFileShoutcast::Close()
+void CShoutcastFile::Close()
{
delete[] m_buffer;
m_file.Close();
}
-void CFileShoutcast::ExtractTagInfo(const char* buf)
+void CShoutcastFile::ExtractTagInfo(const char* buf)
{
CStdString strBuffer = buf;
g_charsetConverter.unknownToUTF8(strBuffer);
@@ -145,7 +145,7 @@ void CFileShoutcast::ExtractTagInfo(const char* buf)
m_tag.SetTitle(reTitle.GetReplaceString("\\1"));
}
-void CFileShoutcast::ReadTruncated(char* buf2, int size)
+void CShoutcastFile::ReadTruncated(char* buf2, int size)
{
char* buf = buf2;
while (size > 0)
diff --git a/xbmc/filesystem/FileShoutcast.h b/xbmc/filesystem/ShoutcastFile.h
index bdd93ec24b..5068e57d69 100644
--- a/xbmc/filesystem/FileShoutcast.h
+++ b/xbmc/filesystem/ShoutcastFile.h
@@ -19,24 +19,24 @@
*
*/
-// FileShoutcast.h: interface for the CFileShoutcast class.
+// FileShoutcast.h: interface for the CShoutcastFile class.
//
//////////////////////////////////////////////////////////////////////
#pragma once
#include "IFile.h"
-#include "FileCurl.h"
+#include "CurlFile.h"
#include "utils/StdString.h"
#include "music/tags/MusicInfoTag.h"
namespace XFILE
{
-class CFileShoutcast : public IFile
+class CShoutcastFile : public IFile
{
public:
- CFileShoutcast();
- virtual ~CFileShoutcast();
+ CShoutcastFile();
+ virtual ~CShoutcastFile();
virtual int64_t GetPosition();
virtual int64_t GetLength();
virtual bool Open(const CURL& url);
@@ -50,7 +50,7 @@ protected:
void ReadTruncated(char* buf2, int size);
unsigned int m_lastTime;
- CFileCurl m_file;
+ CCurlFile m_file;
int m_metaint;
int m_discarded; // data used for tags
int m_currint;
diff --git a/xbmc/filesystem/Slingbox.h b/xbmc/filesystem/Slingbox.h
deleted file mode 100644
index 22ad11f466..0000000000
--- a/xbmc/filesystem/Slingbox.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#pragma once
-/*
- * Copyright (C) 2011 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"
-#include "IFile.h"
-#include "ILiveTV.h"
-
-class CSlingbox;
-
-namespace XFILE
-{
-
-class CSlingboxDirectory
- : public IDirectory
-{
-public:
- CSlingboxDirectory();
- virtual ~CSlingboxDirectory();
-
- virtual bool IsAllowed(const CStdString &strFile) const { return true; }
- virtual bool GetDirectory(const CStdString& strPath, CFileItemList &items);
-};
-
-class CSlingboxFile
- : public IFile, ILiveTVInterface
-{
-public:
- CSlingboxFile();
- virtual ~CSlingboxFile();
- virtual bool Open(const CURL& url);
- virtual unsigned int Read(void * buffer, int64_t size);
- virtual void Close();
- virtual bool SkipNext();
-
- virtual int GetStartTime() { return 0; }
- virtual int GetTotalTime() { return 0; }
- virtual int64_t GetLength() { return -1; }
- virtual int64_t GetPosition() { return -1; }
- virtual int64_t Seek(int64_t pos, int whence) { return -1; }
- virtual bool UpdateItem(CFileItem& item) { return false; }
-
- virtual bool Exists(const CURL& url) { return false; }
- virtual int Stat(const CURL& url, struct __stat64* buffer) { return -1; }
-
- virtual ILiveTVInterface * GetLiveTV() { return (ILiveTVInterface *)this; }
-
- virtual bool NextChannel();
- virtual bool PrevChannel();
- virtual bool SelectChannel(unsigned int uiChannel);
-
-protected:
- struct
- {
- CStdString strHostname;
- int iVideoWidth;
- int iVideoHeight;
- int iVideoResolution;
- int iVideoBitrate;
- int iVideoFramerate;
- int iVideoSmoothing;
- int iAudioBitrate;
- int iIFrameInterval;
- unsigned int uiCodeChannelUp;
- unsigned int uiCodeChannelDown;
- unsigned int uiCodeNumber[10];
- } m_sSlingboxSettings;
-
- void LoadSettings(const CStdString& strSlingbox);
- CSlingbox * m_pSlingbox;
-};
-
-}
diff --git a/xbmc/filesystem/SlingboxDirectory.cpp b/xbmc/filesystem/SlingboxDirectory.cpp
new file mode 100644
index 0000000000..7085a2e813
--- /dev/null
+++ b/xbmc/filesystem/SlingboxDirectory.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2011 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 "SlingboxDirectory.h"
+#include "FileItem.h"
+
+using namespace XFILE;
+using namespace std;
+
+CSlingboxDirectory::CSlingboxDirectory()
+{
+}
+
+CSlingboxDirectory::~CSlingboxDirectory()
+{
+}
+
+bool CSlingboxDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items)
+{
+ // Create generic Watch Slingbox item
+ CFileItemPtr item(new CFileItem(strPath, false));
+ item->SetLabel("Watch Slingbox");
+ item->SetLabelPreformated(true);
+ items.Add(item);
+
+ return true;
+} \ No newline at end of file
diff --git a/xbmc/filesystem/SlingboxDirectory.h b/xbmc/filesystem/SlingboxDirectory.h
new file mode 100644
index 0000000000..22bfd23dbe
--- /dev/null
+++ b/xbmc/filesystem/SlingboxDirectory.h
@@ -0,0 +1,38 @@
+#pragma once
+/*
+ * Copyright (C) 2011 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"
+
+namespace XFILE
+{
+
+ class CSlingboxDirectory
+ : public IDirectory
+ {
+ public:
+ CSlingboxDirectory();
+ virtual ~CSlingboxDirectory();
+
+ virtual bool IsAllowed(const CStdString &strFile) const { return true; }
+ virtual bool GetDirectory(const CStdString& strPath, CFileItemList &items);
+ };
+} \ No newline at end of file
diff --git a/xbmc/filesystem/Slingbox.cpp b/xbmc/filesystem/SlingboxFile.cpp
index d7e87633e7..d392b29612 100644
--- a/xbmc/filesystem/Slingbox.cpp
+++ b/xbmc/filesystem/SlingboxFile.cpp
@@ -20,7 +20,7 @@
*/
#include "FileItem.h"
-#include "Slingbox.h"
+#include "SlingboxFile.h"
#include "filesystem/File.h"
#include "lib/SlingboxLib/SlingboxLib.h"
#include "settings/Settings.h"
@@ -30,25 +30,6 @@
using namespace XFILE;
using namespace std;
-CSlingboxDirectory::CSlingboxDirectory()
-{
-}
-
-CSlingboxDirectory::~CSlingboxDirectory()
-{
-}
-
-bool CSlingboxDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items)
-{
- // Create generic Watch Slingbox item
- CFileItemPtr item(new CFileItem(strPath, false));
- item->SetLabel("Watch Slingbox");
- item->SetLabelPreformated(true);
- items.Add(item);
-
- return true;
-}
-
CSlingboxFile::CSlingboxFile()
{
// Create the Slingbox object
diff --git a/xbmc/filesystem/SlingboxFile.h b/xbmc/filesystem/SlingboxFile.h
new file mode 100644
index 0000000000..45082c981e
--- /dev/null
+++ b/xbmc/filesystem/SlingboxFile.h
@@ -0,0 +1,78 @@
+#pragma once
+/*
+ * Copyright (C) 2011 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 "IFile.h"
+#include "ILiveTV.h"
+
+class CSlingbox;
+
+namespace XFILE
+{
+ class CSlingboxFile
+ : public IFile, ILiveTVInterface
+ {
+ public:
+ CSlingboxFile();
+ virtual ~CSlingboxFile();
+ virtual bool Open(const CURL& url);
+ virtual unsigned int Read(void * buffer, int64_t size);
+ virtual void Close();
+ virtual bool SkipNext();
+
+ virtual int GetStartTime() { return 0; }
+ virtual int GetTotalTime() { return 0; }
+ virtual int64_t GetLength() { return -1; }
+ virtual int64_t GetPosition() { return -1; }
+ virtual int64_t Seek(int64_t pos, int whence) { return -1; }
+ virtual bool UpdateItem(CFileItem& item) { return false; }
+
+ virtual bool Exists(const CURL& url) { return false; }
+ virtual int Stat(const CURL& url, struct __stat64* buffer) { return -1; }
+
+ virtual ILiveTVInterface * GetLiveTV() { return (ILiveTVInterface *)this; }
+
+ virtual bool NextChannel();
+ virtual bool PrevChannel();
+ virtual bool SelectChannel(unsigned int uiChannel);
+
+ protected:
+ struct
+ {
+ CStdString strHostname;
+ int iVideoWidth;
+ int iVideoHeight;
+ int iVideoResolution;
+ int iVideoBitrate;
+ int iVideoFramerate;
+ int iVideoSmoothing;
+ int iAudioBitrate;
+ int iIFrameInterval;
+ unsigned int uiCodeChannelUp;
+ unsigned int uiCodeChannelDown;
+ unsigned int uiCodeNumber[10];
+ } m_sSlingboxSettings;
+
+ void LoadSettings(const CStdString& strSlingbox);
+ CSlingbox * m_pSlingbox;
+ };
+
+}
diff --git a/xbmc/filesystem/FileSmb.cpp b/xbmc/filesystem/SmbFile.cpp
index f1d7416247..4ab5f76b66 100644
--- a/xbmc/filesystem/FileSmb.cpp
+++ b/xbmc/filesystem/SmbFile.cpp
@@ -19,12 +19,12 @@
*
*/
-// FileSmb.cpp: implementation of the CFileSMB class.
+// FileSmb.cpp: implementation of the CSmbFile class.
//
//////////////////////////////////////////////////////////////////////
#include "system.h"
-#include "FileSmb.h"
+#include "SmbFile.h"
#include "PasswordManager.h"
#include "SMBDirectory.h"
#include "Util.h"
@@ -346,7 +346,7 @@ void CSMB::AddIdleConnection()
CSMB smb;
-CFileSMB::CFileSMB()
+CSmbFile::CSmbFile()
{
smb.Init();
m_fd = -1;
@@ -355,7 +355,7 @@ CFileSMB::CFileSMB()
#endif
}
-CFileSMB::~CFileSMB()
+CSmbFile::~CSmbFile()
{
Close();
#ifdef TARGET_POSIX
@@ -363,7 +363,7 @@ CFileSMB::~CFileSMB()
#endif
}
-int64_t CFileSMB::GetPosition()
+int64_t CSmbFile::GetPosition()
{
if (m_fd == -1) return 0;
smb.Init();
@@ -374,13 +374,13 @@ int64_t CFileSMB::GetPosition()
return pos;
}
-int64_t CFileSMB::GetLength()
+int64_t CSmbFile::GetLength()
{
if (m_fd == -1) return 0;
return m_fileSize;
}
-bool CFileSMB::Open(const CURL& url)
+bool CSmbFile::Open(const CURL& url)
{
Close();
@@ -400,7 +400,7 @@ bool CFileSMB::Open(const CURL& url)
CStdString strFileName;
m_fd = OpenFile(url, strFileName);
- CLog::Log(LOGDEBUG,"CFileSMB::Open - opened %s, fd=%d",url.GetFileName().c_str(), m_fd);
+ CLog::Log(LOGDEBUG,"CSmbFile::Open - opened %s, fd=%d",url.GetFileName().c_str(), m_fd);
if (m_fd == -1)
{
// write error to logfile
@@ -444,7 +444,7 @@ bool CFileSMB::Open(const CURL& url)
/// \param strAuth The SMB style path
/// \return SMB file descriptor
/*
-int CFileSMB::OpenFile(CStdString& strAuth)
+int CSmbFile::OpenFile(CStdString& strAuth)
{
int fd = -1;
@@ -465,7 +465,7 @@ int CFileSMB::OpenFile(CStdString& strAuth)
}
*/
-int CFileSMB::OpenFile(const CURL &url, CStdString& strAuth)
+int CSmbFile::OpenFile(const CURL &url, CStdString& strAuth)
{
int fd = -1;
smb.Init();
@@ -504,7 +504,7 @@ int CFileSMB::OpenFile(const CURL &url, CStdString& strAuth)
// dont need to purge since its the same server and share
smbc_closedir(fd);
- // set up new filehandle (as CFileSMB::Open does)
+ // set up new filehandle (as CSmbFile::Open does)
strPath = GetAuthenticatedPath(url);
fd = smbc_open(strPath.c_str(), O_RDONLY, 0);
@@ -517,7 +517,7 @@ int CFileSMB::OpenFile(const CURL &url, CStdString& strAuth)
return fd;
}
-bool CFileSMB::Exists(const CURL& url)
+bool CSmbFile::Exists(const CURL& url)
{
// we can't open files like smb://file.f or smb://server/file.f
// if a file matches the if below return false, it can't exist on a samba share.
@@ -539,7 +539,7 @@ bool CFileSMB::Exists(const CURL& url)
return true;
}
-int CFileSMB::Stat(struct __stat64* buffer)
+int CSmbFile::Stat(struct __stat64* buffer)
{
if (m_fd == -1)
return -1;
@@ -569,7 +569,7 @@ int CFileSMB::Stat(struct __stat64* buffer)
return iResult;
}
-int CFileSMB::Stat(const CURL& url, struct __stat64* buffer)
+int CSmbFile::Stat(const CURL& url, struct __stat64* buffer)
{
smb.Init();
CStdString strFileName = GetAuthenticatedPath(url);
@@ -598,7 +598,7 @@ int CFileSMB::Stat(const CURL& url, struct __stat64* buffer)
return iResult;
}
-unsigned int CFileSMB::Read(void *lpBuf, int64_t uiBufSize)
+unsigned int CSmbFile::Read(void *lpBuf, int64_t uiBufSize)
{
if (m_fd == -1) return 0;
CSingleLock lock(smb); // Init not called since it has to be "inited" by now
@@ -636,7 +636,7 @@ unsigned int CFileSMB::Read(void *lpBuf, int64_t uiBufSize)
return (unsigned int)bytesRead;
}
-int64_t CFileSMB::Seek(int64_t iFilePosition, int iWhence)
+int64_t CSmbFile::Seek(int64_t iFilePosition, int iWhence)
{
if (m_fd == -1) return -1;
@@ -659,18 +659,18 @@ int64_t CFileSMB::Seek(int64_t iFilePosition, int iWhence)
return (int64_t)pos;
}
-void CFileSMB::Close()
+void CSmbFile::Close()
{
if (m_fd != -1)
{
- CLog::Log(LOGDEBUG,"CFileSMB::Close closing fd %d", m_fd);
+ CLog::Log(LOGDEBUG,"CSmbFile::Close closing fd %d", m_fd);
CSingleLock lock(smb);
smbc_close(m_fd);
}
m_fd = -1;
}
-int CFileSMB::Write(const void* lpBuf, int64_t uiBufSize)
+int CSmbFile::Write(const void* lpBuf, int64_t uiBufSize)
{
if (m_fd == -1) return -1;
DWORD dwNumberOfBytesWritten = 0;
@@ -683,7 +683,7 @@ int CFileSMB::Write(const void* lpBuf, int64_t uiBufSize)
return (int)dwNumberOfBytesWritten;
}
-bool CFileSMB::Delete(const CURL& url)
+bool CSmbFile::Delete(const CURL& url)
{
smb.Init();
CStdString strFile = GetAuthenticatedPath(url);
@@ -702,7 +702,7 @@ bool CFileSMB::Delete(const CURL& url)
return (result == 0);
}
-bool CFileSMB::Rename(const CURL& url, const CURL& urlnew)
+bool CSmbFile::Rename(const CURL& url, const CURL& urlnew)
{
smb.Init();
CStdString strFile = GetAuthenticatedPath(url);
@@ -721,7 +721,7 @@ bool CFileSMB::Rename(const CURL& url, const CURL& urlnew)
return (result == 0);
}
-bool CFileSMB::OpenForWrite(const CURL& url, bool bOverWrite)
+bool CSmbFile::OpenForWrite(const CURL& url, bool bOverWrite)
{
m_fileSize = 0;
@@ -760,7 +760,7 @@ bool CFileSMB::OpenForWrite(const CURL& url, bool bOverWrite)
return true;
}
-bool CFileSMB::IsValidFile(const CStdString& strFileName)
+bool CSmbFile::IsValidFile(const CStdString& strFileName)
{
if (strFileName.Find('/') == -1 || /* doesn't have sharename */
strFileName.Right(2) == "/." || /* not current folder */
@@ -769,7 +769,7 @@ bool CFileSMB::IsValidFile(const CStdString& strFileName)
return true;
}
-CStdString CFileSMB::GetAuthenticatedPath(const CURL &url)
+CStdString CSmbFile::GetAuthenticatedPath(const CURL &url)
{
CURL authURL(url);
CPasswordManager::GetInstance().AuthenticateURL(authURL);
diff --git a/xbmc/filesystem/FileSmb.h b/xbmc/filesystem/SmbFile.h
index 406819948a..8cfbc7892e 100644
--- a/xbmc/filesystem/FileSmb.h
+++ b/xbmc/filesystem/SmbFile.h
@@ -19,7 +19,7 @@
*
*/
-// FileSmb.h: interface for the CFileSMB class.
+// FileSmb.h: interface for the CSmbFile class.
//
@@ -86,12 +86,12 @@ extern CSMB smb;
namespace XFILE
{
-class CFileSMB : public IFile
+class CSmbFile : public IFile
{
public:
- CFileSMB();
+ CSmbFile();
int OpenFile(const CURL &url, CStdString& strAuth);
- virtual ~CFileSMB();
+ virtual ~CSmbFile();
virtual void Close();
virtual int64_t Seek(int64_t iFilePosition, int iWhence = SEEK_SET);
virtual unsigned int Read(void* lpBuf, int64_t uiBufSize);
diff --git a/xbmc/filesystem/FileSpecialProtocol.cpp b/xbmc/filesystem/SpecialProtocolFile.cpp
index e77568916b..ebcb941864 100644
--- a/xbmc/filesystem/FileSpecialProtocol.cpp
+++ b/xbmc/filesystem/SpecialProtocolFile.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "FileSpecialProtocol.h"
+#include "SpecialProtocolFile.h"
#include "SpecialProtocol.h"
#include "URL.h"
@@ -27,51 +27,51 @@
using namespace XFILE;
-CFileSpecialProtocol::CFileSpecialProtocol(void)
+CSpecialProtocolFile::CSpecialProtocolFile(void)
{
}
-CFileSpecialProtocol::~CFileSpecialProtocol(void)
+CSpecialProtocolFile::~CSpecialProtocolFile(void)
{
Close();
}
-bool CFileSpecialProtocol::Open(const CURL& url)
+bool CSpecialProtocolFile::Open(const CURL& url)
{
CStdString strFileName=CSpecialProtocol::TranslatePath(url);
return m_file.Open(strFileName);
}
-bool CFileSpecialProtocol::OpenForWrite(const CURL& url, bool bOverWrite /*=false */)
+bool CSpecialProtocolFile::OpenForWrite(const CURL& url, bool bOverWrite /*=false */)
{
CStdString strFileName=CSpecialProtocol::TranslatePath(url);
return m_file.OpenForWrite(strFileName,bOverWrite);
}
-bool CFileSpecialProtocol::Delete(const CURL& url)
+bool CSpecialProtocolFile::Delete(const CURL& url)
{
CStdString strFileName=CSpecialProtocol::TranslatePath(url);
return m_file.Delete(strFileName);
}
-bool CFileSpecialProtocol::Exists(const CURL& url)
+bool CSpecialProtocolFile::Exists(const CURL& url)
{
CStdString strFileName=CSpecialProtocol::TranslatePath(url);
return m_file.Exists(strFileName);
}
-int CFileSpecialProtocol::Stat(const CURL& url, struct __stat64* buffer)
+int CSpecialProtocolFile::Stat(const CURL& url, struct __stat64* buffer)
{
CStdString strFileName=CSpecialProtocol::TranslatePath(url);
return m_file.Stat(strFileName, buffer);
}
-bool CFileSpecialProtocol::Rename(const CURL& url, const CURL& urlnew)
+bool CSpecialProtocolFile::Rename(const CURL& url, const CURL& urlnew)
{
CStdString strFileName=CSpecialProtocol::TranslatePath(url);
CStdString strFileName2=CSpecialProtocol::TranslatePath(urlnew);
@@ -79,37 +79,37 @@ bool CFileSpecialProtocol::Rename(const CURL& url, const CURL& urlnew)
return m_file.Rename(strFileName,strFileName2);
}
-int CFileSpecialProtocol::Stat(struct __stat64* buffer)
+int CSpecialProtocolFile::Stat(struct __stat64* buffer)
{
return m_file.Stat(buffer);
}
-unsigned int CFileSpecialProtocol::Read(void* lpBuf, int64_t uiBufSize)
+unsigned int CSpecialProtocolFile::Read(void* lpBuf, int64_t uiBufSize)
{
return m_file.Read(lpBuf, uiBufSize);
}
-int CFileSpecialProtocol::Write(const void* lpBuf, int64_t uiBufSize)
+int CSpecialProtocolFile::Write(const void* lpBuf, int64_t uiBufSize)
{
return m_file.Write(lpBuf,uiBufSize);
}
-int64_t CFileSpecialProtocol::Seek(int64_t iFilePosition, int iWhence /*=SEEK_SET*/)
+int64_t CSpecialProtocolFile::Seek(int64_t iFilePosition, int iWhence /*=SEEK_SET*/)
{
return m_file.Seek(iFilePosition, iWhence);
}
-void CFileSpecialProtocol::Close()
+void CSpecialProtocolFile::Close()
{
m_file.Close();
}
-int64_t CFileSpecialProtocol::GetPosition()
+int64_t CSpecialProtocolFile::GetPosition()
{
return m_file.GetPosition();
}
-int64_t CFileSpecialProtocol::GetLength()
+int64_t CSpecialProtocolFile::GetLength()
{
return m_file.GetLength();
}
diff --git a/xbmc/filesystem/FileSpecialProtocol.h b/xbmc/filesystem/SpecialProtocolFile.h
index d9ccc48732..d9e05de64f 100644
--- a/xbmc/filesystem/FileSpecialProtocol.h
+++ b/xbmc/filesystem/SpecialProtocolFile.h
@@ -24,11 +24,11 @@
namespace XFILE
{
-class CFileSpecialProtocol : public IFile
+class CSpecialProtocolFile : public IFile
{
public:
- CFileSpecialProtocol(void);
- virtual ~CFileSpecialProtocol(void);
+ CSpecialProtocolFile(void);
+ virtual ~CSpecialProtocolFile(void);
virtual bool Open(const CURL& url);
virtual bool Exists(const CURL& url);
virtual int Stat(const CURL& url, struct __stat64* buffer);
diff --git a/xbmc/filesystem/DirectoryTuxBox.cpp b/xbmc/filesystem/TuxBoxDirectory.cpp
index 70d43927fb..aa12226397 100644
--- a/xbmc/filesystem/DirectoryTuxBox.cpp
+++ b/xbmc/filesystem/TuxBoxDirectory.cpp
@@ -20,9 +20,9 @@
*/
-#include "DirectoryTuxBox.h"
-#include "DirectoryCache.h"
-#include "FileCurl.h"
+#include "TuxBoxDirectory.h"
+#include "CacheDirectory.h"
+#include "CurlFile.h"
#include "utils/HttpHeader.h"
#include "utils/TuxBoxUtil.h"
#include "URL.h"
@@ -34,15 +34,15 @@
using namespace XFILE;
-CDirectoryTuxBox::CDirectoryTuxBox(void)
+CTuxBoxDirectory::CTuxBoxDirectory(void)
{
}
-CDirectoryTuxBox::~CDirectoryTuxBox(void)
+CTuxBoxDirectory::~CTuxBoxDirectory(void)
{
}
-bool CDirectoryTuxBox::GetDirectory(const CStdString& strPath, CFileItemList &items)
+bool CTuxBoxDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items)
{
// so we know that we have enigma2
static bool enigma2 = false;
@@ -98,7 +98,7 @@ bool CDirectoryTuxBox::GetDirectory(const CStdString& strPath, CFileItemList &it
bIsBouquet = true;
}
//Open
- CFileCurl http;
+ CCurlFile http;
int iTryConnect = 0;
int iWaitTimer = 20;
bool result = false;
@@ -189,7 +189,7 @@ bool CDirectoryTuxBox::GetDirectory(const CStdString& strPath, CFileItemList &it
return result;
}
-void CDirectoryTuxBox::GetRootAndChildStringEnigma2(CStdString& strBQRequest, CStdString& strXMLRootString, CStdString& strXMLChildString )
+void CTuxBoxDirectory::GetRootAndChildStringEnigma2(CStdString& strBQRequest, CStdString& strXMLRootString, CStdString& strXMLChildString )
{
// Allways take getallservices for Enigma2
strBQRequest = "web/getallservices"; //Bouquets and Channels
@@ -197,7 +197,7 @@ void CDirectoryTuxBox::GetRootAndChildStringEnigma2(CStdString& strBQRequest, CS
strXMLChildString.Format("e2bouquet");
}
-bool CDirectoryTuxBox::GetRootAndChildString(const CStdString strPath, CStdString& strBQRequest, CStdString& strXMLRootString, CStdString& strXMLChildString )
+bool CTuxBoxDirectory::GetRootAndChildString(const CStdString strPath, CStdString& strBQRequest, CStdString& strXMLRootString, CStdString& strXMLChildString )
{
//Advanced Settings: RootMode! Movies:
if(g_advancedSettings.m_iTuxBoxDefaultRootMenu == 3) //Movies! Fixed-> mode=3&submode=4
diff --git a/xbmc/filesystem/DirectoryTuxBox.h b/xbmc/filesystem/TuxBoxDirectory.h
index eb3f92b714..eebb8c9a51 100644
--- a/xbmc/filesystem/DirectoryTuxBox.h
+++ b/xbmc/filesystem/TuxBoxDirectory.h
@@ -27,11 +27,11 @@ class TiXmlElement;
namespace XFILE
{
- class CDirectoryTuxBox : public IDirectory
+ class CTuxBoxDirectory : public IDirectory
{
public:
- CDirectoryTuxBox(void);
- virtual ~CDirectoryTuxBox(void);
+ CTuxBoxDirectory(void);
+ virtual ~CTuxBoxDirectory(void);
virtual bool GetDirectory(const CStdString& strPath, CFileItemList &items);
virtual bool IsAllowed(const CStdString &strFile) const { return true; };
virtual DIR_CACHE_TYPE GetCacheType(const CStdString& strPath) const { return DIR_CACHE_ALWAYS; };
diff --git a/xbmc/filesystem/FileTuxBox.cpp b/xbmc/filesystem/TuxBoxFile.cpp
index e6257ebf29..877df91c11 100644
--- a/xbmc/filesystem/FileTuxBox.cpp
+++ b/xbmc/filesystem/TuxBoxFile.cpp
@@ -19,55 +19,55 @@
*
*/
-#include "FileTuxBox.h"
+#include "TuxBoxFile.h"
#include <errno.h>
//Reserved for TuxBox Recording!
using namespace XFILE;
-CFileTuxBox::CFileTuxBox()
+CTuxBoxFile::CTuxBoxFile()
{}
-CFileTuxBox::~CFileTuxBox()
+CTuxBoxFile::~CTuxBoxFile()
{
}
-int64_t CFileTuxBox::GetPosition()
+int64_t CTuxBoxFile::GetPosition()
{
return 0;
}
-int64_t CFileTuxBox::GetLength()
+int64_t CTuxBoxFile::GetLength()
{
return 0;
}
-bool CFileTuxBox::Open(const CURL& url)
+bool CTuxBoxFile::Open(const CURL& url)
{
return true;
}
-unsigned int CFileTuxBox::Read(void* lpBuf, int64_t uiBufSize)
+unsigned int CTuxBoxFile::Read(void* lpBuf, int64_t uiBufSize)
{
return 0;
}
-int64_t CFileTuxBox::Seek(int64_t iFilePosition, int iWhence)
+int64_t CTuxBoxFile::Seek(int64_t iFilePosition, int iWhence)
{
return 0;
}
-void CFileTuxBox::Close()
+void CTuxBoxFile::Close()
{
}
-bool CFileTuxBox::Exists(const CURL& url)
+bool CTuxBoxFile::Exists(const CURL& url)
{
return true;
}
-int CFileTuxBox::Stat(const CURL& url, struct __stat64* buffer)
+int CTuxBoxFile::Stat(const CURL& url, struct __stat64* buffer)
{
errno = ENOENT;
return -1;
diff --git a/xbmc/filesystem/FileTuxBox.h b/xbmc/filesystem/TuxBoxFile.h
index be6ff5db35..9e0aa3ab3e 100644
--- a/xbmc/filesystem/FileTuxBox.h
+++ b/xbmc/filesystem/TuxBoxFile.h
@@ -24,11 +24,11 @@
namespace XFILE
{
- class CFileTuxBox : public IFile
+ class CTuxBoxFile : public IFile
{
public:
- CFileTuxBox();
- virtual ~CFileTuxBox();
+ CTuxBoxFile();
+ virtual ~CTuxBoxFile();
virtual int64_t GetPosition();
virtual int64_t GetLength();
virtual bool Open(const CURL& url);
diff --git a/xbmc/filesystem/FileUDF.cpp b/xbmc/filesystem/UDFFile.cpp
index 112d5ab452..863ac373b0 100644
--- a/xbmc/filesystem/FileUDF.cpp
+++ b/xbmc/filesystem/UDFFile.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "FileUDF.h"
+#include "UDFFile.h"
#include "URL.h"
#include "Util.h"
@@ -33,13 +33,13 @@ using namespace XFILE;
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
//*********************************************************************************************
-CFileUDF::CFileUDF()
+CUDFFile::CUDFFile()
{
m_bOpened = false;
}
//*********************************************************************************************
-CFileUDF::~CFileUDF()
+CUDFFile::~CUDFFile()
{
if (m_bOpened)
{
@@ -47,7 +47,7 @@ CFileUDF::~CFileUDF()
}
}
//*********************************************************************************************
-bool CFileUDF::Open(const CURL& url)
+bool CUDFFile::Open(const CURL& url)
{
CStdString strFName = url.GetHostName();
@@ -65,7 +65,7 @@ bool CFileUDF::Open(const CURL& url)
}
//*********************************************************************************************
-unsigned int CFileUDF::Read(void *lpBuf, int64_t uiBufSize)
+unsigned int CUDFFile::Read(void *lpBuf, int64_t uiBufSize)
{
if (!m_bOpened) return 0;
char *pData = (char *)lpBuf;
@@ -77,14 +77,14 @@ unsigned int CFileUDF::Read(void *lpBuf, int64_t uiBufSize)
}
//*********************************************************************************************
-void CFileUDF::Close()
+void CUDFFile::Close()
{
if (!m_bOpened) return ;
m_udfIsoReaderLocal.CloseFile( m_hFile);
}
//*********************************************************************************************
-int64_t CFileUDF::Seek(int64_t iFilePosition, int iWhence)
+int64_t CUDFFile::Seek(int64_t iFilePosition, int iWhence)
{
if (!m_bOpened) return -1;
int64_t lNewPos = m_udfIsoReaderLocal.Seek(m_hFile, iFilePosition, iWhence);
@@ -92,20 +92,20 @@ int64_t CFileUDF::Seek(int64_t iFilePosition, int iWhence)
}
//*********************************************************************************************
-int64_t CFileUDF::GetLength()
+int64_t CUDFFile::GetLength()
{
if (!m_bOpened) return -1;
return m_udfIsoReaderLocal.GetFileSize(m_hFile);
}
//*********************************************************************************************
-int64_t CFileUDF::GetPosition()
+int64_t CUDFFile::GetPosition()
{
if (!m_bOpened) return -1;
return m_udfIsoReaderLocal.GetFilePosition(m_hFile);
}
-bool CFileUDF::Exists(const CURL& url)
+bool CUDFFile::Exists(const CURL& url)
{
string strFName = "\\";
strFName += url.GetFileName();
@@ -121,7 +121,7 @@ bool CFileUDF::Exists(const CURL& url)
return true;
}
-int CFileUDF::Stat(const CURL& url, struct __stat64* buffer)
+int CUDFFile::Stat(const CURL& url, struct __stat64* buffer)
{
string strFName = "\\";
strFName += url.GetFileName();
diff --git a/xbmc/filesystem/FileUDF.h b/xbmc/filesystem/UDFFile.h
index fb46b47cd0..a8deba115b 100644
--- a/xbmc/filesystem/FileUDF.h
+++ b/xbmc/filesystem/UDFFile.h
@@ -28,11 +28,11 @@
namespace XFILE
{
-class CFileUDF : public IFile
+class CUDFFile : public IFile
{
public:
- CFileUDF();
- virtual ~CFileUDF();
+ CUDFFile();
+ virtual ~CUDFFile();
virtual int64_t GetPosition();
virtual int64_t GetLength();
virtual bool Open(const CURL& url);
diff --git a/xbmc/filesystem/FileUPnP.cpp b/xbmc/filesystem/UPnPFile.cpp
index 665e096d5a..3d7db4bc55 100644
--- a/xbmc/filesystem/FileUPnP.cpp
+++ b/xbmc/filesystem/UPnPFile.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "FileUPnP.h"
+#include "UPnPFile.h"
#include "UPnPDirectory.h"
#include "FileFactory.h"
#include "FileItem.h"
@@ -27,15 +27,15 @@
using namespace XFILE;
-CFileUPnP::CFileUPnP()
+CUPnPFile::CUPnPFile()
{
}
-CFileUPnP::~CFileUPnP()
+CUPnPFile::~CUPnPFile()
{
}
-bool CFileUPnP::Open(const CURL& url)
+bool CUPnPFile::Open(const CURL& url)
{
CFileItem item_new;
if (CUPnPDirectory::GetResource(url.Get(), item_new))
@@ -52,7 +52,7 @@ bool CFileUPnP::Open(const CURL& url)
return false;
}
-int CFileUPnP::Stat(const CURL& url, struct __stat64* buffer)
+int CUPnPFile::Stat(const CURL& url, struct __stat64* buffer)
{
CFileItem item_new;
if (CUPnPDirectory::GetResource(url.Get(), item_new))
@@ -69,7 +69,7 @@ int CFileUPnP::Stat(const CURL& url, struct __stat64* buffer)
return -1;
}
-bool CFileUPnP::Exists(const CURL& url)
+bool CUPnPFile::Exists(const CURL& url)
{
CFileItem item_new;
if (CUPnPDirectory::GetResource(url.Get(), item_new))
diff --git a/xbmc/filesystem/FileUPnP.h b/xbmc/filesystem/UPnPFile.h
index 3d313640f3..e98e091fff 100644
--- a/xbmc/filesystem/FileUPnP.h
+++ b/xbmc/filesystem/UPnPFile.h
@@ -24,11 +24,11 @@
namespace XFILE
{
- class CFileUPnP : public IFile
+ class CUPnPFile : public IFile
{
public:
- CFileUPnP();
- virtual ~CFileUPnP();
+ CUPnPFile();
+ virtual ~CUPnPFile();
virtual bool Open(const CURL& url);
virtual bool Exists(const CURL& url);
virtual int Stat(const CURL& url, struct __stat64* buffer);
diff --git a/xbmc/filesystem/VirtualDirectory.cpp b/xbmc/filesystem/VirtualDirectory.cpp
index 3e3a49c97e..0f3969a7db 100644
--- a/xbmc/filesystem/VirtualDirectory.cpp
+++ b/xbmc/filesystem/VirtualDirectory.cpp
@@ -22,11 +22,11 @@
#include "system.h"
#include "VirtualDirectory.h"
-#include "FactoryDirectory.h"
+#include "DirectoryFactory.h"
#include "Util.h"
#include "utils/URIUtils.h"
#include "Directory.h"
-#include "DirectoryCache.h"
+#include "CacheDirectory.h"
#include "SourcesDirectory.h"
#include "storage/MediaManager.h"
#include "File.h"
diff --git a/xbmc/filesystem/FileZip.cpp b/xbmc/filesystem/ZipFile.cpp
index c59a3b164e..25ef89d66b 100644
--- a/xbmc/filesystem/FileZip.cpp
+++ b/xbmc/filesystem/ZipFile.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "FileZip.h"
+#include "ZipFile.h"
#include "URL.h"
#include "utils/URIUtils.h"
@@ -30,7 +30,7 @@
using namespace XFILE;
using namespace std;
-CFileZip::CFileZip()
+CZipFile::CZipFile()
{
m_szStringBuffer = NULL;
m_szStartOfStringBuffer = NULL;
@@ -39,13 +39,13 @@ CFileZip::CFileZip()
m_iRead = -1;
}
-CFileZip::~CFileZip()
+CZipFile::~CZipFile()
{
delete[] m_szStringBuffer;
Close();
}
-bool CFileZip::Open(const CURL&url)
+bool CZipFile::Open(const CURL&url)
{
CStdString strOpts = url.GetOptions();
CURL url2(url);
@@ -87,7 +87,7 @@ bool CFileZip::Open(const CURL&url)
return InitDecompress();
}
-bool CFileZip::InitDecompress()
+bool CZipFile::InitDecompress()
{
m_iRead = 1;
m_iFilePos = 0;
@@ -112,12 +112,12 @@ bool CFileZip::InitDecompress()
return true;
}
-int64_t CFileZip::GetLength()
+int64_t CZipFile::GetLength()
{
return mZipItem.usize;
}
-int64_t CFileZip::GetPosition()
+int64_t CZipFile::GetPosition()
{
if (m_bCached)
return mFile.GetPosition();
@@ -125,7 +125,7 @@ int64_t CFileZip::GetPosition()
return m_iFilePos;
}
-int64_t CFileZip::Seek(int64_t iFilePosition, int iWhence)
+int64_t CZipFile::Seek(int64_t iFilePosition, int iWhence)
{
if (m_bCached)
return mFile.Seek(iFilePosition,iWhence);
@@ -236,7 +236,7 @@ int64_t CFileZip::Seek(int64_t iFilePosition, int iWhence)
return -1;
}
-bool CFileZip::Exists(const CURL& url)
+bool CZipFile::Exists(const CURL& url)
{
SZipEntry item;
if (g_ZipManager.GetZipEntry(url.Get(),item))
@@ -244,7 +244,7 @@ bool CFileZip::Exists(const CURL& url)
return false;
}
-int CFileZip::Stat(struct __stat64 *buffer)
+int CZipFile::Stat(struct __stat64 *buffer)
{
int ret;
struct tm tm = {};
@@ -264,7 +264,7 @@ int CFileZip::Stat(struct __stat64 *buffer)
return ret;
}
-int CFileZip::Stat(const CURL& url, struct __stat64* buffer)
+int CZipFile::Stat(const CURL& url, struct __stat64* buffer)
{
if (!g_ZipManager.GetZipEntry(url.Get(),mZipItem))
return -1;
@@ -276,7 +276,7 @@ int CFileZip::Stat(const CURL& url, struct __stat64* buffer)
return 0;
}
-unsigned int CFileZip::Read(void* lpBuf, int64_t uiBufSize)
+unsigned int CZipFile::Read(void* lpBuf, int64_t uiBufSize)
{
if (m_bCached)
return mFile.Read(lpBuf,uiBufSize);
@@ -348,7 +348,7 @@ unsigned int CFileZip::Read(void* lpBuf, int64_t uiBufSize)
return false; // shouldn't happen. compression method checked in open
}
-void CFileZip::Close()
+void CZipFile::Close()
{
if (mZipItem.method == 8 && !m_bCached && m_iRead != -1)
inflateEnd(&m_ZStream);
@@ -356,7 +356,7 @@ void CFileZip::Close()
mFile.Close();
}
/* CHANGED: JM - moved to CFile
-bool CFileZip::ReadString(char* szLine, int iLineLength)
+bool CZipFile::ReadString(char* szLine, int iLineLength)
{
if (!m_szStringBuffer)
{
@@ -426,7 +426,7 @@ bool CFileZip::ReadString(char* szLine, int iLineLength)
return !bEof;
}*/
-bool CFileZip::FillBuffer()
+bool CZipFile::FillBuffer()
{
unsigned int sToRead = 65535;
if (m_iZipFilePos+65535 > mZipItem.csize)
@@ -443,7 +443,7 @@ bool CFileZip::FillBuffer()
return true;
}
-void CFileZip::DestroyBuffer(void* lpBuffer, int iBufSize)
+void CZipFile::DestroyBuffer(void* lpBuffer, int iBufSize)
{
if (!m_bFlush)
return;
@@ -457,7 +457,7 @@ void CFileZip::DestroyBuffer(void* lpBuffer, int iBufSize)
m_bFlush = false;
}
-int CFileZip::UnpackFromMemory(string& strDest, const string& strInput, bool isGZ)
+int CZipFile::UnpackFromMemory(string& strDest, const string& strInput, bool isGZ)
{
unsigned int iPos=0;
int iResult=0;
diff --git a/xbmc/filesystem/FileZip.h b/xbmc/filesystem/ZipFile.h
index 30c4abf1ce..f4fb1ee22a 100644
--- a/xbmc/filesystem/FileZip.h
+++ b/xbmc/filesystem/ZipFile.h
@@ -30,11 +30,11 @@
namespace XFILE
{
- class CFileZip : public IFile
+ class CZipFile : public IFile
{
public:
- CFileZip();
- virtual ~CFileZip();
+ CZipFile();
+ virtual ~CZipFile();
virtual int64_t GetPosition();
virtual int64_t GetLength();
diff --git a/xbmc/interfaces/http-api/XBMChttp.cpp b/xbmc/interfaces/http-api/XBMChttp.cpp
index 28a84a6361..5944c22b89 100644
--- a/xbmc/interfaces/http-api/XBMChttp.cpp
+++ b/xbmc/interfaces/http-api/XBMChttp.cpp
@@ -44,7 +44,7 @@
#include "settings/Settings.h"
#include "settings/AdvancedSettings.h"
#include "settings/GUISettings.h"
-#include "filesystem/FactoryDirectory.h"
+#include "filesystem/DirectoryFactory.h"
#include "guilib/LocalizeStrings.h"
#include "utils/StringUtils.h"
#include "utils/TimeUtils.h"
diff --git a/xbmc/music/LastFmManager.cpp b/xbmc/music/LastFmManager.cpp
index 700f28a236..6df634b0d1 100644
--- a/xbmc/music/LastFmManager.cpp
+++ b/xbmc/music/LastFmManager.cpp
@@ -29,7 +29,7 @@
#include "pictures/Picture.h"
#include "utils/md5.h"
#include "filesystem/File.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
#include "GUIInfoManager.h"
#include "MusicDatabase.h"
#include "music/tags/MusicInfoTag.h"
diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp
index 7cf81562ca..992ffa1cea 100644
--- a/xbmc/music/MusicDatabase.cpp
+++ b/xbmc/music/MusicDatabase.cpp
@@ -23,7 +23,7 @@
#include "system.h"
#include "MusicDatabase.h"
#include "network/cddb.h"
-#include "filesystem/DirectoryCache.h"
+#include "filesystem/CacheDirectory.h"
#include "filesystem/MusicDatabaseDirectory/DirectoryNode.h"
#include "filesystem/MusicDatabaseDirectory/QueryParams.h"
#include "filesystem/MusicDatabaseDirectory.h"
diff --git a/xbmc/music/MusicInfoLoader.cpp b/xbmc/music/MusicInfoLoader.cpp
index d8b205f7f8..02e3eaf2f4 100644
--- a/xbmc/music/MusicInfoLoader.cpp
+++ b/xbmc/music/MusicInfoLoader.cpp
@@ -22,7 +22,7 @@
#include "MusicInfoLoader.h"
#include "MusicDatabase.h"
#include "music/tags/MusicInfoTagLoaderFactory.h"
-#include "filesystem/DirectoryCache.h"
+#include "filesystem/CacheDirectory.h"
#include "filesystem/MusicDatabaseDirectory.h"
#include "filesystem/MusicDatabaseDirectory/DirectoryNode.h"
#include "filesystem/MusicDatabaseDirectory/QueryParams.h"
diff --git a/xbmc/music/dialogs/GUIDialogSongInfo.cpp b/xbmc/music/dialogs/GUIDialogSongInfo.cpp
index 5dfe4ab31c..26333c937e 100644
--- a/xbmc/music/dialogs/GUIDialogSongInfo.cpp
+++ b/xbmc/music/dialogs/GUIDialogSongInfo.cpp
@@ -31,7 +31,7 @@
#include "music/tags/MusicInfoTag.h"
#include "guilib/GUIWindowManager.h"
#include "filesystem/File.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
#include "FileItem.h"
#include "settings/Settings.h"
#include "settings/AdvancedSettings.h"
diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp
index 3400f277d7..8a78ee79a2 100644
--- a/xbmc/music/infoscanner/MusicInfoScanner.cpp
+++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp
@@ -24,7 +24,7 @@
#include "music/tags/MusicInfoTagLoaderFactory.h"
#include "MusicAlbumInfo.h"
#include "MusicInfoScraper.h"
-#include "filesystem/DirectoryCache.h"
+#include "filesystem/CacheDirectory.h"
#include "filesystem/MusicDatabaseDirectory.h"
#include "filesystem/MusicDatabaseDirectory/DirectoryNode.h"
#include "Util.h"
diff --git a/xbmc/music/infoscanner/MusicInfoScraper.h b/xbmc/music/infoscanner/MusicInfoScraper.h
index ed34d53e87..191550ba57 100644
--- a/xbmc/music/infoscanner/MusicInfoScraper.h
+++ b/xbmc/music/infoscanner/MusicInfoScraper.h
@@ -25,7 +25,7 @@
#include "MusicArtistInfo.h"
#include "addons/Scraper.h"
#include "threads/Thread.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
namespace MUSIC_GRABBER
{
diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp
index ee5d71e850..9af41f1e26 100644
--- a/xbmc/music/windows/GUIWindowMusicBase.cpp
+++ b/xbmc/music/windows/GUIWindowMusicBase.cpp
@@ -33,7 +33,7 @@
#include "playlists/PlayListM3U.h"
#include "Application.h"
#include "PlayListPlayer.h"
-#include "filesystem/DirectoryCache.h"
+#include "filesystem/CacheDirectory.h"
#ifdef HAS_CDDA_RIPPER
#include "cdrip/CDDARipper.h"
#endif
diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp
index f092bb41f2..06808d8f0c 100644
--- a/xbmc/network/AirTunesServer.cpp
+++ b/xbmc/network/AirTunesServer.cpp
@@ -31,7 +31,7 @@
#include "utils/StdString.h"
#include "network/Zeroconf.h"
#include "ApplicationMessenger.h"
-#include "filesystem/FilePipe.h"
+#include "filesystem/PipeFile.h"
#include "Application.h"
#include "cores/paplayer/BXAcodec.h"
#include "music/tags/MusicInfoTag.h"
diff --git a/xbmc/network/AirTunesServer.h b/xbmc/network/AirTunesServer.h
index 08d1d59977..da893df6fb 100644
--- a/xbmc/network/AirTunesServer.h
+++ b/xbmc/network/AirTunesServer.h
@@ -37,7 +37,7 @@
#include "threads/CriticalSection.h"
#include "utils/HttpParser.h"
#include "utils/StdString.h"
-#include "filesystem/FilePipe.h"
+#include "filesystem/PipeFile.h"
class DllLibShairport;
diff --git a/xbmc/network/libscrobbler/scrobbler.cpp b/xbmc/network/libscrobbler/scrobbler.cpp
index cb08d1bb0f..391a825b79 100644
--- a/xbmc/network/libscrobbler/scrobbler.cpp
+++ b/xbmc/network/libscrobbler/scrobbler.cpp
@@ -33,7 +33,7 @@
#include "threads/SingleLock.h"
#include "guilib/LocalizeStrings.h"
#include "filesystem/File.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
#define SCROBBLER_CLIENT "xbm"
//#define SCROBBLER_CLIENT "tst" // For testing ONLY!
diff --git a/xbmc/pictures/Picture.cpp b/xbmc/pictures/Picture.cpp
index 54212d81dc..8b1e742d1a 100644
--- a/xbmc/pictures/Picture.cpp
+++ b/xbmc/pictures/Picture.cpp
@@ -24,7 +24,7 @@
#include "settings/GUISettings.h"
#include "FileItem.h"
#include "filesystem/File.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
#include "DllImageLib.h"
#include "utils/log.h"
#include "utils/URIUtils.h"
diff --git a/xbmc/utils/DownloadQueue.cpp b/xbmc/utils/DownloadQueue.cpp
index 4101090d17..596699df3e 100644
--- a/xbmc/utils/DownloadQueue.cpp
+++ b/xbmc/utils/DownloadQueue.cpp
@@ -24,7 +24,7 @@
#include "log.h"
#include "filesystem/File.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
#include "threads/SingleLock.h"
using namespace std;
diff --git a/xbmc/utils/Fanart.cpp b/xbmc/utils/Fanart.cpp
index 578aee9878..0946f01986 100644
--- a/xbmc/utils/Fanart.cpp
+++ b/xbmc/utils/Fanart.cpp
@@ -23,7 +23,7 @@
#include "tinyXML/tinyxml.h"
#include "URIUtils.h"
#include "pictures/Picture.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
#include "StringUtils.h"
#include "filesystem/File.h"
diff --git a/xbmc/utils/FileOperationJob.cpp b/xbmc/utils/FileOperationJob.cpp
index c8ff41762f..5990c4d03e 100644
--- a/xbmc/utils/FileOperationJob.cpp
+++ b/xbmc/utils/FileOperationJob.cpp
@@ -23,7 +23,7 @@
#include "filesystem/File.h"
#include "filesystem/Directory.h"
#include "filesystem/ZipManager.h"
-#include "filesystem/FactoryFileDirectory.h"
+#include "filesystem/FileDirectoryFactory.h"
#include "filesystem/MultiPathDirectory.h"
#include "filesystem/SpecialProtocol.h"
#include "log.h"
diff --git a/xbmc/utils/RssReader.cpp b/xbmc/utils/RssReader.cpp
index 18fcdb4d8d..08a3678f7d 100644
--- a/xbmc/utils/RssReader.cpp
+++ b/xbmc/utils/RssReader.cpp
@@ -26,7 +26,7 @@
#include "CharsetConverter.h"
#include "URL.h"
#include "filesystem/File.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
#ifdef __APPLE__
#include "CocoaInterface.h"
#endif
diff --git a/xbmc/utils/ScraperUrl.cpp b/xbmc/utils/ScraperUrl.cpp
index 04e09b6d60..5d37a09129 100644
--- a/xbmc/utils/ScraperUrl.cpp
+++ b/xbmc/utils/ScraperUrl.cpp
@@ -25,8 +25,8 @@
#include "HTMLUtil.h"
#include "CharsetConverter.h"
#include "URL.h"
-#include "filesystem/FileCurl.h"
-#include "filesystem/FileZip.h"
+#include "filesystem/CurlFile.h"
+#include "filesystem/ZipFile.h"
#include "pictures/Picture.h"
#include "URIUtils.h"
diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index f4aacd1611..2dfa8ed3eb 100644
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -28,7 +28,7 @@
#include <sys/utsname.h>
#endif
#include "GUIInfoManager.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
#include "network/Network.h"
#include "Application.h"
#include "windowing/WindowingFactory.h"
diff --git a/xbmc/utils/TuxBoxUtil.cpp b/xbmc/utils/TuxBoxUtil.cpp
index c15b634694..2ef507ea8f 100644
--- a/xbmc/utils/TuxBoxUtil.cpp
+++ b/xbmc/utils/TuxBoxUtil.cpp
@@ -25,7 +25,7 @@
#include "TuxBoxUtil.h"
#include "URIUtils.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
#include "dialogs/GUIDialogContextMenu.h"
#include "Application.h"
#include "GUIInfoManager.h"
diff --git a/xbmc/video/VideoInfoDownloader.h b/xbmc/video/VideoInfoDownloader.h
index b91477d0b0..498a88fcd8 100644
--- a/xbmc/video/VideoInfoDownloader.h
+++ b/xbmc/video/VideoInfoDownloader.h
@@ -26,7 +26,7 @@
#include "addons/Scraper.h"
#include "Episode.h"
#include "XBDateTime.h"
-#include "filesystem/FileCurl.h"
+#include "filesystem/CurlFile.h"
// forward declarations
class TiXmlDocument;
diff --git a/xbmc/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp
index 6c9320a685..78b222dd46 100644
--- a/xbmc/video/VideoInfoScanner.cpp
+++ b/xbmc/video/VideoInfoScanner.cpp
@@ -23,7 +23,7 @@
#include "FileItem.h"
#include "VideoInfoScanner.h"
#include "addons/AddonManager.h"
-#include "filesystem/DirectoryCache.h"
+#include "filesystem/CacheDirectory.h"
#include "Util.h"
#include "NfoFile.h"
#include "utils/RegExp.h"
diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
index 0af074850c..072a2d327b 100644
--- a/xbmc/windows/GUIMediaWindow.cpp
+++ b/xbmc/windows/GUIMediaWindow.cpp
@@ -53,7 +53,7 @@
#include "utils/URIUtils.h"
#include "guilib/LocalizeStrings.h"
#include "utils/TimeUtils.h"
-#include "filesystem/FactoryFileDirectory.h"
+#include "filesystem/FileDirectoryFactory.h"
#include "utils/log.h"
#include "utils/FileUtils.h"
#include "guilib/GUIEditControl.h"