Remove PMSLoader.

The BPMSLoader now handles PMS files considering their
similarities.

src/Makefile.am

@@ -160,7 +160,7 @@ NoteData.cpp NoteData.h NoteDataUtil.cpp NoteDataUtil.h NoteDataWithScoring.cpp
 NoteTypes.cpp NoteTypes.h NotesLoader.cpp NotesLoader.h \
 NotesLoaderBMS.cpp NotesLoaderBMS.h NotesLoaderDWI.cpp NotesLoaderDWI.h \
 NotesLoaderJson.cpp NotesLoaderJson.h NotesLoaderKSF.cpp NotesLoaderKSF.h \
-NotesLoaderPMS.cpp NotesLoaderPMS.h NotesLoaderSM.cpp NotesLoaderSM.h \
+NotesLoaderSM.cpp NotesLoaderSM.h \
 NotesLoaderSSC.cpp NotesLoaderSSC.h NotesLoaderSMA.cpp NotesLoaderSMA.h \
 NotesWriterDWI.cpp NotesWriterDWI.h \
 NotesWriterJson.cpp NotesWriterJson.h \

src/NotesLoader.cpp

@@ -5,7 +5,6 @@
 #include "NotesLoaderSSC.h"
 #include "NotesLoaderDWI.h"
 #include "NotesLoaderBMS.h"
-#include "NotesLoaderPMS.h"
 #include "NotesLoaderKSF.h"
 #include "RageUtil.h"
 

src/NotesLoaderPMS.h

@@ -1,41 +0,0 @@
-#ifndef NOTES_LOADER_PMS_H
-#define NOTES_LOADER_PMS_H
-
-class Song;
-class Steps;
-/** @brief Reads a Song from a set of .PMS files. */
-namespace PMSLoader
-{
-	void GetApplicableFiles( const RString &sPath, vector<RString> &out );
-	bool LoadFromDir( const RString &sDir, Song &out );
-	bool LoadNoteDataFromSimfile(const RString & cachePath, Steps & out);
-}
-
-#endif
-
-/**
- * @file
- * @author Chris Danford (c) 2001-2003
- * @section LICENSE
- * All rights reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, and/or sell copies of the Software, and to permit persons to
- * whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */

src/StepMania-net2003.vcproj

@@ -984,12 +984,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 			<File
 				RelativePath="NotesLoaderKSF.h">
 			</File>
-			<File
-				RelativePath="NotesLoaderPMS.cpp">
-			</File>
-			<File
-				RelativePath="NotesLoaderPMS.h">
-			</File>
 			<File
 				RelativePath="NotesLoaderSM.cpp">
 			</File>

src/StepMania-net2005.vcproj

@@ -1306,14 +1306,6 @@
 				RelativePath="NotesLoaderKSF.h"
 				>
 			</File>
-			<File
-				RelativePath="NotesLoaderPMS.cpp"
-				>
-			</File>
-			<File
-				RelativePath="NotesLoaderPMS.h"
-				>
-			</File>
 			<File
 				RelativePath="NotesLoaderSM.cpp"
 				>

src/StepMania-net2008.vcproj

@@ -1623,14 +1623,6 @@
 					RelativePath="NotesLoaderKSF.h"
 					>
 				</File>
-				<File
-					RelativePath="NotesLoaderPMS.cpp"
-					>
-				</File>
-				<File
-					RelativePath="NotesLoaderPMS.h"
-					>
-				</File>
 				<File
 					RelativePath="NotesLoaderSM.cpp"
 					>

src/StepMania-net2010.vcxproj

@@ -511,7 +511,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
     <ClCompile Include="NotesLoaderDWI.cpp" />
     <ClCompile Include="NotesLoaderJson.cpp" />
     <ClCompile Include="NotesLoaderKSF.cpp" />
-    <ClCompile Include="NotesLoaderPMS.cpp" />
     <ClCompile Include="NotesLoaderSM.cpp" />
     <ClCompile Include="NotesLoaderSMA.cpp" />
     <ClCompile Include="NotesLoaderSSC.cpp" />
@@ -1829,7 +1828,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)</Command>
     <ClInclude Include="NotesLoaderDWI.h" />
     <ClInclude Include="NotesLoaderJson.h" />
     <ClInclude Include="NotesLoaderKSF.h" />
-    <ClInclude Include="NotesLoaderPMS.h" />
     <ClInclude Include="NotesLoaderSM.h" />
     <ClInclude Include="NotesLoaderSMA.h" />
     <ClInclude Include="NotesLoaderSSC.h" />

src/StepMania-net2010.vcxproj.filters

@@ -534,9 +534,6 @@
     <ClCompile Include="NotesLoaderKSF.cpp">
       <Filter>Data Structures\NotesLoader</Filter>
     </ClCompile>
-    <ClCompile Include="NotesLoaderPMS.cpp">
-      <Filter>Data Structures\NotesLoader</Filter>
-    </ClCompile>
     <ClCompile Include="NotesLoaderSM.cpp">
       <Filter>Data Structures\NotesLoader</Filter>
     </ClCompile>
@@ -2048,9 +2045,6 @@
     <ClInclude Include="NotesLoaderKSF.h">
       <Filter>Data Structures\NotesLoader</Filter>
     </ClInclude>
-    <ClInclude Include="NotesLoaderPMS.h">
-      <Filter>Data Structures\NotesLoader</Filter>
-    </ClInclude>
     <ClInclude Include="NotesLoaderSM.h">
       <Filter>Data Structures\NotesLoader</Filter>
     </ClInclude>

src/Steps.cpp

@@ -28,8 +28,6 @@
 #include "NotesLoaderDWI.h"
 #include "NotesLoaderKSF.h"
 #include "NotesLoaderBMS.h"
-#include "NotesLoaderPMS.h"
-
 #include <algorithm>
 
 /* register DisplayBPM with StringConversion */