Skip to content

Commit

Permalink
Replaced m_ppt with m_ppb
Browse files Browse the repository at this point in the history
  • Loading branch information
tecknixia committed Nov 1, 2019
1 parent 0c132d1 commit 0b049c1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/gui/editors/AutomationEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -796,8 +796,8 @@ void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
// and check whether the cursor is over an
// existing value
if ((it + 1 == time_map.end() || pos_ticks <= (it + 1).key())
&& pos_ticks >= (it.key() - MidiTime::ticksPerBar() * 12 / m_ppt)
&& pos_ticks <= (it.key() + MidiTime::ticksPerBar() * 12 / m_ppt)
&& pos_ticks >= (it.key() - MidiTime::ticksPerBar() * 12 / m_ppb)
&& pos_ticks <= (it.key() + MidiTime::ticksPerBar() * 12 / m_ppb)
&& level > (it.value() - maxLvlFraction)
&& level < (it.value() + maxLvlFraction))
{
Expand Down Expand Up @@ -1726,7 +1726,7 @@ void AutomationEditor::wheelEvent(QWheelEvent * we )
bool enableYScrolling = true;
float maxLvlFraction = m_pattern->firstObject()->maxValue<float>()
* 0.05;
int pos_ticks = x * MidiTime::ticksPerBar() / m_ppt
int pos_ticks = x * MidiTime::ticksPerBar() / m_ppb
+ m_currentPosition;
timeMap & time_map = m_pattern->getTimeMap();
timeMap::iterator it = time_map.begin();
Expand All @@ -1735,9 +1735,9 @@ void AutomationEditor::wheelEvent(QWheelEvent * we )
{
pos_ticks = (pos_ticks < 0) ? 0 : pos_ticks;

if (pos_ticks >= it.key() - MidiTime::ticksPerBar() * 12 / m_ppt
if (pos_ticks >= it.key() - MidiTime::ticksPerBar() * 12 / m_ppb
&& (it+1==time_map.end() || pos_ticks <= (it+1).key())
&& (pos_ticks<= it.key() + MidiTime::ticksPerBar() * 12 / m_ppt)
&& (pos_ticks<= it.key() + MidiTime::ticksPerBar() * 12 / m_ppb)
&& (level > it.value() - maxLvlFraction)
&& (level < it.value() + maxLvlFraction))
{
Expand Down

0 comments on commit 0b049c1

Please sign in to comment.