From c2f2f99650040ac5137fe4919888775f53d0fc66 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 13 Sep 2002 18:17:53 +0000
Subject: [PATCH] move GetMainAndSubTitlesFromFullTitle to NotesLoader (only
 used by them)

---
 stepmania/src/NotesLoader.cpp    | 18 ++++++++++++++++++
 stepmania/src/NotesLoader.h      |  1 +
 stepmania/src/NotesLoaderBMS.cpp |  2 +-
 stepmania/src/NotesLoaderDWI.cpp |  2 +-
 stepmania/src/NotesLoaderSM.cpp  |  2 +-
 stepmania/src/Song.cpp           | 17 -----------------
 stepmania/src/song.h             |  2 --
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/stepmania/src/NotesLoader.cpp b/stepmania/src/NotesLoader.cpp
index 95ff949f71..4200c9eb52 100644
--- a/stepmania/src/NotesLoader.cpp
+++ b/stepmania/src/NotesLoader.cpp
@@ -9,3 +9,21 @@ bool NotesLoader::Loadable( CString sPath )
 	GetApplicableFiles( sPath, list );
 	return list.GetSize() != 0;
 }
+
+void NotesLoader::GetMainAndSubTitlesFromFullTitle( const CString sFullTitle, CString &sMainTitleOut, CString &sSubTitleOut )
+{
+	const CString sLeftSeps[]  = { " -", " ~", " (", " [" };
+	int iNumSeps = sizeof(sLeftSeps)/sizeof(CString);
+	for( int i=0; i<iNumSeps; i++ )
+	{
+		int iBeginIndex = sFullTitle.Find( sLeftSeps[i] );
+		if( iBeginIndex == -1 )
+			continue;
+		sMainTitleOut = sFullTitle.Left( iBeginIndex );
+		sSubTitleOut = sFullTitle.Mid( iBeginIndex+1, sFullTitle.GetLength()-iBeginIndex+1 );
+		return;
+	}
+	sMainTitleOut = sFullTitle; 
+	sSubTitleOut = ""; 
+};	
+
diff --git a/stepmania/src/NotesLoader.h b/stepmania/src/NotesLoader.h
index 250864bd1c..00c3658d2b 100644
--- a/stepmania/src/NotesLoader.h
+++ b/stepmania/src/NotesLoader.h
@@ -23,6 +23,7 @@ enum {
 class NotesLoader {
 protected:
 	virtual void GetApplicableFiles( CString sPath, CStringArray &out )=0;
+	void GetMainAndSubTitlesFromFullTitle( const CString sFullTitle, CString &sMainTitleOut, CString &sSubTitleOut );
 
 public:
 	virtual bool LoadFromDir( CString sPath, Song &out ) = 0;
diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp
index 9d29402ada..ec3c1544f7 100644
--- a/stepmania/src/NotesLoaderBMS.cpp
+++ b/stepmania/src/NotesLoaderBMS.cpp
@@ -329,7 +329,7 @@ bool BMSLoader::LoadFromDir( CString sDir, Song &out )
 			if( iIndex != -1 )
 			{
 				value_data = value_data.Left( iIndex );
-				out.GetMainAndSubTitlesFromFullTitle( value_data, out.m_sMainTitle, out.m_sSubTitle );
+				GetMainAndSubTitlesFromFullTitle( value_data, out.m_sMainTitle, out.m_sSubTitle );
 			}
 			else
 				out.m_sMainTitle = value_data;
diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp
index 926dc69a11..6685573464 100644
--- a/stepmania/src/NotesLoaderDWI.cpp
+++ b/stepmania/src/NotesLoaderDWI.cpp
@@ -263,7 +263,7 @@ bool DWILoader::LoadFromDWIFile( CString sPath, Song &out )
 			out.m_sMusicFile = sParams[1];
 
 		else if( 0==stricmp(sValueName,"TITLE") )
-			out.GetMainAndSubTitlesFromFullTitle( sParams[1], out.m_sMainTitle, out.m_sSubTitle );
+			GetMainAndSubTitlesFromFullTitle( sParams[1], out.m_sMainTitle, out.m_sSubTitle );
 
 		else if( 0==stricmp(sValueName,"ARTIST") )
 			out.m_sArtist = sParams[1];
diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp
index d96acb24c5..5c95c72b8a 100644
--- a/stepmania/src/NotesLoaderSM.cpp
+++ b/stepmania/src/NotesLoaderSM.cpp
@@ -69,7 +69,7 @@ bool SMLoader::LoadFromSMFile( CString sPath, Song &out )
 
 		// handle the data
 		if( 0==stricmp(sValueName,"TITLE") )
-			out.GetMainAndSubTitlesFromFullTitle( sParams[1], out.m_sMainTitle, out.m_sSubTitle );
+			GetMainAndSubTitlesFromFullTitle( sParams[1], out.m_sMainTitle, out.m_sSubTitle );
 
 		else if( 0==stricmp(sValueName,"SUBTITLE") )
 			out.m_sSubTitle = sParams[1];
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 79ae15dfa7..bda2bdb70d 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -249,23 +249,6 @@ float Song::GetElapsedTimeFromBeat( float fBeat ) const
 	return fElapsedTimeBestGuess;
 }
 
-void Song::GetMainAndSubTitlesFromFullTitle( const CString sFullTitle, CString &sMainTitleOut, CString &sSubTitleOut )
-{
-	const CString sLeftSeps[]  = { " -", " ~", " (", " [" };
-	int iNumSeps = sizeof(sLeftSeps)/sizeof(CString);
-	for( int i=0; i<iNumSeps; i++ )
-	{
-		int iBeginIndex = sFullTitle.Find( sLeftSeps[i] );
-		if( iBeginIndex == -1 )
-			continue;
-		sMainTitleOut = sFullTitle.Left( iBeginIndex );
-		sSubTitleOut = sFullTitle.Mid( iBeginIndex+1, sFullTitle.GetLength()-iBeginIndex+1 );
-		return;
-	}
-	sMainTitleOut = sFullTitle; 
-	sSubTitleOut = ""; 
-};	
-
 CString Song::GetCacheFilePath() const
 {
 	return ssprintf( "Cache\\%u", GetHashForString(m_sSongDir) );
diff --git a/stepmania/src/song.h b/stepmania/src/song.h
index 8b00503422..69150f10f1 100644
--- a/stepmania/src/song.h
+++ b/stepmania/src/song.h
@@ -93,8 +93,6 @@ public:
 	CString	m_sCredit;
 
 	CString GetFullTitle() const { return m_sMainTitle + (m_sSubTitle.GetLength()? (" " + m_sSubTitle):""); }
-	static void GetMainAndSubTitlesFromFullTitle( const CString sFullTitle, CString &sMainTitleOut, CString &sSubTitleOut );
-
 
 	CString	m_sMusicFile;
 	DWORD	m_iMusicBytes;