From 164616d45a987a374e29c6afe94046ed5ee48112 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 16 Dec 2008 04:45:49 +0000 Subject: [PATCH] fixed mixer crash, for realz this time git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1939 0778d3d1-df1d-0410-868b-ea421aaaa00d --- src/tracks/instrument_track.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index 451a653f2..b3fcd6230 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -176,14 +176,16 @@ void instrumentTrack::processAudioBuffer( sampleFrame * _buf, } m_audioPort.setNextFxChannel( m_effectChannelModel.value() ); + + int panning = m_panningModel.value(); + if( _n != NULL ) + { + panning += _n->getPanning(); + } engine::getMixer()->bufferToPort( _buf, ( _n != NULL ) ? qMin(_n->framesLeftForCurrentPeriod(), _frames ) : _frames, ( _n != NULL ) ? _n->offset() : 0, - panningToVolumeVector( - (int) m_panningModel.value() + - ( _n != NULL ) ? _n->getPanning() : 0, - v_scale ), - &m_audioPort ); + panningToVolumeVector( panning, v_scale ), &m_audioPort ); }