actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Const unconfusion (hopefully).

Browse Source 
Feel free to revert this if needed.
This commit is contained in:
Jason Felds
2011-01-18 09:17:48 -05:00
parent 96df14add9
commit bdfaba0cbc
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+6 -6
View File
@@ -201,7 +201,7 @@ float TimingData::GetStopAtRow( int iNoteRow, bool &bDelayOut ) const
return 0; return 0;
} }
float TimingData::GetStopAtRow( int iRow ) float TimingData::GetStopAtRow( int iRow ) const
{ {
for( unsigned i = 0; i < m_StopSegments.size(); i++ ) 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++ ) for( unsigned i = 0; i < m_StopSegments.size(); i++ )
{ {
@@ -284,7 +284,7 @@ float TimingData::GetBPMAtBeat( float fBeat ) const
return m_BPMSegments[i].GetBPM(); return m_BPMSegments[i].GetBPM();
} }
int TimingData::GetBPMSegmentIndexAtBeat( float fBeat ) int TimingData::GetBPMSegmentIndexAtBeat( float fBeat ) const
{ {
int iIndex = BeatToNoteRow( fBeat ); int iIndex = BeatToNoteRow( fBeat );
int i; int i;
@@ -294,7 +294,7 @@ int TimingData::GetBPMSegmentIndexAtBeat( float fBeat )
return i; return i;
} }
int TimingData::GetTimeSignatureSegmentIndexAtRow( int iRow ) int TimingData::GetTimeSignatureSegmentIndexAtRow( int iRow ) const
{ {
int i; int i;
for (i=0; i < (int)(m_vTimeSignatureSegments.size()) - 1; i++ ) for (i=0; i < (int)(m_vTimeSignatureSegments.size()) - 1; i++ )
@@ -332,7 +332,7 @@ BPMSegment& TimingData::GetBPMSegmentAtBeat( float fBeat )
return m_BPMSegments[i]; return m_BPMSegments[i];
} }
int TimingData::GetTickcountSegmentIndexAtRow( int iRow ) int TimingData::GetTickcountSegmentIndexAtRow( int iRow ) const
{ {
int i; int i;
for (i=0; i < (int)(m_TickcountSegments.size()) - 1; i++ ) for (i=0; i < (int)(m_TickcountSegments.size()) - 1; i++ )
@@ -351,7 +351,7 @@ TickcountSegment& TimingData::GetTickcountSegmentAtRow( int iRow )
return m_TickcountSegments[i]; return m_TickcountSegments[i];
} }
int TimingData::GetTickcountAtRow( int iRow ) int TimingData::GetTickcountAtRow( int iRow ) const
{ {
return m_TickcountSegments[GetTickcountSegmentIndexAtRow( iRow )].m_iTicks; return m_TickcountSegments[GetTickcountSegmentIndexAtRow( iRow )].m_iTicks;
} }
src/TimingData.h
+11 -11
View File
@@ -207,10 +207,10 @@ public:
void SetStopAtBeat( float fBeat, float fSeconds ) { SetStopAtRow( BeatToNoteRow(fBeat), fSeconds ); } 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) 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 iNoteRow, bool &bDelayOut ) const;
float GetStopAtRow( int iRow ); float GetStopAtRow( int iRow ) const;
float GetStopAtBeat( float fBeat ) { return GetStopAtRow( BeatToNoteRow(fBeat) ); } float GetStopAtBeat( float fBeat ) const { return GetStopAtRow( BeatToNoteRow(fBeat) ); }
float GetDelayAtRow( int iRow ); float GetDelayAtRow( int iRow ) const;
float GetDelayAtBeat( float fBeat ) { return GetDelayAtRow( BeatToNoteRow(fBeat) ); } float GetDelayAtBeat( float fBeat ) const { return GetDelayAtRow( BeatToNoteRow(fBeat) ); }
void SetTimeSignatureAtRow( int iRow, int iNumerator, int iDenominator ); void SetTimeSignatureAtRow( int iRow, int iNumerator, int iDenominator );
void SetTimeSignatureAtBeat( float fBeat, int iNumerator, int iDenominator ) { SetTimeSignatureAtRow( BeatToNoteRow(fBeat), iNumerator, iDenominator ); } void SetTimeSignatureAtBeat( float fBeat, int iNumerator, int iDenominator ) { SetTimeSignatureAtRow( BeatToNoteRow(fBeat), iNumerator, iDenominator ); }
void SetTimeSignatureNumeratorAtRow( int iRow, int iNumerator ); void SetTimeSignatureNumeratorAtRow( int iRow, int iNumerator );
@@ -221,17 +221,17 @@ public:
void SetDelayAtRow( int iNoteRow, float fSeconds ); // sm-ssc void SetDelayAtRow( int iNoteRow, float fSeconds ); // sm-ssc
void SetTickcountAtRow( int iRow, int iTicks ); void SetTickcountAtRow( int iRow, int iTicks );
void SetTickcountAtBeat( float fBeat, int iTicks ) { SetTickcountAtRow( BeatToNoteRow( fBeat ), iTicks ); } void SetTickcountAtBeat( float fBeat, int iTicks ) { SetTickcountAtRow( BeatToNoteRow( fBeat ), iTicks ); }
int GetTickcountAtRow( int iRow ); int GetTickcountAtRow( int iRow ) const;
int GetTickcountAtBeat( float fBeat ) { return GetTickcountAtRow( BeatToNoteRow(fBeat) ); } int GetTickcountAtBeat( float fBeat ) const { return GetTickcountAtRow( BeatToNoteRow(fBeat) ); }
void MultiplyBPMInBeatRange( int iStartIndex, int iEndIndex, float fFactor ); void MultiplyBPMInBeatRange( int iStartIndex, int iEndIndex, float fFactor );
void AddBPMSegment( const BPMSegment &seg ); void AddBPMSegment( const BPMSegment &seg );
void AddStopSegment( const StopSegment &seg ); void AddStopSegment( const StopSegment &seg );
void AddTimeSignatureSegment( const TimeSignatureSegment &seg ); void AddTimeSignatureSegment( const TimeSignatureSegment &seg );
void AddWarpSegment( const WarpSegment &seg ); void AddWarpSegment( const WarpSegment &seg );
void AddTickcountSegment( const TickcountSegment &seg ); void AddTickcountSegment( const TickcountSegment &seg );
int GetBPMSegmentIndexAtBeat( float fBeat ); int GetBPMSegmentIndexAtBeat( float fBeat ) const;
int GetTimeSignatureSegmentIndexAtRow( int iRow ); int GetTimeSignatureSegmentIndexAtRow( int iRow ) const;
int GetTimeSignatureSegmentIndexAtBeat( float fBeat ) { return GetTimeSignatureSegmentIndexAtRow( BeatToNoteRow(fBeat) ); } int GetTimeSignatureSegmentIndexAtBeat( float fBeat ) const { return GetTimeSignatureSegmentIndexAtRow( BeatToNoteRow(fBeat) ); }
TimeSignatureSegment& GetTimeSignatureSegmentAtRow( int iRow ); TimeSignatureSegment& GetTimeSignatureSegmentAtRow( int iRow );
TimeSignatureSegment& GetTimeSignatureSegmentAtBeat( float fBeat ) { return GetTimeSignatureSegmentAtRow( BeatToNoteRow(fBeat) ); } TimeSignatureSegment& GetTimeSignatureSegmentAtBeat( float fBeat ) { return GetTimeSignatureSegmentAtRow( BeatToNoteRow(fBeat) ); }
int GetTimeSignatureNumeratorAtRow( int iRow ); int GetTimeSignatureNumeratorAtRow( int iRow );
@@ -239,8 +239,8 @@ public:
int GetTimeSignatureDenominatorAtRow( int iRow ); int GetTimeSignatureDenominatorAtRow( int iRow );
int GetTimeSignatureDenominatorAtBeat( float fBeat ) { return GetTimeSignatureDenominatorAtRow( BeatToNoteRow(fBeat) ); } int GetTimeSignatureDenominatorAtBeat( float fBeat ) { return GetTimeSignatureDenominatorAtRow( BeatToNoteRow(fBeat) ); }
BPMSegment& GetBPMSegmentAtBeat( float fBeat ); BPMSegment& GetBPMSegmentAtBeat( float fBeat );
int GetTickcountSegmentIndexAtRow( int iRow ); int GetTickcountSegmentIndexAtRow( int iRow ) const;
int GetTickcountSegmentIndexAtBeat( float fBeat ) { return GetTickcountSegmentIndexAtRow( BeatToNoteRow(fBeat) ); } int GetTickcountSegmentIndexAtBeat( float fBeat ) const { return GetTickcountSegmentIndexAtRow( BeatToNoteRow(fBeat) ); }
TickcountSegment& GetTickcountSegmentAtRow( int iRow ); TickcountSegment& GetTickcountSegmentAtRow( int iRow );
TickcountSegment& GetTickcountSegmentAtBeat( float fBeat ) { return GetTickcountSegmentAtRow( BeatToNoteRow(fBeat) ); } TickcountSegment& GetTickcountSegmentAtBeat( float fBeat ) { return GetTickcountSegmentAtRow( BeatToNoteRow(fBeat) ); }
void NoteRowToMeasureAndBeat( int iNoteRow, int &iMeasureIndexOut, int &iBeatIndexOut, int &iRowsRemainder ) const; void NoteRowToMeasureAndBeat( int iNoteRow, int &iMeasureIndexOut, int &iBeatIndexOut, int &iRowsRemainder ) const;