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

Merge pull request #1594 from teeberg/master

Browse Source 
Minor refactoring
This commit is contained in:
Lukas W
2015-01-11 12:40:15 +01:00
parent afa55cae89 87e597510c
commit 1a7cc5ecf8
5 changed files with 247 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/MidiTime.h
View File

@@ -137,7 +137,8 @@ public:
static int stepsPerTact()
{
return qMax( 1, ticksPerTact() / DefaultBeatsPerTact );
int steps = ticksPerTact() / DefaultBeatsPerTact;
return qMax( 1, steps );
}
static void setTicksPerTact( tick_t _tpt )

6
include/Note.h
View File

@@ -91,9 +91,9 @@ public:
virtual ~Note();
// used by GUI
inline void setSelected( const bool _selected ){ m_selected = _selected; }
inline void setOldKey( const int _oldKey ){ m_oldKey = _oldKey; }
inline void setOldPos( const MidiTime & _oldPos ){ m_oldPos = _oldPos; }
inline void setSelected( const bool _selected ) { m_selected = _selected; }
inline void setOldKey( const int _oldKey ) { m_oldKey = _oldKey; }
inline void setOldPos( const MidiTime & _oldPos ) { m_oldPos = _oldPos; }
inline void setOldLength( const MidiTime & _oldLength )
{
m_oldLength = _oldLength;

2
include/PianoRoll.h
View File

@@ -341,7 +341,7 @@ private:
volume_t m_lastNoteVolume;
panning_t m_lastNotePanning;
int m_startKey; // first key when drawing
int m_startKey; // first key when drawing
int m_lastKey;
editModes m_editMode;

467
src/gui/PianoRoll.cpp
View File

File diff suppressed because it is too large Load Diff

21
src/tracks/Pattern.cpp
View File

@@ -499,12 +499,15 @@ void Pattern::ensureBeatNotes()
for( int i = 0; i < m_steps; ++i )
{
bool found = false;
for( NoteVector::Iterator it = m_notes.begin(); it != m_notes.end(); ++it )
NoteVector::Iterator it;
for( it = m_notes.begin(); it != m_notes.end(); ++it )
{
Note *note = *it;
// if a note in this position is the one we want
if( ( *it )->pos() ==
if( note->pos() ==
( i * MidiTime::ticksPerTact() ) / MidiTime::stepsPerTact()
&& ( *it )->length() <= 0 )
&& note->length() <= 0 )
{
found = true;
break;
@@ -524,10 +527,12 @@ void Pattern::ensureBeatNotes()
for( NoteVector::Iterator it = m_notes.begin(); it != m_notes.end(); )
{
bool needed = false;
Note *note = *it;
for( int i = 0; i < m_steps; ++i )
{
if( ( *it )->pos() == ( i * MidiTime::ticksPerTact() ) / MidiTime::stepsPerTact()
|| ( *it )->length() != 0 )
if( note->pos() == ( i * MidiTime::ticksPerTact() ) / MidiTime::stepsPerTact()
|| note->length() != 0 )
{
needed = true;
break;
@@ -535,10 +540,12 @@ void Pattern::ensureBeatNotes()
}
if( needed == false )
{
delete *it;
delete note;
it = m_notes.erase( it );
}
else ++it;
else {
++it;
}
}
}