summaryrefslogtreecommitdiff
path: root/voctocore
diff options
context:
space:
mode:
authorMaZderMind <peter@mazdermind.de>2014-08-22 19:09:57 +0200
committerMaZderMind <peter@mazdermind.de>2014-08-22 19:09:57 +0200
commit60176b4e7be9dcccfd3164b7a4ac4019c7a5da8e (patch)
treedc3f83f799e1d9843d0bd12f1e1237045f5f476f /voctocore
parent04e90a74e1a84de1bf6fe7779c7c5fb676dc3778 (diff)
move code-parts to lib-folder
Diffstat (limited to 'voctocore')
-rw-r--r--voctocore/lib/__init__.py0
-rw-r--r--voctocore/lib/controlserver.py (renamed from voctocore/controlserver.py)0
-rw-r--r--voctocore/lib/videomix.py (renamed from voctocore/videomix.py)2
-rwxr-xr-xvoctocore/voctocore.py9
4 files changed, 5 insertions, 6 deletions
diff --git a/voctocore/lib/__init__.py b/voctocore/lib/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/voctocore/lib/__init__.py
diff --git a/voctocore/controlserver.py b/voctocore/lib/controlserver.py
index e11d6a8..e11d6a8 100644
--- a/voctocore/controlserver.py
+++ b/voctocore/lib/controlserver.py
diff --git a/voctocore/videomix.py b/voctocore/lib/videomix.py
index 66068fb..f98582a 100644
--- a/voctocore/videomix.py
+++ b/voctocore/lib/videomix.py
@@ -1,7 +1,7 @@
import sys, inspect, math
from pprint import pprint
from gi.repository import GLib, Gst
-from controlserver import controlServerEntrypoint
+from lib.controlserver import controlServerEntrypoint
class Videomix:
"""mixing, streaming and encoding pipeline constuction and control"""
diff --git a/voctocore/voctocore.py b/voctocore/voctocore.py
index bec2c03..454a09d 100755
--- a/voctocore/voctocore.py
+++ b/voctocore/voctocore.py
@@ -1,6 +1,5 @@
#!/usr/bin/python3
-import gi
-import signal
+import gi, signal
# import GStreamer and GTK-Helper classes
gi.require_version('Gst', '1.0')
@@ -11,8 +10,8 @@ GObject.threads_init()
Gst.init(None)
# import local classes
-from videomix import Videomix
-from controlserver import ControlServer
+from lib.videomix import Videomix
+from lib.controlserver import ControlServer
class Main:
def __init__(self):
@@ -25,7 +24,7 @@ def runmain():
signal.signal(signal.SIGINT, signal.SIG_DFL)
# start main-class and main-loop
- start=Main()
+ start = Main()
Gtk.main()
if __name__ == '__main__':