Merge branch 'master' into wordWrappingEndOfScreenBell

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-<language> [your languagedata for spellchecker, english support "aspell-en"]
 - python-daemonize [use fenrir as background service on Unix like systems]

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: