From 4919b7c28f6903770cb1fe732761e8e62f820b29 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Wed, 29 Jan 2014 18:12:10 -0500
Subject: [PATCH] Attempt to address issue #9 for SM5.

Not in best position to test out.
---
 src/ScreenEdit.cpp | 32 --------------------------------
 src/ScreenEdit.h   |  2 +-
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 8d3d8cd9af..3c8df4ab38 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -90,7 +90,6 @@ AutoScreenMessage( SM_BackFromBeat0Change );
 AutoScreenMessage( SM_BackFromBPMChange );
 AutoScreenMessage( SM_BackFromStopChange );
 AutoScreenMessage( SM_BackFromDelayChange );
-AutoScreenMessage( SM_BackFromTimeSignatureChange );
 AutoScreenMessage( SM_BackFromTickcountChange );
 AutoScreenMessage( SM_BackFromComboChange );
 AutoScreenMessage( SM_BackFromLabelChange );
@@ -827,9 +826,6 @@ static MenuDef g_TimingDataInformation(
 	MenuRowDef(ScreenEdit::delay,
 		"Edit delay",
 		true, EditMode_Full, true, true, 0, NULL ),
-	MenuRowDef(ScreenEdit::time_signature,
-		"Edit time signature",
-		true, EditMode_Full, true, true, 0, NULL ),
 	MenuRowDef(ScreenEdit::label,
 		"Edit label",
 		true, EditMode_Full, true, true, 0, NULL ),
@@ -3361,15 +3357,6 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
 
 		SetDirty( true );
 	}
-	else if( SM == SM_BackFromTimeSignatureChange && !ScreenTextEntry::s_bCancelledLast )
-	{
-		int iNum, iDen;
-
-		if( sscanf( ScreenTextEntry::s_sLastAnswer.c_str(), " %d / %d ", &iNum, &iDen ) == 2 )
-			GetAppropriateTimingForUpdate().AddSegment( TimeSignatureSegment(GetRow(), iNum, iDen) );
-
-		SetDirty( true );
-	}
 	else if ( SM == SM_BackFromTickcountChange && !ScreenTextEntry::s_bCancelledLast )
 	{
 		int iTick = StringToInt( ScreenTextEntry::s_sLastAnswer );
@@ -4247,13 +4234,6 @@ void ScreenEdit::DisplayTimingMenu()
 	g_TimingDataInformation.rows[stop].SetOneUnthemedChoice( FloatToString(pTime.GetStopAtRow( row ) ) ) ;
 	g_TimingDataInformation.rows[delay].SetOneUnthemedChoice( FloatToString(pTime.GetDelayAtRow( row ) ) );
 
-	g_TimingDataInformation.rows[time_signature].SetOneUnthemedChoice(
-		ssprintf( "%d / %d",
-			pTime.GetTimeSignatureSegmentAtRow(row)->GetNum(),
-			pTime.GetTimeSignatureSegmentAtRow(row)->GetDen()
-		)
-	);
-
 	g_TimingDataInformation.rows[label].SetOneUnthemedChoice( pTime.GetLabelAtRow( row ).c_str() );
 	g_TimingDataInformation.rows[tickcount].SetOneUnthemedChoice( ssprintf("%d", pTime.GetTickcountAtRow( row ) ) );
 	g_TimingDataInformation.rows[combo].SetOneUnthemedChoice( ssprintf("%d / %d",
@@ -5217,7 +5197,6 @@ static LocalizedString ENTER_BEAT_0_OFFSET			( "ScreenEdit", "Enter the offset f
 static LocalizedString ENTER_BPM_VALUE				( "ScreenEdit", "Enter a new BPM value." );
 static LocalizedString ENTER_STOP_VALUE				( "ScreenEdit", "Enter a new Stop value." );
 static LocalizedString ENTER_DELAY_VALUE			( "ScreenEdit", "Enter a new Delay value." );
-static LocalizedString ENTER_TIME_SIGNATURE_VALUE	( "ScreenEdit", "Enter a new Time Signature." );
 static LocalizedString ENTER_TICKCOUNT_VALUE			( "ScreenEdit", "Enter a new Tickcount value." );
 static LocalizedString ENTER_COMBO_VALUE			( "ScreenEdit", "Enter a new Combo value." );
 static LocalizedString ENTER_LABEL_VALUE			( "ScreenEdit", "Enter a new Label value." );
@@ -5265,17 +5244,6 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice
 			10
 		);
 		break;
-	case time_signature:
-	{
-		const TimeSignatureSegment *ts = GetAppropriateTiming().GetTimeSignatureSegmentAtBeat( GetBeat() );
-		ScreenTextEntry::TextEntry(
-			SM_BackFromTimeSignatureChange,
-			ENTER_TIME_SIGNATURE_VALUE,
-			ssprintf( "%d/%d", ts->GetNum(), ts->GetDen() ),
-			8
-			);
-		break;
-	}
 	case tickcount:
 		ScreenTextEntry::TextEntry(
 			SM_BackFromTickcountChange,
diff --git a/src/ScreenEdit.h b/src/ScreenEdit.h
index f73679fbbd..93b880796f 100644
--- a/src/ScreenEdit.h
+++ b/src/ScreenEdit.h
@@ -576,7 +576,7 @@ public:
 		bpm,
 		stop,
 		delay,
-		time_signature,
+//		time_signature,
 		label,
 		tickcount,
 		combo,