From 5336f23335a81ea96658e4d5e7a1dee51dc5e6f5 Mon Sep 17 00:00:00 2001 From: chrys Date: Tue, 15 Nov 2016 23:50:48 +0100 Subject: [PATCH 1/2] whipe out GTK dependency, now Glib only --- src/fenrir/soundDriver/gstreamer.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/fenrir/soundDriver/gstreamer.py b/src/fenrir/soundDriver/gstreamer.py index aba0de06..8c607142 100644 --- a/src/fenrir/soundDriver/gstreamer.py +++ b/src/fenrir/soundDriver/gstreamer.py @@ -7,8 +7,7 @@ from core import debug import gi import time, threading -gi.require_version('Gtk', '3.0') -from gi.repository import GLib, Gtk +from gi.repository import GLib try: gi.require_version('Gst', '1.0') @@ -49,14 +48,15 @@ class driver: self._source.link(self._sink) self._initialized = True - self.thread = threading.Thread(target=self.main) + self.mainloop = GLib.MainLoop() + self.thread = threading.Thread(target=self.mainloop.run) self.thread.start() def shutdown(self): global _gstreamerAvailable if not _gstreamerAvailable: return self.cancel() - Gtk.main_quit() + self.mainloop.quit() self._initialized = False _gstreamerAvailable = False @@ -94,8 +94,7 @@ class driver: self._pipeline.set_state(Gst.State.PLAYING) duration = int(1000 * tone.duration) GLib.timeout_add(duration, self._onTimeout, self._pipeline) - def main(self): - Gtk.main() + def cancel(self, element=None): global _gstreamerAvailable if not _gstreamerAvailable: From 012f3371d255a137173cbf59a26eaec99ba531c0 Mon Sep 17 00:00:00 2001 From: chrys Date: Tue, 15 Nov 2016 23:52:34 +0100 Subject: [PATCH 2/2] add Glib dependency to Readmy, remove comment that gstreamer driver is not working --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dcd19ded..588ef952 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,8 @@ ReadWrite permission - sox [its used by default in the generic sound driver for playing sound-icons] - speech-dispatcher, python3-speechd [to use the speech-dispatcher driver] - brltty, python-brlapi [using braille] # (not implemented yet) -- gstreamer [soundicons via gstreamer] # not working yet +- gstreamer [soundicons via gstreamer] +- GLib [soundicons via gstreamer] - python-pyenchant [spell check functionality] - aspell- [your languagedata for spellchecker, english support "aspell-en"] - python-daemonize [use fenrir as background service on Unix like systems]