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

* fixed out-of-boundary array access when reversing samples

Browse Source 
* optimized loops for loading samples



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1793 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-10-25 10:12:44 +00:00
parent c10eeed4a9
commit 9e4e576de9
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/sample_buffer.cpp
View File

@@ -215,35 +215,30 @@ void sampleBuffer::update( bool _keep_settings )
const float fac = m_amplification /
OUTPUT_SAMPLE_MULTIPLIER;
m_data = new sampleFrame[m_frames];
const int ch = ( channels > 1 ) ? 1 : 0;
// if reversing is on, we also reverse when
// scaling
if( m_reversed )
{
int idx = ( m_frames - 1 ) * channels;
for( f_cnt_t frame = 0; frame < m_frames;
++frame )
{
for( ch_cnt_t chnl = 0;
chnl < DEFAULT_CHANNELS;
++chnl )
{
const f_cnt_t idx = ( m_frames - frame ) * channels + ( chnl % channels );
m_data[frame][chnl] = buf[idx] * fac;
}
m_data[frame][0] = buf[idx+0] * fac;
m_data[frame][1] = buf[idx+ch] * fac;
idx -= channels;
}
}
else
{
int idx = 0;
for( f_cnt_t frame = 0; frame < m_frames;
++frame )
{
for( ch_cnt_t chnl = 0;
chnl < DEFAULT_CHANNELS;
++chnl )
{
const f_cnt_t idx = frame * channels + ( chnl % channels );
m_data[frame][chnl] = buf[idx] * fac;
}
m_data[frame][0] = buf[idx+0] * fac;
m_data[frame][1] = buf[idx+ch] * fac;
idx += channels;
}
}