fixed kicker segfault

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@447 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2006-12-23 18:53:04 +00:00
parent 4fcf923680
commit f1cb7c8d8d
3 changed files with 10 additions and 4 deletions

View File

@@ -1,3 +1,8 @@
2006-12-23 Javier Serrano Polo <jasp00/at/terra/dot/es>
* plugins/kicker/kicker.cpp:
fixed envelope segfault
2006-12-21 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* include/note_play_handle.h:

View File

@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(lmms, 0.2.1-svn20061221, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20061221)
AC_INIT(lmms, 0.2.1-svn20061223, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20061223)
AM_CONFIG_HEADER(config.h)

View File

@@ -193,8 +193,9 @@ void kickerInstrument::playNote( notePlayHandle * _n, bool )
//const float freq = getInstrumentTrack()->frequency( _n ) / 2;
const float fdiff = m_endFreqKnob->value() - m_startFreqKnob->value();
const fpab_t frames = _n->released() ?
tMin<f_cnt_t>( desiredReleaseFrames()-_n->releaseFramesDone(),
eng()->getMixer()->framesPerAudioBuffer() )
tMax( tMin<f_cnt_t>( desiredReleaseFrames() -
_n->releaseFramesDone(),
eng()->getMixer()->framesPerAudioBuffer() ), 0 )
:
eng()->getMixer()->framesPerAudioBuffer();
const float f1 = m_startFreqKnob->value() + tfp * fdiff / decfr;