[SCM] calf/master: More cleanups.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6c029000108fd00ca15642723d218b5492fc14b3
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sat Apr 10 01:03:05 2010 +0100

    More cleanups.
    
    Sort out dependencies. Do not create a vector<> that's never used in All Sounds
    Off / All Notes Off handling.

diff --git a/src/calf/organ.h b/src/calf/organ.h
index d7177d4..3810660 100644
--- a/src/calf/organ.h
+++ b/src/calf/organ.h
@@ -22,6 +22,7 @@
 #ifndef __CALF_ORGAN_H
 #define __CALF_ORGAN_H
 
+#include "audio_fx.h"
 #include "envelope.h"
 #include "metadata.h"
 #include "osc.h"
diff --git a/src/calf/synth.h b/src/calf/synth.h
index d009830..3495078 100644
--- a/src/calf/synth.h
+++ b/src/calf/synth.h
@@ -22,8 +22,10 @@
 #ifndef __CALF_SYNTH_H
 #define __CALF_SYNTH_H
 
-#include "audio_fx.h"
+#include <assert.h>
+#include <math.h>
 #include <memory.h>
+#include <stdint.h>
 #include <bitset>
 #include <list>
 #include <stack>
diff --git a/src/giface.cpp b/src/giface.cpp
index f070373..9aa8934 100644
--- a/src/giface.cpp
+++ b/src/giface.cpp
@@ -19,12 +19,9 @@
  * Boston, MA  02110-1301  USA
  */
 #include <config.h>
-#include <assert.h>
-#include <memory.h>
 #include <calf/giface.h>
 #include <calf/osctlnet.h>
 #include <calf/utils.h>
-#include <stdio.h>
 
 using namespace std;
 using namespace calf_utils;
diff --git a/src/modules.cpp b/src/modules.cpp
index 350e449..d6bd593 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -21,9 +21,6 @@
 #include <config.h>
 #include <assert.h>
 #include <memory.h>
-#if USE_JACK
-#include <jack/jack.h>
-#endif
 #include <calf/giface.h>
 #include <calf/metadata.h>
 #include <calf/audio_fx.h>
diff --git a/src/modules_dsp.cpp b/src/modules_dsp.cpp
index bf2e2e9..5b8268c 100644
--- a/src/modules_dsp.cpp
+++ b/src/modules_dsp.cpp
@@ -18,13 +18,8 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
  * Boston, MA  02110-1301  USA
  */
-#include <config.h>
-#include <assert.h>
 #include <limits.h>
 #include <memory.h>
-#if USE_JACK
-#include <jack/jack.h>
-#endif
 #include <calf/giface.h>
 #include <calf/modules.h>
 #include <calf/modules_dev.h>
diff --git a/src/synth.cpp b/src/synth.cpp
index 47fa95f..fcda18b 100644
--- a/src/synth.cpp
+++ b/src/synth.cpp
@@ -18,13 +18,6 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
  * Boston, MA  02110-1301  USA
  */
-#include <config.h>
-#include <assert.h>
-#include <memory.h>
-#if USE_JACK
-#include <jack/jack.h>
-#endif
-#include <calf/giface.h>
 #include <calf/synth.h>
 
 using namespace dsp;
@@ -177,8 +170,6 @@ void basic_synth::control_change(int ctl, int val)
         }
     }
     if (ctl == 123 || ctl == 120) { // all notes off, all sounds off
-        vector<int> notes;
-        notes.reserve(128);
         if (ctl == 120) { // for "all sounds off", automatically release hold and sostenuto pedal
             control_change(66, 0);
             control_change(64, 0);

-- 
calf audio plugins packaging