hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #413 from diizy/stable-0.4

Browse Source 
Pattern: Refactor getNoteAtStep -> noteAtStep
This commit is contained in:
Tobias Doerffel
2014-03-05 09:58:13 +01:00
parent 10b1f12e7e b49f4e483e
commit 192484fa28
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/pattern.h
View File

@@ -71,7 +71,7 @@ public:
void removeNote( const note * _note_to_del );
note * getNoteAtStep( int _step );
note * noteAtStep( int _step );
note * rearrangeNote( const note * _note_to_proc,
const bool _quant_pos = true );

10
src/tracks/pattern.cpp
View File

@@ -239,7 +239,7 @@ void pattern::removeNote( const note * _note_to_del )
// returns a pointer to the note at specified step, or NULL if note doesn't exist
note * pattern::getNoteAtStep( int _step )
note * pattern::noteAtStep( int _step )
{
for( NoteVector::Iterator it = m_notes.begin(); it != m_notes.end();
++it )
@@ -775,13 +775,13 @@ void patternView::mousePressEvent( QMouseEvent * _me )
return;
}
note * n = m_pat->getNoteAtStep( step );
note * n = m_pat->noteAtStep( step );
// if note at step not found, ensureBeatNotes and try again
if( n == NULL )
{
m_pat -> ensureBeatNotes();
n = m_pat->getNoteAtStep( step );
n = m_pat->noteAtStep( step );
if( n == NULL ) // still can't find a note? bail!
{
qDebug( "Something went wrong in pattern.cpp: couldn't add note at step %d!", step );
@@ -1049,13 +1049,13 @@ void patternView::paintEvent( QPaintEvent * )
for( int it = 0; it < steps; it++ ) // go through all the steps in the beat pattern
{
note * n = m_pat->getNoteAtStep( it );
note * n = m_pat->noteAtStep( it );
// figure out x and y coordinates for step graphic
const int x = TCO_BORDER_WIDTH + static_cast<int>( it * w / steps );
const int y = height() - s_stepBtnOff->height() - 1;
// get volume and length of note, if getNoteAtStep returned null
// get volume and length of note, if noteAtStep returned null
// (meaning, note at step doesn't exist for some reason)
// then set both at zero, ie. treat as an off step
const int vol = ( n != NULL ? n->getVolume() : 0 );