Merge pull request #980 from rohit-n/remove-dead-code

Remove dead code.
dolphin-emu · Sep 5, 2014 · 674494e · 674494e
2 parents 0576046 + cf8d1c9
commit 674494e
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 323 deletions.
diff --git a/Source/Core/DiscIO/BannerLoaderWii.cpp b/Source/Core/DiscIO/BannerLoaderWii.cpp
@@ -31,42 +31,8 @@ CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume)
 
 	if (!File::Exists(Filename))
 	{
-		// TODO(XK): Finish the 'commented' code. Turns out the banner.bin
-		//           from the savefiles is very different from the banner.bin
-		//           inside opening.bnr
-#if 0
-		// Creating title folder
-		std::string titleFolder = StringFromFormat("%stitle/%08x/%08x/data/",
-			File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(TitleID>>32), (u32)TitleID);
-		if (!File::Exists(titleFolder))
-			File::CreateFullPath(titleFolder);
-
-		// Extracting banner.bin from opening.bnr
-		std::string bnrFilename = StringFromFormat("%stitle/%08x/%08x/data/opening.bnr",
-			File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(TitleID>>32), (u32)TitleID);
-
-		if (!_rFileSystem.ExportFile("opening.bnr", bnrFilename))
-		{
-			m_IsValid = false;
-			return;
-		}
-
-		CARCFile bnrArc (bnrFilename, 0x600);
-
-		if (!bnrArc.ExportFile("meta/banner.bin", Filename))
-		{
-			m_IsValid = false;
-			return;
-		}
-
-		// Now we have an LZ77-compressed file with a short IMD5 header
-		// TODO: Finish the job
-
-		File::Delete(bnrFilename);
-#else
 		m_IsValid = false;
 		return;
-#endif
 	}
 
 	// load the banner.bin

diff --git a/Source/Core/DiscIO/CMakeLists.txt b/Source/Core/DiscIO/CMakeLists.txt
@@ -8,7 +8,6 @@ set(SRCS	BannerLoader.cpp
 			DiscScrubber.cpp
 			DriveBlob.cpp
 			FileBlob.cpp
-			FileHandlerARC.cpp
 			FileMonitor.cpp
 			FileSystemGCWii.cpp
 			Filesystem.cpp

diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj
@@ -44,7 +44,6 @@
     <ClCompile Include="DiscScrubber.cpp" />
     <ClCompile Include="DriveBlob.cpp" />
     <ClCompile Include="FileBlob.cpp" />
-    <ClCompile Include="FileHandlerARC.cpp" />
     <ClCompile Include="FileMonitor.cpp" />
     <ClCompile Include="Filesystem.cpp" />
     <ClCompile Include="FileSystemGCWii.cpp" />
@@ -68,7 +67,6 @@
     <ClInclude Include="DiscScrubber.h" />
     <ClInclude Include="DriveBlob.h" />
     <ClInclude Include="FileBlob.h" />
-    <ClInclude Include="FileHandlerARC.h" />
     <ClInclude Include="FileMonitor.h" />
     <ClInclude Include="Filesystem.h" />
     <ClInclude Include="FileSystemGCWii.h" />

diff --git a/Source/Core/DiscIO/DiscIO.vcxproj.filters b/Source/Core/DiscIO/DiscIO.vcxproj.filters
@@ -33,9 +33,6 @@
     <ClCompile Include="BannerLoaderWii.cpp">
       <Filter>FileHandler</Filter>
     </ClCompile>
-    <ClCompile Include="FileHandlerARC.cpp">
-      <Filter>FileHandler</Filter>
-    </ClCompile>
     <ClCompile Include="Filesystem.cpp">
       <Filter>FileSystem</Filter>
     </ClCompile>
@@ -101,9 +98,6 @@
     <ClInclude Include="BannerLoaderGC.h">
       <Filter>FileHandler</Filter>
     </ClInclude>
-    <ClInclude Include="FileHandlerARC.h">
-      <Filter>FileHandler</Filter>
-    </ClInclude>
     <ClInclude Include="Filesystem.h">
       <Filter>FileSystem</Filter>
     </ClInclude>

diff --git a/Source/Core/DiscIO/FileHandlerARC.cpp b/Source/Core/DiscIO/FileHandlerARC.cpp
diff --git a/Source/Core/DiscIO/FileHandlerARC.h b/Source/Core/DiscIO/FileHandlerARC.h