[orca] Remove some old, unused speechserver code

[Joanmarie Diggs <joanied src gnome org>]

commit ca2e76b5495386f752f7da1b07628d3350affc21
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Jun 6 10:44:51 2014 -0400

    Remove some old, unused speechserver code

 src/orca/speech.py                  |    9 ++---
 src/orca/speechdispatcherfactory.py |   20 ++++++----
 src/orca/speechserver.py            |   64 +---------------------------------
 3 files changed, 18 insertions(+), 75 deletions(-)
---
diff --git a/src/orca/speech.py b/src/orca/speech.py
index e63e2d3..2a52b3c 100644
--- a/src/orca/speech.py
+++ b/src/orca/speech.py
@@ -252,14 +252,10 @@ def speakKeyEvent(event):
     Arguments:
     - event: input_event.KeyboardEvent to speak.
     """
-    if settings.silenceSpeech:
-        return
 
-    if _speechserver:
-        _speechserver.speakKeyEvent(event)
+    if settings.silenceSpeech:
         return
 
-    # This should only happen during regression tests.
     keyname = event.getKeyName()
     lockingStateString = event.getLockingStateString()
     msg = "%s %s" % (keyname, lockingStateString)
@@ -267,6 +263,9 @@ def speakKeyEvent(event):
     debug.println(debug.LEVEL_INFO, logLine)
     log.info(logLine)
 
+    if _speechserver:
+        _speechserver.speakKeyEvent(event)
+
 def speakCharacter(character, acss=None):
     """Speaks a single character immediately.
 
diff --git a/src/orca/speechdispatcherfactory.py b/src/orca/speechdispatcherfactory.py
index 6b8f9a0..8305fab 100644
--- a/src/orca/speechdispatcherfactory.py
+++ b/src/orca/speechdispatcherfactory.py
@@ -406,10 +406,6 @@ class SpeechServer(speechserver.SpeechServer):
         if text:
             self._speak(text, acss)
 
-    def queueText(self, text="", acss=None):
-        if text:
-            self._speak(text, acss)
-
     def speakUtterances(self, utteranceList, acss=None, interrupt=True):
         #if interrupt:
         #    self._cancel()
@@ -437,19 +433,27 @@ class SpeechServer(speechserver.SpeechServer):
         self.speak(name, acss)
 
     def speakKeyEvent(self, event):
+        acss = ACSS(settings.voices[settings.DEFAULT_VOICE])
         if event.isPrintableKey():
             # We currently only handle printable characters by Speech
             # Dispatcher's KEY command.  For other keys, such as Ctrl, Shift
             # etc. we prefer Orca's verbalization.
             if event.event_string.isupper():
                 acss = settings.voices[settings.UPPERCASE_VOICE]
-            else:
-                acss = None
+
             key = self.KEY_NAMES.get(event.event_string, event.event_string)
             self._apply_acss(acss)
             self._send_command(self._client.key, key)
-        else:
-            return super(SpeechServer, self).speakKeyEvent(event)
+            return
+
+        event_string = event.getKeyName()
+        if orca_state.activeScript:
+            event_string = orca_state.activeScript.\
+                utilities.adjustForPronunciation(event_string)
+
+        lockingStateString = event.getLockingStateString()
+        event_string = "%s %s" % (event_string, lockingStateString)
+        self.speak(event_string, acss=acss)
 
     def increaseSpeechRate(self, step=5):
         self._change_default_speech_rate()
diff --git a/src/orca/speechserver.py b/src/orca/speechserver.py
index 88f14d0..4e254d5 100644
--- a/src/orca/speechserver.py
+++ b/src/orca/speechserver.py
@@ -30,16 +30,6 @@ __date__      = "$Date$"
 __copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
 __license__   = "LGPL"
 
-import logging
-from . import settings
-from . import orca_state
-
-log = logging.getLogger("speech")
-
-from . import debug
-
-from .acss import ACSS
-
 class VoiceFamily(dict):
     """Holds the family description for a voice."""
 
@@ -141,35 +131,6 @@ class SpeechServer(object):
         voice families known by the speech server."""
         pass
 
-    def queueText(self, text="", acss=None):
-        """Adds the text to the queue.
-
-        Arguments:
-        - text: text to be spoken
-        - acss: acss.ACSS instance; if None,
-                the default voice settings will be used.
-                Otherwise, the acss settings will be
-                used to augment/override the default
-                voice settings.
-
-        Output is produced by the next call to speak.
-        """
-        pass
-
-    def queueTone(self, pitch=440, duration=50):
-        """Adds a tone to the queue.
-
-        Output is produced by the next call to speak.
-        """
-        pass
-
-    def queueSilence(self, duration=50):
-        """Adds silence to the queue.
-
-        Output is produced by the next call to speak.
-        """
-        pass
-
     def speakCharacter(self, character, acss=None):
         """Speaks a single character immediately.
 
@@ -189,24 +150,7 @@ class SpeechServer(object):
         Arguments:
         - event: the input_event.KeyboardEvent.
         """
-        if event.isPrintableKey() and event.event_string.isupper():
-            voice = ACSS(settings.voices[settings.UPPERCASE_VOICE])
-        else:
-            voice = ACSS(settings.voices[settings.DEFAULT_VOICE])
-
-        event_string = event.getKeyName()
-        if orca_state.activeScript:
-            event_string = orca_state.activeScript.\
-                utilities.adjustForPronunciation(event_string)
-
-        lockingStateString = event.getLockingStateString()
-        event_string = "%s %s" % (event_string, lockingStateString)
-
-        logLine = "SPEECH OUTPUT: '" + event_string +"'"
-        debug.println(debug.LEVEL_INFO, logLine)
-        log.info(logLine)
-
-        self.speak(event_string, acss=voice)
+        pass
 
     def speakUtterances(self, utteranceList, acss=None, interrupt=True):
         """Speaks the given list of utterances immediately.
@@ -256,11 +200,7 @@ class SpeechServer(object):
                              type is one of PROGRESS, INTERRUPTED, or
                              COMPLETED.
         """
-        for [context, acss] in utteranceIterator:
-            logLine = "SPEECH OUTPUT: '" + context.utterance + "'"
-            debug.println(debug.LEVEL_INFO, logLine)
-            log.info(logLine)
-            self.speak(context.utterance, acss)
+        pass
 
     def increaseSpeechRate(self, step=5):
         """Increases the speech rate.