[Performous-commit] Tapio Vierros : Refactor INI track name parsing.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: 0daf6a74411a733d604a499dd46e2254a10a17e0

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Jan 27 14:23:46 2010 +0200

Refactor INI track name parsing.

---

 game/songparser-ini.cc |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
index f2d2f10..7d6745c 100644
--- a/game/songparser-ini.cc
+++ b/game/songparser-ini.cc
@@ -33,6 +33,24 @@ namespace {
 			throw std::runtime_error("\"" + str + "\" is not valid floating point value");
 		}
 	}
+	/// Change the MIDI track name to Performous track name
+	/// Return false if not valid
+	bool mangleTrackName(std::string& name) {
+		if (name == "T1 GEMS") { // Some old MIDI files have a track named T1 GEMS
+			name = "guitar"; return true;
+		}
+		else if (name.substr(0, 5) != "PART ") return false;
+		else name.erase(0, 5);
+		if (name == "GUITAR COOP") name = "coop guitar";
+		else if (name == "RHYTHM") name = "rhythm guitar";
+		else if (name == "DRUM") name = "drums";
+		else if (name == "DRUMS") name = "drums";
+		else if (name == "BASS") name = "bass";
+		else if (name == "GUITAR") name = "guitar";
+		else if (name == "VOCALS") return true;
+		else return false;
+		return true;
+	}
 }
 
 /// Parse header data for Songs screen
@@ -99,15 +117,7 @@ void SongParser::iniParseHeader() {
 		// Figure out the track name
 		std::string name = it->name;
 		if (midi.tracks.size() == 1) name = "guitar"; // Original (old) FoF songs only have one track
-		else if (name == "T1 GEMS") name = "guitar"; // Some old MIDI files have a track named T1 GEMS
-		else if (name.substr(0, 5) != "PART ") continue;
-		else name.erase(0, 5);
-		if (name == "GUITAR COOP") name = "coop guitar";
-		else if (name == "RHYTHM") name = "rhythm guitar";
-		else if (name == "DRUM") name = "drums";
-		else if (name == "DRUMS") name = "drums";
-		else if (name == "BASS") name = "bass";
-		else if (name == "GUITAR") name = "guitar";
+		else if (!mangleTrackName(name)) continue; // Beautify the track name
 		// Add dummy notes to tracks so that they can be seen in song browser
 		if (name != "VOCALS") s.track_map.insert(make_pair(name,Track(name)));
 		else s.notes.push_back(Note());
@@ -127,15 +137,7 @@ void SongParser::iniParse() {
 		// Figure out the track name
 		std::string name = it->name;
 		if (midi.tracks.size() == 1) name = "guitar"; // Original (old) FoF songs only have one track
-		else if (name == "T1 GEMS") name = "guitar"; // Some old MIDI files have a track named T1 GEMS
-		else if (name.substr(0, 5) != "PART ") continue;
-		else name.erase(0, 5);
-		if (name == "GUITAR COOP") name = "coop guitar";
-		else if (name == "RHYTHM") name = "rhythm guitar";
-		else if (name == "DRUM") name = "drums";
-		else if (name == "DRUMS") name = "drums";
-		else if (name == "BASS") name = "bass";
-		else if (name == "GUITAR") name = "guitar";
+		else if (!mangleTrackName(name)) continue; // Beautify the track name
 		// Process non-vocal tracks
 		if (name != "VOCALS") {
 			int durCount = 0;