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

Always highlight the beats in PianoRoll and AutomationEditor using only time signature (#3458)

Browse Source 
* Duration of the beat is defined by the denominator of the time signature
and it does not depend on whether or not you use triplets.

* Fortmatting fixed.
This commit is contained in:
z-up
2017-03-28 16:27:56 +03:00
committed by Umcaruje
parent 517417f0ca
commit 9c5a334fdd
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/editors/AutomationEditor.cpp
View File

@@ -1253,13 +1253,6 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
int ticksPerBeat = DefaultTicksPerTact /
Engine::getSong()->getTimeSigModel().getDenominator();
// triplet mode occurs if the note quantization isn't a multiple of 3
// note that the automation editor does not support triplets yet
if( AutomationPattern::quantization() % 3 != 0 )
{
ticksPerBeat = static_cast<int>( ticksPerBeat * 2.0/3.0 );
}
for( tick = m_currentPosition - m_currentPosition % ticksPerBeat,
x = xCoordOfTick( tick );
x<=width();

6
src/gui/editors/PianoRoll.cpp
View File

@@ -2913,12 +2913,6 @@ void PianoRoll::paintEvent(QPaintEvent * pe )
int ticksPerBeat = DefaultTicksPerTact /
Engine::getSong()->getTimeSigModel().getDenominator();
// triplet mode occurs if the note quantization isn't a multiple of 3
if( quantization() % 3 != 0 )
{
ticksPerBeat = static_cast<int>( ticksPerBeat * 2.0/3.0 );
}
for( tick = m_currentPosition - m_currentPosition % ticksPerBeat,
x = xCoordOfTick( tick ); x <= width();
tick += ticksPerBeat, x = xCoordOfTick( tick ) )