Merge branch 'master' into wordWrappingEndOfScreenBell

src/fenrir/soundDriver/dummy.py

@@ -0,0 +1,27 @@
+#!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
+
+class driver():
+    def __init__(self):
+        self.volume = None
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        self.cancel()
+    def playFrequence(self, frequence = 1000, duration = 0.3, adjustVolume = 0):
+        if interrupt:
+            self.cancel()
+    def playSoundFile(self, filePath, interrupt = True):
+        if interrupt:
+            self.cancel()
+    def cancel(self):
+        pass
+    def setCallback(self, callback):
+        pass
+    def setVolume(self, volume):
+        self.volume = volume        

src/fenrir/speechDriver/dummy.py

@@ -8,7 +8,7 @@
 from core import debug
 
 class driver():
-    def __init__(self ):
+    def __init__(self):
         pass
     def initialize(self, environment):
         self._isInitialized = False 
@@ -54,6 +54,7 @@ class driver():
     def setModule(self, module):
         if not self._isInitialized:
             return False
+        return True
 
     def setLanguage(self, language):
         if not self._isInitialized:

src/fenrir/speechDriver/espeak.py

@@ -8,7 +8,7 @@
 from core import debug
 
 class driver():
-    def __init__(self ):
+    def __init__(self):
         self._es = None
         self._isInitialized = False
 

src/fenrir/speechDriver/speechd.py

@@ -8,7 +8,7 @@
 from core import debug
 
 class driver():
-    def __init__(self ):
+    def __init__(self):
         self._sd = None
         self._isInitialized = False
         self._language = ''