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

Revert. The encoding concerns brought up on the mailing have not been addressed.

Browse Source
This commit is contained in:
Steve Checkoway
2006-11-01 08:45:29 +00:00
parent 00b1b7af74
commit 0276292b9f
2 changed files with 8 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderDWI.cpp
+8 -59
View File
@@ -367,7 +367,6 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
LOG->UserLog( "Song file", sPath, "couldn't be opened: %s", msd.GetError().c_str() );
return false;
}
m_sTempSMTitle = m_sTempSMSubTitle = m_sTempSMArtist = m_sTempTitle = m_sTempSubTitle = m_sTempArtist = "";
for( unsigned i=0; i<msd.GetNumValues(); i++ )
{
@@ -385,38 +384,20 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
if( 0==stricmp(sValueName,"FILE") )
out.m_sMusicFile = sParams[1];
/* As far as I know, there's no spec on the encoding of the texts. (I didn't
* look very hard, though.) I've seen at least one file in ISO-8859-1. */
else if ( 0==stricmp(sValueName,"SMTITLE") )
{
m_sTempSMTitle = sParams[1];
ConvertString( m_sTempSMTitle, "utf-8,english" );
}
else if ( 0==stricmp(sValueName,"SMSUBTITLE") )
{
m_sTempSMSubTitle = sParams[1];
ConvertString( m_sTempSMSubTitle, "utf-8,english" );
}
else if ( 0==stricmp(sValueName,"SMARTIST") )
{
m_sTempSMArtist = sParams[1];
ConvertString( m_sTempSMArtist, "utf-8,english" );
}
else if( 0==stricmp(sValueName,"TITLE") )
{
GetMainAndSubTitlesFromFullTitle( sParams[1], m_sTempTitle, m_sTempSubTitle );
ConvertString( m_sTempTitle, "utf-8,english" );
ConvertString( m_sTempSubTitle, "utf-8,english" );
GetMainAndSubTitlesFromFullTitle( sParams[1], out.m_sMainTitle, out.m_sSubTitle );
/* As far as I know, there's no spec on the encoding of this text. (I didn't
* look very hard, though.) I've seen at least one file in ISO-8859-1. */
ConvertString( out.m_sMainTitle, "utf-8,english" );
ConvertString( out.m_sSubTitle, "utf-8,english" );
}
else if( 0==stricmp(sValueName,"ARTIST") )
{
m_sTempArtist = sParams[1];
ConvertString( m_sTempArtist, "utf-8,english" );
out.m_sArtist = sParams[1];
ConvertString( out.m_sArtist, "utf-8,english" );
}
else if( 0==stricmp(sValueName,"CDTITLE") )
@@ -432,7 +413,6 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
LOG->UserLog( "Song file", sPath, "has an invalid BPM change at beat %f, BPM %f.",
NoteRowToBeat(0), fBPM );
}
else if( 0==stricmp(sValueName,"DISPLAYBPM") )
{
// #DISPLAYBPM:[xxx..xxx]|[xxx]|[*];
@@ -569,37 +549,6 @@ bool DWILoader::LoadFromDWIFile( const RString &sPath, Song &out )
;
}
if ( m_sTempSMTitle != "" )
{
out.m_sMainTitle = m_sTempSMTitle;
out.m_sMainTitleTranslit = m_sTempTitle;
}
else
out.m_sMainTitle = m_sTempTitle;
if ( m_sTempSMSubTitle != "" )
{
out.m_sSubTitle = m_sTempSMSubTitle;
out.m_sSubTitleTranslit = m_sTempSubTitle;
}
else
{
GetMainAndSubTitlesFromFullTitle( m_sTempSMTitle, RString(), m_sTempSubTitleOnSameLine );
ConvertString( m_sTempSubTitleOnSameLine, "utf-8,english" );
if ( 0!=stricmp(m_sTempSubTitleOnSameLine, "") )
out.m_sSubTitle = "";
else
out.m_sSubTitle = m_sTempSubTitle;
}
if ( m_sTempSMArtist != "" )
{
out.m_sArtist = m_sTempSMArtist;
out.m_sArtistTranslit = m_sTempArtist;
}
else
out.m_sArtist = m_sTempArtist;
return true;
}