diff options
author | MaZderMind <git@mazdermind.de> | 2015-10-05 22:34:57 +0200 |
---|---|---|
committer | MaZderMind <git@mazdermind.de> | 2015-10-05 22:34:57 +0200 |
commit | ffe7e70f0b6c58f323e9b471c9e0a18549f6c9ee (patch) | |
tree | bf7d3b8059d1c832901e1c5e6cb78c28f9dc8712 | |
parent | 2b34aa7c8a67490dad4c1b0a25b1c0997138288b (diff) | |
parent | 5fd610687399fb1665060869232d9625ebfb4882 (diff) |
Merge remote-tracking branch 'froztbyte/master'
-rw-r--r-- | voctogui/lib/audioselector.py | 1 | ||||
-rw-r--r-- | voctogui/lib/connection.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/voctogui/lib/audioselector.py b/voctogui/lib/audioselector.py index 9d6d7ea..ab8f31e 100644 --- a/voctogui/lib/audioselector.py +++ b/voctogui/lib/audioselector.py @@ -2,6 +2,7 @@ import logging from gi.repository import Gst, Gdk, GLib from lib.config import Config +import lib.connection as Connection class AudioSelectorController(object): """ Displays a Level-Meter of another VideoDisplay into a GtkWidget """ diff --git a/voctogui/lib/connection.py b/voctogui/lib/connection.py index 433693d..b56a490 100644 --- a/voctogui/lib/connection.py +++ b/voctogui/lib/connection.py @@ -104,6 +104,8 @@ def on_loop(): def send(command): global conn, log + if isinstance(command, str): + command = command.encode('ascii') conn.send(command) def on(signal, cb): |