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

various GUI-fixes and other stuff

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@605 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2007-11-21 21:41:36 +00:00
parent f8c17137ad
commit 9ad71a975e
12 changed files with 82 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/sample_buffer.cpp
View File

@@ -200,7 +200,7 @@ void sampleBuffer::update( bool _keep_settings )
else if( m_audioFile != "" )
{
QString file = tryToMakeAbsolute( m_audioFile );
const char * f = file.toAscii().constData();
char * f = qstrdup( file.toAscii().constData() );
int_sample_t * buf = NULL;
ch_cnt_t channels = DEFAULT_CHANNELS;
sample_rate_t samplerate = SAMPLE_RATES[DEFAULT_QUALITY_LEVEL];
@@ -234,6 +234,8 @@ void sampleBuffer::update( bool _keep_settings )
samplerate );
}
delete[] f;
if( m_frames > 0 && buf != NULL )
{
// following code transforms int-samples into
@@ -764,24 +766,25 @@ void sampleBuffer::visualize( QPainter & _p, const QRect & _dr,
const int w = _dr.width();
const int h = _dr.height();
const Uint16 y_base = h / 2 + _dr.y();
const float y_base = h / 2 + _dr.y();
const float y_space = h / 2;
const QRect isect = _dr.intersect( _clip );
int old_y[DEFAULT_CHANNELS] = { y_base, y_base };
_p.setPen( QPen( _p.pen().color(), 0.5 ) );
const f_cnt_t fpp = tLimit<f_cnt_t>( m_frames / w, 1, 20 );
int old_x = _clip.x();
for( f_cnt_t frame = 0; frame < m_frames; frame += fpp )
{
const int x = _dr.x() + static_cast<int>( frame /
const float x = _dr.x() + ( frame /
(float) m_frames * _dr.width() );
for( ch_cnt_t chnl = 0; chnl < DEFAULT_CHANNELS; ++chnl )
{
const Uint16 y = y_base - static_cast<Uint16>(
const Uint16 y = y_base - (
m_data[frame][chnl] * y_space );
_p.drawLine( old_x, old_y[chnl], x, y );
_p.drawLine( QLineF( old_x, old_y[chnl], x, y+0.5 ) );
old_y[chnl] = y;
}
old_x = x;