[sm130labels] Force starting label, display all.

Now to fix the keyboard command...
2011-04-05 01:04:19 -04:00
parent a6b5187856
commit 9e6ea7b3a6
2 changed files with 22 additions and 7 deletions
@@ -781,10 +781,7 @@ void Song::TidyUpData()
 	// If no time signature specified, assume 4/4 time for the whole song.
 	if( m_Timing.m_vTimeSignatureSegments.empty() )
 	{
-		TimeSignatureSegment seg;
-		seg.m_iStartRow = 0;
-		seg.m_iNumerator = 4;
-		seg.m_iDenominator = 4;
+		TimeSignatureSegment seg(0, 4, 4);
 		m_Timing.m_vTimeSignatureSegments.push_back( seg );
 	}
 	
@@ -795,9 +792,7 @@ void Song::TidyUpData()
 	 */
 	if( m_Timing.m_TickcountSegments.empty() )
 	{
-		TickcountSegment seg;
-		seg.m_iStartRow = 0;
-		seg.m_iTicks = 2;
+		TickcountSegment seg(0, 2);
 		m_Timing.m_TickcountSegments.push_back( seg );
 	}
 	
@@ -809,6 +804,13 @@ void Song::TidyUpData()
 		seg.m_iCombo = 1;
 		m_Timing.m_ComboSegments.push_back( seg );
 	}
+	
+	// Have a default label segment just in case.
+	if( m_Timing.m_LabelSegments.empty() )
+	{
+		LabelSegment seg(0, "Song Start");
+		m_Timing.m_LabelSegments.push_back( seg );
+	}
 }

 void Song::TranslateTitles()