add travis test

diff --git a/.travis.yml b/.travis.yml
index 4c991a377e47dbba7340f2dc0277b87e51b2365f..78e87dd715f972098f03ecc6ec0f2f2610d4a081 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,9 @@ python:
   - "2.7"
 # command to install dependencies
 install: 
- - "pip install -r requirements.txt --use-mirrors"
+# - "pip install -r requirements.txt --use-mirrors"
+ - "python setup.py install"
+
 # command to run tests
 script:
- - "python setup.py install"
- #- "python setup.py install"
+ - "python tests/testcomponent.py"

diff --git a/timeside/__init__.py b/timeside/__init__.py
index d7db4c10d15c52d0621a9a52e697f90c938940cf..93433a3abe379a6fbbbad84f3e449ad9307b2dc0 100644 (file)
--- a/timeside/__init__.py
+++ b/timeside/__init__.py
@@ -9,7 +9,7 @@ import timeside.decoder
 import timeside.encoder
 import timeside.grapher
 import timeside.analyzer
+import timeside.tools
 from timeside.core import *
-from timeside.gstutils import *
 
 __version__ = '0.4.2'

diff --git a/timeside/decoder/core.py b/timeside/decoder/core.py
index c58f20bba80fe608765be0ac042a2587807b8232..e9ee3b8fc34de3fd8f30b562f4b24f9a1ebc13a2 100644 (file)
--- a/timeside/decoder/core.py
+++ b/timeside/decoder/core.py
@@ -26,7 +26,7 @@
 
 from timeside.core import Processor, implements, interfacedoc
 from timeside.api import IDecoder
-from timeside.gstutils import *
+from timeside.tools import *
 
 import Queue
 

diff --git a/timeside/encoder/core.py b/timeside/encoder/core.py
index 1703aa734accca762e7ccfa3253c5d65e7ec064e..f957b1d1a033fe4f70014431cc2bc3324186154d 100644 (file)
--- a/timeside/encoder/core.py
+++ b/timeside/encoder/core.py
@@ -21,7 +21,7 @@
 
 from timeside.core import Processor, implements, interfacedoc
 from timeside.api import IEncoder
-from timeside.gstutils import *
+from timeside.tools import *
 
 
 class GstEncoder(Processor):

diff --git a/timeside/encoder/flac.py b/timeside/encoder/flac.py
index cca90e3e357a76847be304d5f94c16f333c66f71..e9c488f3438a3809b1faa27f8c6e6f87fdf53897 100644 (file)
--- a/timeside/encoder/flac.py
+++ b/timeside/encoder/flac.py
@@ -22,7 +22,7 @@
 from timeside.core import Processor, implements, interfacedoc
 from timeside.encoder.core import GstEncoder
 from timeside.api import IEncoder
-from timeside.gstutils import *
+from timeside.tools import *
 
 
 class FlacEncoder(GstEncoder):

diff --git a/timeside/encoder/m4a.py b/timeside/encoder/m4a.py
index b312e7d11fe93943b0f11884c975b9c9de0aa473..311456761d98a75626b84c36d835fc6bc67a20ea 100644 (file)
--- a/timeside/encoder/m4a.py
+++ b/timeside/encoder/m4a.py
@@ -22,7 +22,7 @@
 from timeside.core import Processor, implements, interfacedoc
 from timeside.encoder.core import GstEncoder
 from timeside.api import IEncoder
-from timeside.gstutils import *
+from timeside.tools import *
 
 
 class AacEncoder(GstEncoder):

diff --git a/timeside/encoder/mp3.py b/timeside/encoder/mp3.py
index 21c0b39565dde29c8072eac78c4a8fb3d53f6996..f2ce3d9ef4f6c3322a974bb928a31378ccf7d821 100644 (file)
--- a/timeside/encoder/mp3.py
+++ b/timeside/encoder/mp3.py
@@ -27,7 +27,7 @@
 from timeside.core import Processor, implements, interfacedoc
 from timeside.encoder.core import GstEncoder
 from timeside.api import IEncoder
-from timeside.gstutils import *
+from timeside.tools import *
 
 import mutagen
 

diff --git a/timeside/encoder/ogg.py b/timeside/encoder/ogg.py
index 0442615bbe1248a40ee6c0f714722ab9d38bf37c..f222c4e2820283f5d3d4a1dddba266bbb73874a0 100644 (file)
--- a/timeside/encoder/ogg.py
+++ b/timeside/encoder/ogg.py
@@ -22,7 +22,7 @@
 from timeside.core import Processor, implements, interfacedoc
 from timeside.encoder.core import GstEncoder
 from timeside.api import IEncoder
-from timeside.gstutils import *
+from timeside.tools import *
 
 class VorbisEncoder(GstEncoder):
     """ gstreamer-based vorbis encoder """

diff --git a/timeside/encoder/wav.py b/timeside/encoder/wav.py
index 94bc2cbec0be4db22eb8e7da21b68a1dead77b3e..e898d8a37ac41b22d2f18d789213fa763c5f6ae4 100644 (file)
--- a/timeside/encoder/wav.py
+++ b/timeside/encoder/wav.py
@@ -23,7 +23,7 @@
 from timeside.core import Processor, implements, interfacedoc
 from timeside.encoder.core import GstEncoder
 from timeside.api import IEncoder
-from timeside.gstutils import *
+from timeside.tools import *
 
 
 class WavEncoder(GstEncoder):

diff --git a/timeside/gstutils.py b/timeside/gstutils.py
deleted file mode 100644 (file)
index 2c60a36..0000000
--- a/timeside/gstutils.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from numpy import array, getbuffer, frombuffer
-
-import pygst
-pygst.require('0.10')
-import gst
-import gobject
-
-gobject.threads_init()
-
-def numpy_array_to_gst_buffer(frames):
-    """ gstreamer buffer to numpy array conversion """
-    buf = gst.Buffer(getbuffer(frames.astype("float32")))
-    return buf
-
-def gst_buffer_to_numpy_array(buf, chan):
-    """ gstreamer buffer to numpy array conversion """
-    samples = frombuffer(buf.data, dtype='float32')
-    samples.resize([len(samples)/chan, chan])
-    return samples

diff --git a/timeside/tools/gstutils.py b/timeside/tools/gstutils.py
new file mode 100644 (file)
index 0000000..2c60a36
--- /dev/null
+++ b/timeside/tools/gstutils.py
@@ -0,0 +1,19 @@
+from numpy import array, getbuffer, frombuffer
+
+import pygst
+pygst.require('0.10')
+import gst
+import gobject
+
+gobject.threads_init()
+
+def numpy_array_to_gst_buffer(frames):
+    """ gstreamer buffer to numpy array conversion """
+    buf = gst.Buffer(getbuffer(frames.astype("float32")))
+    return buf
+
+def gst_buffer_to_numpy_array(buf, chan):
+    """ gstreamer buffer to numpy array conversion """
+    samples = frombuffer(buf.data, dtype='float32')
+    samples.resize([len(samples)/chan, chan])
+    return samples