Fixes

cnn_madmom/segment.py

@@ -3,6 +3,7 @@ import numpy as np
 import sys
 import matplotlib.pyplot as plt
 from scipy.ndimage.filters import maximum_filter
+import scipy.signal as sg
 
 
 def segment(songfile):
@@ -14,7 +15,7 @@ def segment(songfile):
     spectral = madmom.features.onsets.SpectralOnsetProcessor('complex_domain')
 
 
-    spec = spec = madmom.audio.spectrogram.Spectrogram(songfile, num_channels=1)
+    spec = madmom.audio.spectrogram.Spectrogram(songfile, num_channels=1)
     filt_spec = madmom.audio.spectrogram.FilteredSpectrogram(spec, filterbank=madmom.audio.filters.LogFilterbank, num_bands=24)
     log_spec = madmom.audio.spectrogram.LogarithmicSpectrogram(filt_spec, add=1)
 
@@ -57,13 +58,14 @@ if __name__ == "__main__":
     cnn = madmom.features.onsets.CNNOnsetProcessor()
     spectral = madmom.features.onsets.SpectralOnsetProcessor('modified_kullback_leibler')
 
+    sig = madmom.audio.signal.Signal(songfile, num_channels=1)
 
-    spec = spec = madmom.audio.spectrogram.Spectrogram(songfile, num_channels=1)
+    spec = madmom.audio.spectrogram.Spectrogram(sig)
     filt_spec = madmom.audio.spectrogram.FilteredSpectrogram(spec, filterbank=madmom.audio.filters.LogFilterbank, num_bands=24)
     log_spec = madmom.audio.spectrogram.LogarithmicSpectrogram(filt_spec, add=1)
 
-    cnn_function = cnn(songfile, num_channels=1)
-    spectral_function = spectral(songfile, num_channels=1)
+    cnn_function = cnn(sig)
+    spectral_function = spectral(sig)
     spectral_function = spectral_function/(spectral_function.max())
     
     #activation_function = 0.5*cnn_function + 0.5*spectral_function