[Performous-commit] Tapio Vierros : Full screen singer layout if only one mic available.

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

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Jan 17 21:42:29 2012 +0200

Full screen singer layout if only one mic available.

---

 game/screen_sing.cc |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index eeb8240..dfb7a9e 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -60,10 +60,11 @@ void ScreenSing::enter() {
 	selectedTracks.push_back(&m_song->getVocalTrack(m_selectedTrack));
 	m_layout_singer.clear();
 	m_layout_singer.push_back(new LayoutSinger(*selectedTracks.back(), m_database, theme));
-	// Find out if we have multiple vocal tracks and create layouts for them, up to a total of 2
+	// Do we have a second vocal track and a singer for it?
 	std::vector<std::string> tracks = m_song->getVocalTrackNames();
-	for (size_t i = 1; i < std::min((int)tracks.size(), 2); ++i) {
-		selectedTracks.push_back(&m_song->getVocalTrack(tracks[i]));
+	if (tracks.size() > 1 && analyzers.size() > 1) {
+		// TODO: Maybe should check that tracks[1] is not LEAD_VOCALS
+		selectedTracks.push_back(&m_song->getVocalTrack(tracks[1]));
 		m_layout_singer.push_back(new LayoutSinger(*selectedTracks.back(), m_database, theme));
 	}
 	// Load instrument and dance tracks