[Performous-commit] Vincent Le Ligeour : Removed harmonic track from header (it' s FretsOfFire format only)

[rainbyte <rai...@us...>]

Author: Vincent Le Ligeour <yo...@us...>
Date:   Mon Jan 23 01:40:29 2012 +0100

Removed harmonic track from header (it's FretsOfFire format only)

---

 game/song.hh           |    3 ---
 game/songparser-mid.cc |   16 ++++++++++------
 game/songparser-txt.cc |    2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/game/song.hh b/game/song.hh
index 82c4113..16d3e16 100644
--- a/game/song.hh
+++ b/game/song.hh
@@ -29,9 +29,6 @@ namespace TrackName {
 	const std::string KEYBOARD = "Keyboard";
 	const std::string DRUMS = "Drums";
 	const std::string LEAD_VOCAL = "Vocals";
-	const std::string HARMONIC_1 = "Harmonic 1";
-	const std::string HARMONIC_2 = "Harmonic 2";
-	const std::string HARMONIC_3 = "Harmonic 3";
 	#if 0 // Here is some dummy gettext calls to populate the dictionary
 	_("Guitar") _("Coop guitar") _("Rhythm guitar") _("Bass") _("Drums") _("Vocals")  _("Harmonic 1") _("Harmonic 2") _("Harmonic 3")
 	#endif
diff --git a/game/songparser-mid.cc b/game/songparser-mid.cc
index e944968..5068f49 100644
--- a/game/songparser-mid.cc
+++ b/game/songparser-mid.cc
@@ -11,6 +11,10 @@
 
 using namespace SongParserUtil;
 
+const std::string HARMONIC_1 = "Harmonic 1";
+const std::string HARMONIC_2 = "Harmonic 2";
+const std::string HARMONIC_3 = "Harmonic 3";
+
 namespace {
 	void testAndAdd(Song& s, std::string const& trackid, std::string const& filename) {
 		std::string f = s.path + filename;
@@ -18,9 +22,9 @@ namespace {
 	}
 	bool isVocalTrack(std::string name) {
 		if(name == TrackName::LEAD_VOCAL) return true;
-		else if(name == TrackName::HARMONIC_1) return true;
-		else if(name == TrackName::HARMONIC_2) return true;
-		else if(name == TrackName::HARMONIC_3) return true;
+		else if(name == HARMONIC_1) return true;
+		else if(name == HARMONIC_2) return true;
+		else if(name == HARMONIC_3) return true;
 		return false;
 	}
 	/// Change the MIDI track name to Performous track name
@@ -39,9 +43,9 @@ namespace {
 		else if (name == "KEYS") return false; // TODO: RB3 5 lane keyboard track
 		else if (name == "GUITAR") name = TrackName::GUITAR;
 		else if (name == "VOCALS") name = TrackName::LEAD_VOCAL;
-		else if (name == "HARM1") name = TrackName::HARMONIC_1;
-		else if (name == "HARM2") name = TrackName::HARMONIC_2;
-		else if (name == "HARM3") name = TrackName::HARMONIC_3;
+		else if (name == "HARM1") name = HARMONIC_1;
+		else if (name == "HARM2") name = HARMONIC_2;
+		else if (name == "HARM3") name = HARMONIC_3;
 		// expert stuffs
 		else if (name == "REAL_KEYS_X") return false; // TODO: RB3 pro keyboard expert track
 		else if (name == "REAL_KEYS_H") return false; // TODO: RB3 pro keyboard hard track
diff --git a/game/songparser-txt.cc b/game/songparser-txt.cc
index 6744eaf..665b9da 100644
--- a/game/songparser-txt.cc
+++ b/game/songparser-txt.cc
@@ -85,7 +85,7 @@ bool SongParser::txtParseNote(std::string line, VocalTrack &vocal) {
 		if (line[1] == '1') return true;
 		else if (line[1] == '2') {
 			m_song.insertVocalTrack(vocal.name, vocal);
-			vocal = VocalTrack(TrackName::HARMONIC_1);
+			vocal = VocalTrack("Singer 2"); // FIXME
 			resetNoteParsingState();
 		}
 		return true;