From bdfaba0cbc9a03e91e1cc328f11f218ed3719631 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Tue, 18 Jan 2011 09:17:48 -0500 Subject: [PATCH] Const unconfusion (hopefully). Feel free to revert this if needed. --- src/TimingData.cpp | 12 ++++++------ src/TimingData.h | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/TimingData.cpp b/src/TimingData.cpp index da26d12f9a..73ed97634e 100644 --- a/src/TimingData.cpp +++ b/src/TimingData.cpp @@ -201,7 +201,7 @@ float TimingData::GetStopAtRow( int iNoteRow, bool &bDelayOut ) const return 0; } -float TimingData::GetStopAtRow( int iRow ) +float TimingData::GetStopAtRow( int iRow ) const { for( unsigned i = 0; i < m_StopSegments.size(); i++ ) { @@ -212,7 +212,7 @@ float TimingData::GetStopAtRow( int iRow ) } -float TimingData::GetDelayAtRow( int iRow ) +float TimingData::GetDelayAtRow( int iRow ) const { for( unsigned i = 0; i < m_StopSegments.size(); i++ ) { @@ -284,7 +284,7 @@ float TimingData::GetBPMAtBeat( float fBeat ) const return m_BPMSegments[i].GetBPM(); } -int TimingData::GetBPMSegmentIndexAtBeat( float fBeat ) +int TimingData::GetBPMSegmentIndexAtBeat( float fBeat ) const { int iIndex = BeatToNoteRow( fBeat ); int i; @@ -294,7 +294,7 @@ int TimingData::GetBPMSegmentIndexAtBeat( float fBeat ) return i; } -int TimingData::GetTimeSignatureSegmentIndexAtRow( int iRow ) +int TimingData::GetTimeSignatureSegmentIndexAtRow( int iRow ) const { int i; for (i=0; i < (int)(m_vTimeSignatureSegments.size()) - 1; i++ ) @@ -332,7 +332,7 @@ BPMSegment& TimingData::GetBPMSegmentAtBeat( float fBeat ) return m_BPMSegments[i]; } -int TimingData::GetTickcountSegmentIndexAtRow( int iRow ) +int TimingData::GetTickcountSegmentIndexAtRow( int iRow ) const { int i; for (i=0; i < (int)(m_TickcountSegments.size()) - 1; i++ ) @@ -351,7 +351,7 @@ TickcountSegment& TimingData::GetTickcountSegmentAtRow( int iRow ) return m_TickcountSegments[i]; } -int TimingData::GetTickcountAtRow( int iRow ) +int TimingData::GetTickcountAtRow( int iRow ) const { return m_TickcountSegments[GetTickcountSegmentIndexAtRow( iRow )].m_iTicks; } diff --git a/src/TimingData.h b/src/TimingData.h index 8f85149a3b..636f020ae8 100644 --- a/src/TimingData.h +++ b/src/TimingData.h @@ -207,10 +207,10 @@ public: void SetStopAtBeat( float fBeat, float fSeconds ) { SetStopAtRow( BeatToNoteRow(fBeat), fSeconds ); } void SetStopAtBeat( float fBeat, float fSeconds, bool bDelay ) { SetStopAtRow( BeatToNoteRow(fBeat), fSeconds, bDelay ); } // (sm-ssc) float GetStopAtRow( int iNoteRow, bool &bDelayOut ) const; - float GetStopAtRow( int iRow ); - float GetStopAtBeat( float fBeat ) { return GetStopAtRow( BeatToNoteRow(fBeat) ); } - float GetDelayAtRow( int iRow ); - float GetDelayAtBeat( float fBeat ) { return GetDelayAtRow( BeatToNoteRow(fBeat) ); } + float GetStopAtRow( int iRow ) const; + float GetStopAtBeat( float fBeat ) const { return GetStopAtRow( BeatToNoteRow(fBeat) ); } + float GetDelayAtRow( int iRow ) const; + float GetDelayAtBeat( float fBeat ) const { return GetDelayAtRow( BeatToNoteRow(fBeat) ); } void SetTimeSignatureAtRow( int iRow, int iNumerator, int iDenominator ); void SetTimeSignatureAtBeat( float fBeat, int iNumerator, int iDenominator ) { SetTimeSignatureAtRow( BeatToNoteRow(fBeat), iNumerator, iDenominator ); } void SetTimeSignatureNumeratorAtRow( int iRow, int iNumerator ); @@ -221,26 +221,26 @@ public: void SetDelayAtRow( int iNoteRow, float fSeconds ); // sm-ssc void SetTickcountAtRow( int iRow, int iTicks ); void SetTickcountAtBeat( float fBeat, int iTicks ) { SetTickcountAtRow( BeatToNoteRow( fBeat ), iTicks ); } - int GetTickcountAtRow( int iRow ); - int GetTickcountAtBeat( float fBeat ) { return GetTickcountAtRow( BeatToNoteRow(fBeat) ); } + int GetTickcountAtRow( int iRow ) const; + int GetTickcountAtBeat( float fBeat ) const { return GetTickcountAtRow( BeatToNoteRow(fBeat) ); } void MultiplyBPMInBeatRange( int iStartIndex, int iEndIndex, float fFactor ); void AddBPMSegment( const BPMSegment &seg ); void AddStopSegment( const StopSegment &seg ); void AddTimeSignatureSegment( const TimeSignatureSegment &seg ); void AddWarpSegment( const WarpSegment &seg ); void AddTickcountSegment( const TickcountSegment &seg ); - int GetBPMSegmentIndexAtBeat( float fBeat ); - int GetTimeSignatureSegmentIndexAtRow( int iRow ); - int GetTimeSignatureSegmentIndexAtBeat( float fBeat ) { return GetTimeSignatureSegmentIndexAtRow( BeatToNoteRow(fBeat) ); } + int GetBPMSegmentIndexAtBeat( float fBeat ) const; + int GetTimeSignatureSegmentIndexAtRow( int iRow ) const; + int GetTimeSignatureSegmentIndexAtBeat( float fBeat ) const { return GetTimeSignatureSegmentIndexAtRow( BeatToNoteRow(fBeat) ); } TimeSignatureSegment& GetTimeSignatureSegmentAtRow( int iRow ); TimeSignatureSegment& GetTimeSignatureSegmentAtBeat( float fBeat ) { return GetTimeSignatureSegmentAtRow( BeatToNoteRow(fBeat) ); } int GetTimeSignatureNumeratorAtRow( int iRow ); int GetTimeSignatureNumeratorAtBeat( float fBeat ) { return GetTimeSignatureNumeratorAtRow( BeatToNoteRow(fBeat) ); } int GetTimeSignatureDenominatorAtRow( int iRow ); - int GetTimeSignatureDenominatorAtBeat( float fBeat ) { return GetTimeSignatureDenominatorAtRow( BeatToNoteRow(fBeat) ); } + int GetTimeSignatureDenominatorAtBeat( float fBeat ) { return GetTimeSignatureDenominatorAtRow( BeatToNoteRow(fBeat) ); } BPMSegment& GetBPMSegmentAtBeat( float fBeat ); - int GetTickcountSegmentIndexAtRow( int iRow ); - int GetTickcountSegmentIndexAtBeat( float fBeat ) { return GetTickcountSegmentIndexAtRow( BeatToNoteRow(fBeat) ); } + int GetTickcountSegmentIndexAtRow( int iRow ) const; + int GetTickcountSegmentIndexAtBeat( float fBeat ) const { return GetTickcountSegmentIndexAtRow( BeatToNoteRow(fBeat) ); } TickcountSegment& GetTickcountSegmentAtRow( int iRow ); TickcountSegment& GetTickcountSegmentAtBeat( float fBeat ) { return GetTickcountSegmentAtRow( BeatToNoteRow(fBeat) ); } void NoteRowToMeasureAndBeat( int iNoteRow, int &iMeasureIndexOut, int &iBeatIndexOut, int &iRowsRemainder ) const;