changed default (auto) synth driver to nvdajp_jtalk

diff --git a/source/config/__init__.py b/source/config/__init__.py
index 6d45f6f..ccabf10 100644 (file)
--- a/source/config/__init__.py
+++ b/source/config/__init__.py
@@ -74,7 +74,7 @@ confspec = ConfigObj(StringIO(
 # Speech settings\r
 [speech]\r
        # The synthesiser to use\r
-       synth = string(default=nvdajp_jtalk) # nvdajp\r
+       synth = string(default=auto)\r
        symbolLevel = integer(default=100)\r
        beepSpeechModePitch = integer(default=10000,min=50,max=11025)\r
        outputDevice = string(default=default)\r

diff --git a/source/synthDriverHandler.py b/source/synthDriverHandler.py
index 7c2ed9d..cf32568 100644 (file)
--- a/source/synthDriverHandler.py
+++ b/source/synthDriverHandler.py
@@ -20,6 +20,8 @@ import synthDrivers
 _curSynth=None\r
 _audioOutputDevice=None\r
 \r
+DEFAULT_DRIVER='nvdajp_jtalk' # nvdajp changed from 'espeak'\r
+\r
 def initialize():\r
        config.addConfigDirsToPythonPackagePath(synthDrivers)\r
 \r
@@ -66,7 +68,7 @@ def setSynth(name,isFallback=False):
                _curSynth=None\r
                return True\r
        if name=='auto':\r
-               name='espeak'\r
+               name=DEFAULT_DRIVER\r
        if _curSynth:\r
                _curSynth.cancel()\r
                _curSynth.terminate()\r
@@ -98,9 +100,9 @@ def setSynth(name,isFallback=False):
                log.error("setSynth", exc_info=True)\r
                if prevSynthName:\r
                        setSynth(prevSynthName,isFallback=True)\r
-               elif name not in ('espeak','silence'):\r
-                       setSynth('espeak',isFallback=True)\r
-               elif name=='espeak':\r
+               elif name not in (DEFAULT_DRIVER,'silence'):\r
+                       setSynth(DEFAULT_DRIVER,isFallback=True)\r
+               elif name==DEFAULT_DRIVER:\r
                        setSynth('silence',isFallback=True)\r
                return False\r
 \r