[splittiming] merge

This commit is contained in:
Thai Pangsakulyanont
2011-05-17 00:02:39 +07:00
2 changed files with 4 additions and 7 deletions
+2 -2
View File
@@ -2718,8 +2718,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
int iNum, iDen;
if( sscanf( ScreenTextEntry::s_sLastAnswer.c_str(), " %d / %d ", &iNum, &iDen ) == 2 )
{
GetAppropriateTiming().SetTimeSignatureNumeratorAtBeat( GetBeat(), iNum );
GetAppropriateTiming().SetTimeSignatureDenominatorAtBeat( GetBeat(), iDen );
GetAppropriateTiming().SetTimeSignatureAtBeat( GetBeat(), iNum, iDen );
}
SetDirty( true );
}
@@ -4028,6 +4027,7 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice
ssprintf("%.5f", GetAppropriateTiming().GetFakeAtBeat( GetBeat() ) ),
10
);
break;
}
case erase_step_timing:
ScreenPrompt::Prompt( SM_DoEraseStepTiming, CONFIRM_TIMING_ERASE , PROMPT_YES_NO, ANSWER_NO );