From: yomguy <yomguy@parisson.com>
Date: Mon, 8 Oct 2012 14:10:00 +0000 (+0200)
Subject: add travis test
X-Git-Tag: 0.4.2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=768f6299817e8c37a256d9079ca1492a78c0d1f9;p=timeside.git

add travis test
---

diff --git a/.travis.yml b/.travis.yml
index 4c991a3..78e87dd 100644
--- 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 d7db4c1..93433a3 100644
--- 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 c58f20b..e9ee3b8 100644
--- 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 1703aa7..f957b1d 100644
--- 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 cca90e3..e9c488f 100644
--- 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 b312e7d..3114567 100644
--- 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 21c0b39..f2ce3d9 100644
--- 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 0442615..f222c4e 100644
--- 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 94bc2cb..e898d8a 100644
--- 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
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
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