fix bad tools module for scripts

diff --git a/timeside/__init__.py b/timeside/__init__.py
index 81ad004632f0385b7a38c9208e184562fe18de9a..d5f34e63cda98f05af8a45d2d650cf7636becfd2 100644 (file)
--- a/timeside/__init__.py
+++ b/timeside/__init__.py
@@ -2,7 +2,3 @@
 
 from core import *
 from metadata import Metadata
-import decoder
-import encoder
-import analyzer
-import grapher

diff --git a/timeside/tools/grapher_scheme.py b/timeside/tools/grapher_scheme.py
deleted file mode 100644 (file)
index 4549767..0000000
--- a/timeside/tools/grapher_scheme.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-class GrapherScheme:
-
-    def __init__(self):
-
-        self.color_scheme = {
-            'waveform': [
-                        (50,0,200), (0,220,80), (255,224,0), (255,0,0)
-                        ],
-            'spectrogram': [
-                        (0, 0, 0), (58/4,68/4,65/4), (80/2,100/2,153/2), (90,180,100), (224,224,44), (255,60,30), (255,255,255)
-                           ]}
-
-        self.width = 2048
-        self.height = 128
-        self.bg_color = (255,255,255)
-        self.force = True
-

diff --git a/timeside/tools/waveform_batch.py b/timeside/tools/waveform_batch.py
index bba50369c3d51a6f80ed8131fce2047e0762cbb0..dfa75fde605a98390fb691958a67310a4d937618 100644 (file)
--- a/timeside/tools/waveform_batch.py
+++ b/timeside/tools/waveform_batch.py
@@ -27,7 +27,24 @@ import sys
 from timeside.core import *
 from timeside.decoder import *
 from timeside.grapher import *
-from grapher_scheme import *
+
+
+class GrapherScheme:
+
+    def __init__(self):
+
+        self.color_scheme = {
+            'waveform': [
+                        (50,0,200), (0,220,80), (255,224,0), (255,0,0)
+                        ],
+            'spectrogram': [
+                        (0, 0, 0), (58/4,68/4,65/4), (80/2,100/2,153/2), (90,180,100), (224,224,44), (255,60,30), (255,255,255)
+                           ]}
+
+        self.width = 2048
+        self.height = 128
+        self.bg_color = (255,255,255)
+        self.force = True
 
 
 class Media2Waveform(object):