From bfb3a7f4073e6f9b56a5c8910e4ccb6e6b49fa91 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Sat, 4 Oct 2008 23:22:54 +0000
Subject: [PATCH] moved constants out of loop

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1743 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog                 | 23 +++++++++++++++++++++++
 plugins/kicker/kicker.cpp | 12 +++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7cfef96ca..809b9609e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2008-10-04	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* plugins/kicker/kicker.cpp:
+	moved constants out of loop
+
+	* include/types.h:
+	set global alignment via a #define
+
+	* src/gui/piano_roll.cpp:
+	fixed typo
+
+	* src/core/song.cpp:
+	lock mixer while adjusting lengths of notePlayHandles after tempo change
+
+	* src/gui/file_browser.cpp:
+	* src/core/note_play_handle.cpp:
+	* src/core/audio/audio_port.cpp:
+	coding style fixes
+
+	* include/mixer.h:
+	* src/core/mixer.cpp:
+	removed fine-granular locking of various playHandle-vectors, just use
+	one global big lock for everything now - prevents various
+	deadlocks (e.g. when previewing samples in file browser)
+
 	* src/gui/automation_editor.cpp:
 	in erase-mode do not remove values without clicking
 
diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp
index 7b284fcd9..b86da5c3d 100644
--- a/plugins/kicker/kicker.cpp
+++ b/plugins/kicker/kicker.cpp
@@ -151,15 +151,13 @@ void kickerInstrument::playNote( notePlayHandle * _n,
 
 	if( _n->released() )
 	{
+		const float rfd = _n->releaseFramesDone();
+		const float drf = desiredReleaseFrames();
 		for( fpp_t f = 0; f < frames; ++f )
 		{
-			const float fac = 1.0f -
-				(float)( _n->releaseFramesDone()+f ) /
-							desiredReleaseFrames();
-			for( ch_cnt_t ch = 0; ch < DEFAULT_CHANNELS; ++ch )
-			{
-				_working_buffer[f][ch] *= fac;
-			}
+			const float fac = 1.0f - ( rfd+f ) / drf;
+			_working_buffer[f][0] *= fac;
+			_working_buffer[f][1] *= fac;
 		}
 	}