[Performous-commit] Vincent Le Ligeour : Fixed finilizing song not done for all vocal tracks

[Johnny O. <js...@us...>]

Module: performous
Branch: opengl2
Commit: 7064185e88d4894a0a8da74eac0aefabaead4828

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Oct 23 16:17:45 2010 +0200

Fixed finilizing song not done for all vocal tracks

---

 game/songparser.cc |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/game/songparser.cc b/game/songparser.cc
index 3728d8e..8a20d98 100644
--- a/game/songparser.cc
+++ b/game/songparser.cc
@@ -116,20 +116,23 @@ SongParser::SongParser(Song& s):
 
 
 void SongParser::finalize() {
-	// Adjust negative notes
-	VocalTrack& vocal = m_song.getVocalTrack();
-	if (vocal.noteMin <= 0) {
-		unsigned int shift = (1 - vocal.noteMin / 12) * 12;
-		vocal.noteMin += shift;
-		vocal.noteMax += shift;
-		for (Notes::iterator it = vocal.notes.begin(); it != vocal.notes.end(); ++it) {
-			it->note += shift;
-			it->notePrev += shift;
+	std::vector<std::string> tracks = m_song.getVocalTrackNames();
+	for(std::vector<std::string>::const_iterator it = tracks.begin() ; it != tracks.end() ; ++it) {
+		// Adjust negative notes
+		VocalTrack& vocal = m_song.getVocalTrack(*it);
+		if (vocal.noteMin <= 0) {
+			unsigned int shift = (1 - vocal.noteMin / 12) * 12;
+			vocal.noteMin += shift;
+			vocal.noteMax += shift;
+			for (Notes::iterator it = vocal.notes.begin(); it != vocal.notes.end(); ++it) {
+				it->note += shift;
+				it->notePrev += shift;
+			}
 		}
+		// Set begin/end times
+		if (!vocal.notes.empty()) vocal.beginTime = vocal.notes.front().begin, vocal.endTime = vocal.notes.back().end;
+		vocal.m_scoreFactor = 1.0 / m_maxScore;
 	}
-	// Set begin/end times
-	if (!vocal.notes.empty()) vocal.beginTime = vocal.notes.front().begin, vocal.endTime = vocal.notes.back().end;
-	vocal.m_scoreFactor = 1.0 / m_maxScore;
 	if (m_tsPerBeat) {
 		// Add song beat markers
 		for (unsigned ts = 0; ts < m_tsEnd; ts += m_tsPerBeat) m_song.beats.push_back(tsTime(ts));