Changed from floats to doubles in the C/C++ code, makes Python integration a bit easier. Fixed a bug that would cause SndObjSynthesis to crash if peak values were floats.

4 files changed, 52 insertions, 17 deletions

diff --git a/examples/plotpartials.py b/examples/plotpartials.py
index 64974d5..c16fc1b 100644
--- a/examples/plotpartials.py
+++ b/examples/plotpartials.py
@@ -16,12 +16,11 @@
 
 import simpl
 import simpl.plot
-import numpy as np
 from scipy.io.wavfile import read
 
-input_file = '../test/audio/flute.wav'
+input_file = '../tests/audio/flute.wav'
 audio_in_data = read(input_file)
-audio_in = np.asarray(audio_in_data[1], np.float32) / 32768.0  # values between -1 and 1
+audio_in = simpl.asarray(audio_in_data[1]) / 32768.0  # values between -1 and 1
 sample_rate = audio_in_data[0]
 
 # take just the first few frames
diff --git a/examples/plotpeaks.py b/examples/plotpeaks.py
index 200b803..0132ba6 100644
--- a/examples/plotpeaks.py
+++ b/examples/plotpeaks.py
@@ -16,12 +16,11 @@
 
 import simpl
 import simpl.plot
-import numpy as np
 from scipy.io.wavfile import read
 
-input_file = '../test/audio/flute.wav'
+input_file = '../tests/audio/flute.wav'
 audio_in_data = read(input_file)
-audio_in = np.asarray(audio_in_data[1], np.float32) / 32768.0  # values between -1 and 1
+audio_in = simpl.asarray(audio_in_data[1]) / 32768.0  # values between -1 and 1
 sample_rate = audio_in_data[0]
 
 # take just the first few frames
diff --git a/examples/resynth.py b/examples/resynth.py
new file mode 100644
index 0000000..ae4b6ec
--- /dev/null
+++ b/examples/resynth.py
@@ -0,0 +1,39 @@
+# Copyright (c) 2009 John Glover, National University of Ireland, Maynooth
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+import simpl
+import numpy as np
+from scipy.io.wavfile import read, write
+
+input_file = '../tests/audio/flute.wav'
+output_file = 'resynth.wav'
+
+audio_data = read(input_file)
+audio = simpl.asarray(audio_data[1]) / 32768.0  # values between -1 and 1
+sample_rate = audio_data[0]
+
+pd = simpl.SMSPeakDetection()
+pd.max_peaks = 40
+pd.hop_size = 512
+peaks = pd.find_peaks(audio)
+pt = simpl.MQPartialTracking()
+pt.max_partials = 20
+partials = pt.find_partials(peaks)
+sndobj_synth = simpl.SndObjSynthesis()
+
+audio_out = sndobj_synth.synth(partials)
+audio_out = np.asarray(audio_out * 32768, np.int16)
+write(output_file, 44100, audio_out)
diff --git a/examples/timestretch.py b/examples/timestretch.py
index 874b567..af9cfb4 100644
--- a/examples/timestretch.py
+++ b/examples/timestretch.py
@@ -14,32 +14,30 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-from simpl import SndObjPeakDetection, SndObjPartialTracking, SndObjSynthesis
+import simpl
 from simpl.fx import time_stretch
 from scipy.io.wavfile import read, write
 import numpy as np
-import time
 
-input_file = '../test/audio/sinechirpsine.wav'
-output_file = 'scs_2x_sndobj.wav'
+input_file = '../tests/audio/flute.wav'
+output_file = 'flute_2x.wav'
 time_stretch_factor = 2
 
-start_time = time.time()
 audio_in_data = read(input_file)
-audio_in = np.asarray(audio_in_data[1], np.float32) / 32768.0  # values between -1 and 1
+audio_in = simpl.asarray(audio_in_data[1]) / 32768.0  # values between -1 and 1
 sample_rate = audio_in_data[0]
 
 print "Time stretching", input_file, "by a factor of", time_stretch_factor
-pd = SndObjPeakDetection()
+pd = simpl.SndObjPeakDetection()
 pd.max_peaks = 100
 peaks = pd.find_peaks(audio_in)
-pt = SndObjPartialTracking()
+pt = simpl.SndObjPartialTracking()
 pt.max_partials = 10
 partials = pt.find_partials(peaks)
 partials = time_stretch(partials, time_stretch_factor)
-sndobj_synth = SndObjSynthesis()
+sndobj_synth = simpl.SndObjSynthesis()
 audio_out = sndobj_synth.synth(partials)
 audio_out = np.asarray(audio_out * 32768, np.int16)
-print "Execution time:", time.time() - start_time, "seconds"
 print "Writing output to", output_file
-write(output_file, 44100, audio_out)
\ No newline at end of file
+write(output_file, 44100, audio_out)
+