mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-10 07:47:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix sliding of waveform when drawing sample in reverse (#7063)

Browse Source
This commit is contained in:
saker
2024-01-13 21:05:18 -05:00
committed by GitHub
parent 85399c12c2
commit b67c53ad29
7 changed files with 62 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/AudioFileProcessor/AudioFileProcessor.cpp
View File

@@ -719,7 +719,7 @@ void AudioFileProcessorWaveView::updateSampleRange()
{
const f_cnt_t marging = (m_sample->endFrame() - m_sample->startFrame()) * 0.1;
m_from = qMax(0, m_sample->startFrame() - marging);
m_to = qMin(m_sample->endFrame() + marging, m_sample->sampleSize());
m_to = qMin<size_t>(m_sample->endFrame() + marging, m_sample->sampleSize());
}
}
@@ -1014,7 +1014,11 @@ void AudioFileProcessorWaveView::updateGraph()
m_graph.fill( Qt::transparent );
QPainter p( &m_graph );
p.setPen( QColor( 255, 255, 255 ) );
SampleWaveform::visualize(*m_sample, p, QRect(0, 0, m_graph.width(), m_graph.height()), m_from, m_to);
const auto rect = QRect{0, 0, m_graph.width(), m_graph.height()};
const auto waveform = SampleWaveform::Parameters{
m_sample->data() + m_from, static_cast<size_t>(m_to - m_from), m_sample->amplification(), m_sample->reversed()};
SampleWaveform::visualize(waveform, p, rect);
}
@@ -1076,8 +1080,8 @@ void AudioFileProcessorWaveView::slide( int _px )
step = -step;
}
f_cnt_t step_from = qBound(0, m_from + step, m_sample->sampleSize()) - m_from;
f_cnt_t step_to = qBound(m_from + 1, m_to + step, m_sample->sampleSize()) - m_to;
f_cnt_t step_from = qBound<size_t>(0, m_from + step, m_sample->sampleSize()) - m_from;
f_cnt_t step_to = qBound<size_t>(m_from + 1, m_to + step, m_sample->sampleSize()) - m_to;
step = qAbs( step_from ) < qAbs( step_to ) ? step_from : step_to;