From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 11 Nov 2013 20:45:41 +0000 (+0100)
Subject: graphers : fix default window function
X-Git-Tag: 0.5.1-2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7c8f258de608c3647da814f8e2d6c26de1038910;p=timeside.git

graphers : fix default window function
---

diff --git a/timeside/grapher/core.py b/timeside/grapher/core.py
index e6de9ad..556e3e5 100644
--- a/timeside/grapher/core.py
+++ b/timeside/grapher/core.py
@@ -37,7 +37,7 @@ from utils import *
 class Spectrum(object):
     """ FFT based frequency analysis of audio frames."""
 
-    def __init__(self, fft_size, samplerate, blocksize, totalframes, lower, higher, window_function=numpy.hanning):
+    def __init__(self, fft_size, samplerate, blocksize, totalframes, lower, higher, window_function=None):
         self.fft_size = fft_size
         self.window = window_function(self.fft_size)
         self.window_function = window_function
@@ -52,6 +52,13 @@ class Spectrum(object):
         self.samplerate = samplerate
         self.window_function = window_function
         self.window = self.window_function(self.blocksize)
+        # Hanning window by default
+        if self.window_function:
+            self.window = self.window_function(self.blocksize)
+        else:
+            self.window_function = numpy.hanning
+            self.window = self.window_function(self.blocksize)
+
 
     def process(self, frames, eod, spec_range=120.0):
         """ Returns a tuple containing the spectral centroid and the spectrum (dB scales) of the input audio frames.