[orca] Ensure we use the system voice for rolename info in WebKitGtk SayAll



commit 8e0d6c14d672ba025d7d184fb898410499a07469
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Aug 16 14:06:09 2016 -0400

    Ensure we use the system voice for rolename info in WebKitGtk SayAll

 src/orca/scripts/toolkits/WebKitGtk/script.py |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/WebKitGtk/script.py b/src/orca/scripts/toolkits/WebKitGtk/script.py
index 9109869..641728c 100644
--- a/src/orca/scripts/toolkits/WebKitGtk/script.py
+++ b/src/orca/scripts/toolkits/WebKitGtk/script.py
@@ -529,14 +529,16 @@ class Script(default.Script):
         if sayAllStyle == settings.SAYALL_STYLE_SENTENCE:
             boundary = pyatspi.TEXT_BOUNDARY_SENTENCE_START
 
+        voices = _settingsManager.getSetting('voices')
+        systemVoice = voices.get(settings.SYSTEM_VOICE)
+
         self._inSayAll = True
         offset = textObjs[0].queryText().caretOffset
         for textObj in textObjs:
             textSegments = self.getTextSegments(textObj, boundary, offset)
-            roleInfo = self.speechGenerator.getRoleName(textObj)
-            if roleInfo:
-                roleName, voice = roleInfo
-                textSegments.append([roleName, 0, -1, voice])
+            roleName = self.speechGenerator.getRoleName(textObj)
+            if roleName:
+                textSegments.append([roleName, 0, -1, systemVoice])
 
             for (string, start, end, voice) in textSegments:
                 context = speechserver.SayAllContext(textObj, string, start, end)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]