actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove PMSLoader.

Browse Source 
The BPMSLoader now handles PMS files considering their
similarities.
This commit is contained in:
Jason Felds
2011-11-30 00:32:17 -05:00
parent 2d3c3628a1
commit fd40fea9cb
11 changed files with 1 additions and 1117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Xcode/stepmania.xcodeproj/project.pbxproj
-8
View File
@@ -1683,8 +1683,6 @@
B75CE3B6137963350076A82D /* SongPosition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B75CE3B4137963350076A82D /* SongPosition.cpp */; };
B773AE6D140AAB1800C68DDD /* SpecialDirs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B773AE6B140AAB1800C68DDD /* SpecialDirs.cpp */; };
B773AE6E140AAB1800C68DDD /* SpecialDirs.h in Headers */ = {isa = PBXBuildFile; fileRef = B773AE6C140AAB1800C68DDD /* SpecialDirs.h */; };
EE2153A910A75BEE0074B01B /* NotesLoaderPMS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE2153A710A75BEE0074B01B /* NotesLoaderPMS.cpp */; };
EE2153AA10A75BEE0074B01B /* NotesLoaderPMS.h in Headers */ = {isa = PBXBuildFile; fileRef = EE2153A810A75BEE0074B01B /* NotesLoaderPMS.h */; };
EE879B60132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE879B5C132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp */; };
EE879B61132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h in Headers */ = {isa = PBXBuildFile; fileRef = EE879B5D132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h */; };
EE879B62132DEE720078FDDC /* RageDisplay_Legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE879B5E132DEE720078FDDC /* RageDisplay_Legacy.cpp */; };
@@ -3111,8 +3109,6 @@
B75CE3B4137963350076A82D /* SongPosition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SongPosition.cpp; path = ../src/SongPosition.cpp; sourceTree = SOURCE_ROOT; };
B773AE6B140AAB1800C68DDD /* SpecialDirs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SpecialDirs.cpp; path = archutils/Darwin/SpecialDirs.cpp; sourceTree = "<group>"; };
B773AE6C140AAB1800C68DDD /* SpecialDirs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SpecialDirs.h; path = archutils/Darwin/SpecialDirs.h; sourceTree = "<group>"; };
EE2153A710A75BEE0074B01B /* NotesLoaderPMS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NotesLoaderPMS.cpp; path = ../src/NotesLoaderPMS.cpp; sourceTree = SOURCE_ROOT; };
EE2153A810A75BEE0074B01B /* NotesLoaderPMS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesLoaderPMS.h; path = ../src/NotesLoaderPMS.h; sourceTree = SOURCE_ROOT; };
EE879B5C132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RageDisplay_Legacy_Helpers.cpp; path = ../src/RageDisplay_Legacy_Helpers.cpp; sourceTree = SOURCE_ROOT; };
EE879B5D132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RageDisplay_Legacy_Helpers.h; path = ../src/RageDisplay_Legacy_Helpers.h; sourceTree = SOURCE_ROOT; };
EE879B5E132DEE720078FDDC /* RageDisplay_Legacy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RageDisplay_Legacy.cpp; path = ../src/RageDisplay_Legacy.cpp; sourceTree = SOURCE_ROOT; };
@@ -3380,8 +3376,6 @@
2B9C2E8A137A138B004C92F3 /* NotesLoaderJson.h */,
AA6EFDF304770C79005F316C /* NotesLoaderKSF.cpp */,
AA6EFDF404770C79005F316C /* NotesLoaderKSF.h */,
EE2153A710A75BEE0074B01B /* NotesLoaderPMS.cpp */,
EE2153A810A75BEE0074B01B /* NotesLoaderPMS.h */,
AA6EFDF504770C79005F316C /* NotesLoaderSM.cpp */,
AA6EFDF604770C79005F316C /* NotesLoaderSM.h */,
2B76698A132FF71500586512 /* NotesLoaderSMA.cpp */,
@@ -5242,7 +5236,6 @@
3659B5700F902143002B6B68 /* CommandLineActions.h in Headers */,
36CA531D0F91564A0063D59D /* ScreenOptionsCourseOverview.h in Headers */,
36CA53210F9156860063D59D /* ScreenOptionsEditCourse.h in Headers */,
EE2153AA10A75BEE0074B01B /* NotesLoaderPMS.h in Headers */,
EEA7C84410A805A300082E7B /* ScreenPackagesSSC.h in Headers */,
36C6888411297FFE00453295 /* RageFileDriverReadAhead.h in Headers */,
36C6888611297FFE00453295 /* RageFileManager_ReadAhead.h in Headers */,
@@ -6270,7 +6263,6 @@
AA29CD680558741A00961A51 /* NotesLoaderDWI.cpp in Sources */,
2B9C2E8D137A138B004C92F3 /* NotesLoaderJson.cpp in Sources */,
AA29CD690558741A00961A51 /* NotesLoaderKSF.cpp in Sources */,
EE2153A910A75BEE0074B01B /* NotesLoaderPMS.cpp in Sources */,
AA29CD6A0558741A00961A51 /* NotesLoaderSM.cpp in Sources */,
2B76698C132FF71500586512 /* NotesLoaderSMA.cpp in Sources */,
2BA7925E1304F20D002BD8E1 /* NotesLoaderSSC.cpp in Sources */,
src/Makefile.am
+1 -1
View File
@@ -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
-1
View File
@@ -5,7 +5,6 @@
#include "NotesLoaderSSC.h"
#include "NotesLoaderDWI.h"
#include "NotesLoaderBMS.h"
#include "NotesLoaderPMS.h"
#include "NotesLoaderKSF.h"
#include "RageUtil.h"
src/NotesLoaderPMS.cpp
-1034
View File
File diff suppressed because it is too large Load Diff
src/NotesLoaderPMS.h
-41
View File
@@ -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
-6
View File
@@ -984,12 +984,6 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
<File
RelativePath="NotesLoaderKSF.h">
</File>
<File
RelativePath="NotesLoaderPMS.cpp">
</File>
<File
RelativePath="NotesLoaderPMS.h">
</File>
<File
RelativePath="NotesLoaderSM.cpp">
</File>
src/StepMania-net2005.vcproj
-8
View File
@@ -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
-8
View File
@@ -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
-2
View File
@@ -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
-6
View File
@@ -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
-2
View File
@@ -28,8 +28,6 @@
#include "NotesLoaderDWI.h"
#include "NotesLoaderKSF.h"
#include "NotesLoaderBMS.h"
#include "NotesLoaderPMS.h"
#include <algorithm>
/* register DisplayBPM with StringConversion */