From f1cb7c8d8df1f9ad71f1f029775ab814de28f17e Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Sat, 23 Dec 2006 18:53:04 +0000 Subject: [PATCH] fixed kicker segfault git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@447 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 5 +++++ configure.in | 4 ++-- plugins/kicker/kicker.cpp | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index df83a6f18..a1bec31e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-23 Javier Serrano Polo + + * plugins/kicker/kicker.cpp: + fixed envelope segfault + 2006-12-21 Tobias Doerffel * include/note_play_handle.h: diff --git a/configure.in b/configure.in index a46526a04..6f233063f 100644 --- a/configure.in +++ b/configure.in @@ -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) diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp index 908d50e58..fd4130039 100644 --- a/plugins/kicker/kicker.cpp +++ b/plugins/kicker/kicker.cpp @@ -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( desiredReleaseFrames()-_n->releaseFramesDone(), - eng()->getMixer()->framesPerAudioBuffer() ) + tMax( tMin( desiredReleaseFrames() - + _n->releaseFramesDone(), + eng()->getMixer()->framesPerAudioBuffer() ), 0 ) : eng()->getMixer()->framesPerAudioBuffer(); const float f1 = m_startFreqKnob->value() + tfp * fdiff / decfr;