diff --git a/python/camerfeed.py b/python/camerfeed.py
new file mode 100644
index 0000000..8de8a32
--- /dev/null
+++ b/python/camerfeed.py
@@ -0,0 +1,19 @@
+#!/bin/env python2
+import pygst
+pygst.require('0.10')
+import gst
+
+MIXER_IP = 'localhost'
+MIXER_PORT = 9999
+
+class CameraFeed(object):
+
+ def __init__(self, pipe, cam_ip):
+ self.pipe = pipe
+ self.cam_ip = cam_ip
+
+ def _run(self):
+ snowmix_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ snowmix_socket.connect((ip, 9999))
+
+
diff --git a/python/clockcontroller.py b/python/clockcontroller.py
new file mode 100644
index 0000000..45dcdbe
--- /dev/null
+++ b/python/clockcontroller.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+import threading
+import time
+from datetime import datetime
+
+class ClockController(object):
+
+ TEXT_ID = 0
+
+ def __init__(self, socket):
+ self.snowmix_socket = socket
+
+ self.update_thread = threading.Thread(target=self.update_clock)
+ self.stopped = False
+ self.update_thread.start()
+
+ def update_clock(self):
+ print "Starting update thread !"
+ while not self.stopped:
+ now = datetime.now()
+ self.update_text(now.strftime("%H:%M:%S"))
+ time.sleep(1.0)
+
+ print "Stopping update thread !"
+
+
+ def update_text(self, text):
+ cmd = "text string %d %s\n" % (self.TEXT_ID,text)
+ self.snowmix_socket.send(cmd)
+
+
+ def stop(self):
+ self.stopped = True
+ self.update_thread.join(5.0)
+
+
+
+
diff --git a/python/scenechanger.py b/python/scenechanger.py
index 96e041e..f31479d 100644
--- a/python/scenechanger.py
+++ b/python/scenechanger.py
@@ -3,12 +3,12 @@
class SceneChanger(object):
def __init__(self, socket):
- self.cur_scene = 1
+ self.cur_scene = 'Full'
self.snowmix_socket = socket
def switch_to(self, next_scene):
if self.cur_scene != next_scene:
- cmd = "Swap%d%d\n" % (self.cur_scene, next_scene)
+ cmd = "overlay finish Show%s\n" % (next_scene)
self.snowmix_socket.send(cmd)
self.cur_scene = next_scene
diff --git a/python/textchanger.py b/python/textchanger.py
deleted file mode 100644
index 485e735..0000000
--- a/python/textchanger.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/env python2
-# -*- coding: utf-8 -*-
-
-class TextChanger(object):
-
- TEXT_ID = 1
- UMLAUTS = {
- 'ä' : 'ae',
- 'ü' : 'ue',
- 'ö' : 'oe',
- 'ß' : 'ss'
- }
-
- def __init__(self, socket):
- self.snowmix_socket = socket
-
-
- def set_text(self, text):
- for umlaut, replacement in self.UMLAUTS.items():
- text = text.replace(umlaut, replacement)
-
- cmd = "text string %d %s\n" % (self.TEXT_ID,text)
- self.snowmix_socket.send(cmd)
-
- def hide_text(self):
- cmd = "text string %d\n" % self.TEXT_ID
- self.snowmix_socket.send(cmd)
-
-
diff --git a/python/timercontroller.py b/python/timercontroller.py
deleted file mode 100644
index 6ab7fba..0000000
--- a/python/timercontroller.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
-import threading
-import time
-from datetime import datetime
-
-class TimerController(object):
-
- TEXT_ID = 2
- UMLAUTS = {
- 'ä' : 'ae',
- 'ü' : 'ue',
- 'ö' : 'oe',
- 'ß' : 'ss'
- }
-
-
-
- def __init__(self, socket):
- self.snowmix_socket = socket
-
- self.active_timer = None
- self.timers = {}
-
- self.update_thread = threading.Thread(target=self.update_timer)
- self.stopped = False
- self.update_thread.start()
-
- def start_timer(self, name):
- if not name in self.timers.keys():
- self.timers[name] = datetime.now()
-
- def get_timers(self):
- return self.timers.keys()
-
-
- def hide_timer(self):
- self.active_timer = None
- self.hide_text()
-
-
- def set_active_timer(self, name):
- if name in self.timers.keys():
- self.active_timer = name
-
-
- def update_timer(self):
- print "Starting update thread !"
- while not self.stopped:
- if self.active_timer != None:
- delta = datetime.now() - self.timers[self.active_timer]
- hours, remainder = divmod(delta.total_seconds(), 3600)
- minutes, seconds = divmod(remainder, 60)
- self.update_text('%s: %d:%d:%d' % (self.active_timer, hours, minutes, seconds))
- pass
- time.sleep(1.0)
-
- print "Stopping update thread !"
-
-
- def update_text(self, text):
- for umlaut, replacement in self.UMLAUTS.items():
- text = text.replace(umlaut, replacement)
-
- cmd = "text string %d %s\n" % (self.TEXT_ID,text)
- self.snowmix_socket.send(cmd)
-
-
- def hide_text(self):
- cmd = "text string %d\n" % self.TEXT_ID
- self.snowmix_socket.send(cmd)
-
-
- def stop(self):
- self.stopped = True
- self.update_thread.join(5.0)
-
-
-
-
diff --git a/python/videocontroller.py b/python/videocontroller.py
index c3f0c5f..5eb51f4 100644
--- a/python/videocontroller.py
+++ b/python/videocontroller.py
@@ -6,20 +6,18 @@ import socket
from gi.repository import Gtk, GObject
from scenechanger import SceneChanger
-from textchanger import TextChanger
-from timercontroller import TimerController
+from clockcontroller import ClockController
class VideoController(object):
def __init__(self, ip):
-
+
self.snowmix_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.snowmix_socket.connect((ip, 9999))
self.scenechanger = SceneChanger(self.snowmix_socket)
- self.textchanger = TextChanger(self.snowmix_socket)
- self.timercontroller = TimerController(self.snowmix_socket)
+ self.clockcontroller = ClockController(self.snowmix_socket)
- self.gladefile = "videocontroller.ui"
+ self.gladefile = "videocontroller.ui"
self.builder = Gtk.Builder()
self.builder.add_from_file(self.gladefile)
@@ -27,9 +25,7 @@ class VideoController(object):
self.max_cam1_button = self.builder.get_object("MaxCam1Button")
self.max_cam2_button = self.builder.get_object("MaxCam2Button")
self.max_cam3_button = self.builder.get_object("MaxCam3Button")
- self.set_text_entry = self.builder.get_object("SetTextEntry")
- self.start_timer_entry = self.builder.get_object("StartTimerEntry")
- self.change_timer_combobox = self.builder.get_object("ChangeTimerComboBox")
+ self.show_all_button = self.builder.get_object("ShowAllButton")
self.messagebox = Gtk.MessageDialog(self.main_window, 0, Gtk.MessageType.WARNING, Gtk.ButtonsType.OK_CANCEL, "I'm afaraid I can't let you do that dave.")
@@ -37,24 +33,24 @@ class VideoController(object):
self.main_window.show_all()
-
def MaxCam1ButtonToggled(self, widget):
if self.max_cam1_button.get_active():
self.max_cam2_button.set_active(False)
self.max_cam3_button.set_active(False)
- self.scenechanger.switch_to(1)
+ self.show_all_button.set_active(False)
+ self.scenechanger.switch_to('Full1')
else:
- if not self.max_cam2_button.get_active() and not self.max_cam3_button.get_active():
+ if not self.max_cam2_button.get_active() and not self.max_cam3_button.get_active() and not self.show_all_button.get_active():
self.max_cam1_button.set_active(True)
-
def MaxCam2ButtonToggled(self, widget):
if self.max_cam2_button.get_active():
self.max_cam1_button.set_active(False)
self.max_cam3_button.set_active(False)
- self.scenechanger.switch_to(2)
+ self.show_all_button.set_active(False)
+ self.scenechanger.switch_to('Full2')
else:
- if not self.max_cam1_button.get_active() and not self.max_cam3_button.get_active():
+ if not self.max_cam1_button.get_active() and not self.max_cam3_button.get_active() and not self.show_all_button.get_active():
self.max_cam2_button.set_active(True)
@@ -62,40 +58,28 @@ class VideoController(object):
if self.max_cam3_button.get_active():
self.max_cam1_button.set_active(False)
self.max_cam2_button.set_active(False)
- self.scenechanger.switch_to(3)
+ self.show_all_button.set_active(False)
+ self.scenechanger.switch_to('Full3')
else:
- if not self.max_cam1_button.get_active() and not self.max_cam2_button.get_active():
+ if not self.max_cam1_button.get_active() and not self.max_cam2_button.get_active() and not self.show_all_button.get_active():
self.max_cam3_button.set_active(True)
-
- def SetTextButtonClicked(self, widget):
- self.textchanger.set_text(self.set_text_entry.get_text())
-
-
- def HideTextButtonClicked(self, widget):
- self.textchanger.hide_text()
-
-
- def StartTimerButtonClicked(self, widget):
- self.timercontroller.start_timer(self.start_timer_entry.get_text())
- self.change_timer_combobox.remove_all()
- for timer in self.timercontroller.get_timers():
- self.change_timer_combobox.append_text(timer)
-
- def ChangeTimerComboBoxChanged(self, widget):
- self.timercontroller.set_active_timer(self.change_timer_combobox.get_active_text())
-
-
- def HideTimerButtonClicked(self, widget):
- self.timercontroller.hide_timer()
-
+ def ShowAllButtonToggled(self, widget):
+ if self.show_all_button.get_active():
+ self.max_cam1_button.set_active(False)
+ self.max_cam2_button.set_active(False)
+ self.max_cam3_button.set_active(False)
+ self.scenechanger.switch_to('All')
+ else:
+ if not self.max_cam1_button.get_active() and not self.max_cam2_button.get_active() and not self.max_cam3_button.get_active():
+ self.show_all_button.set_active(True)
def MainWindowDelete(self, widget, event):
if self.messagebox.run() == Gtk.ResponseType.OK:
- self.timercontroller.stop()
+ self.clockcontroller.stop()
Gtk.main_quit()
-
+
self.messagebox.hide()
return True
diff --git a/python/videocontroller.ui b/python/videocontroller.ui
index 4503204..e9cf765 100644
--- a/python/videocontroller.ui
+++ b/python/videocontroller.ui
@@ -68,140 +68,21 @@ Cam 2
-
-
- 10
- 170
-
-
-
-
-
-
10
- 220
-
-
-
-
-
- 150
- 220
-
-
-
-
-
- 150
- 174
-
-
-
-
-
- 340
- 220
-
-
-
-
-
- 10
- 270
-
-
-
-
-
- 10
- 320
-
-
-
-
-
- 230
- 320
-
-
-
-
-
- 174
- 270
+ 200