Index: src/orca/default.py
===================================================================
--- src/orca/default.py	(revision 2984)
+++ src/orca/default.py	(working copy)
@@ -566,40 +566,6 @@
                 #
                 _("Exits learn mode."))
 
-        self.inputEventHandlers["decreaseSpeechRateHandler"] = \
-            input_event.InputEventHandler(
-                speech.decreaseSpeechRate,
-                # Translators: the speech rate is how fast the speech
-                # synthesis engine will generate speech.
-                #
-                _("Decreases the speech rate."))
-
-        self.inputEventHandlers["increaseSpeechRateHandler"] = \
-            input_event.InputEventHandler(
-                speech.increaseSpeechRate,
-                # Translators: the speech rate is how fast the speech
-                # synthesis engine will generate speech.
-                #
-                _("Increases the speech rate."))
-
-        self.inputEventHandlers["decreaseSpeechPitchHandler"] = \
-            input_event.InputEventHandler(
-                speech.decreaseSpeechPitch,
-                # Translators: the speech pitch is how high or low in
-                # pitch/frequency the speech synthesis engine will
-                # generate speech.
-                #
-                _("Decreases the speech pitch."))
-
-        self.inputEventHandlers["increaseSpeechPitchHandler"] = \
-            input_event.InputEventHandler(
-                speech.increaseSpeechPitch,
-                # Translators: the speech pitch is how high or low in
-                # pitch/frequency the speech synthesis engine will
-                # generate speech.
-                #
-                _("Increases the speech pitch."))
-
         self.inputEventHandlers["shutdownHandler"] = \
             input_event.InputEventHandler(
                 orca.quitOrca,
@@ -1321,34 +1287,6 @@
 
         keyBindings.add(
             keybindings.KeyBinding(
-                "Left",
-                1 << settings.MODIFIER_ORCA,
-                1 << settings.MODIFIER_ORCA,
-                self.inputEventHandlers["decreaseSpeechRateHandler"]))
-
-        keyBindings.add(
-            keybindings.KeyBinding(
-                "Right",
-                1 << settings.MODIFIER_ORCA,
-                1 << settings.MODIFIER_ORCA,
-                self.inputEventHandlers["increaseSpeechRateHandler"]))
-
-        keyBindings.add(
-            keybindings.KeyBinding(
-                "Down",
-                1 << settings.MODIFIER_ORCA,
-                1 << settings.MODIFIER_ORCA,
-                self.inputEventHandlers["decreaseSpeechPitchHandler"]))
-
-        keyBindings.add(
-            keybindings.KeyBinding(
-                "Up",
-                1 << settings.MODIFIER_ORCA,
-                1 << settings.MODIFIER_ORCA,
-                self.inputEventHandlers["increaseSpeechPitchHandler"]))
-
-        keyBindings.add(
-            keybindings.KeyBinding(
                 "q",
                 1 << settings.MODIFIER_ORCA,
                 1 << settings.MODIFIER_ORCA,
Index: src/orca/speechserver.py
===================================================================
--- src/orca/speechserver.py	(revision 2984)
+++ src/orca/speechserver.py	(working copy)
@@ -269,26 +269,6 @@
             log.info("sayAll utterance='%s'" % context.utterance)
             self.speak(context.utterance, acss)
 
-    def increaseSpeechRate(self, step=5):
-        """Increases the speech rate.
-        """
-        pass
-
-    def decreaseSpeechRate(self, step=5):
-        """Decreases the speech rate.
-        """
-        pass
-
-    def increaseSpeechPitch(self, step=0.5):
-        """Increases the speech pitch.
-        """
-        pass
-
-    def decreaseSpeechPitch(self, step=0.5):
-        """Decreases the speech pitch.
-        """
-        pass
-
     def stop(self):
         """Stops ongoing speech and flushes the queue."""
         pass
Index: src/orca/espeechfactory.py
===================================================================
--- src/orca/espeechfactory.py	(revision 2984)
+++ src/orca/espeechfactory.py	(working copy)
@@ -260,26 +260,6 @@
         else:
             self._output.write("q {%s}\nd\n" %text)
 
-    def increaseSpeechPitch(self, step=0.5):
-        """Increase speech pitch."""
-        self._settings['average-pitch'] += step
-
-    def decreaseSpeechPitch(self, step=0.5):
-        """Decrease speech pitch."""
-        self._settings['average-pitch'] -= step
-
-    def increaseSpeechRate(self, step=5):
-        """Set speech rate."""
-        self._settings['rate'] += step
-        self._output.write("tts_set_speech_rate %s\n" \
-                            % self.getrate(self._settings['rate']))
-
-    def decreaseSpeechRate(self, step=5):
-        """Set speech rate."""
-        self._settings['rate'] -= step
-        self._output.write("tts_set_speech_rate %s\n" \
-                            % self.getrate(self._settings['rate']))
-
     def stop(self):
         """Silence ongoing speech."""
         self._output.write("s\n")
Index: src/orca/speechdispatcherfactory.py
===================================================================
--- src/orca/speechdispatcherfactory.py	(revision 2984)
+++ src/orca/speechdispatcherfactory.py	(working copy)
@@ -351,18 +351,6 @@
         else:
             return super(SpeechServer, self).speakKeyEvent(event_string, type)
 
-    def increaseSpeechRate(self, step=5):
-        self._change_default_speech_rate()
-
-    def decreaseSpeechRate(self, step=5):
-        self._change_default_speech_rate(decrease=True)
-
-    def increaseSpeechPitch(self, step=0.5):
-        self._change_default_speech_pitch()
-
-    def decreaseSpeechPitch(self, step=0.5):
-        self._change_default_speech_pitch(decrease=True)
-
     def stop(self):
         self._cancel()
 
Index: src/orca/speech.py
===================================================================
--- src/orca/speech.py	(revision 2984)
+++ src/orca/speech.py	(working copy)
@@ -236,46 +236,6 @@
     if _speechserver:
         _speechserver.stop()
 
-def increaseSpeechRate(script=None, inputEvent=None):
-    if _speechserver:
-        _speechserver.increaseSpeechRate()
-    else:
-        debug.println(debug.LEVEL_INFO,
-                      "SPEECH OUTPUT: 'faster'")
-        log.info("increaseSpeechRate")
-
-    return True
-
-def decreaseSpeechRate(script=None, inputEvent=None):
-    if _speechserver:
-        _speechserver.decreaseSpeechRate()
-    else:
-        debug.println(debug.LEVEL_INFO,
-                      "SPEECH OUTPUT: 'slower'")
-        log.info("decreaseSpeechRate")
-
-    return True
-
-def increaseSpeechPitch(script=None, inputEvent=None):
-    if _speechserver:
-        _speechserver.increaseSpeechPitch()
-    else:
-        debug.println(debug.LEVEL_INFO,
-                      "SPEECH OUTPUT: 'higher'")
-        log.info("increaseSpeechPitch")
-
-    return True
-
-def decreaseSpeechPitch(script=None, inputEvent=None):
-    if _speechserver:
-        _speechserver.decreaseSpeechPitch()
-    else:
-        debug.println(debug.LEVEL_INFO,
-                      "SPEECH OUTPUT: 'lower'")
-        log.info("decreaseSpeechPitch")
-
-    return True
-
 def shutdown():
     global _speechserver
     if _speechserver:
Index: src/orca/gnomespeechfactory.py
===================================================================
--- src/orca/gnomespeechfactory.py	(revision 2984)
+++ src/orca/gnomespeechfactory.py	(working copy)
@@ -877,131 +877,6 @@
         except StopIteration:
             pass
 
-    def increaseSpeechPitch(self, step=0.5):
-        """Increases the speech pitch for the default voice.
-
-        Arguments:
-        - step: the pitch step increment.
-        """
-
-        # [[[TODO: richb - this is a hack for now.  Need to take min/max
-        # values in account, plus also need to take into account that
-        # different engines provide different pitch ranges.]]]
-
-        voices = settings.voices
-        acss = voices[settings.DEFAULT_VOICE]
-        speaker = self.__getSpeaker(acss)
-
-        pitchDelta = settings.speechPitchDelta
-
-        try:
-            pitch = min(10, self.__getPitch(speaker) + pitchDelta)
-            acss[ACSS.AVERAGE_PITCH] = pitch
-            self.__setPitch(speaker, pitch)
-            debug.println(debug.LEVEL_CONFIGURATION,
-                          "speech.increaseSpeechPitch: pitch is now " \
-                          " %d" % pitch)
-            # Translators: this is a short string saying that the speech
-            # synthesis engine is now speaking in a higher pitch.
-            #
-            self.speak(_("higher."))
-        except:
-            debug.printException(debug.LEVEL_SEVERE)
-
-    def decreaseSpeechPitch(self, step=0.5):
-        """Decreases the speech pitch for the default voice.
-
-        Arguments:
-        - step: the pitch step decrement.
-        """
-
-        # [[[TODO: WDW - this is a hack for now.  Need to take min/max
-        # values in account, plus also need to take into account that
-        # different engines provide different rate ranges.]]]
-
-        voices = settings.voices
-        acss = voices[settings.DEFAULT_VOICE]
-        speaker = self.__getSpeaker(acss)
-
-        pitchDelta = settings.speechPitchDelta
-
-        try:
-            pitch = max(1, self.__getPitch(speaker) - pitchDelta)
-            acss[ACSS.AVERAGE_PITCH] = pitch
-            self.__setPitch(speaker, pitch)
-            debug.println(debug.LEVEL_CONFIGURATION,
-                          "speech.decreaseSpeechPitch: pitch is now " \
-                          " %d" % pitch)
-            # Translators: this is a short string saying that the speech
-            # synthesis engine is now speaking in a lower pitch.
-            #
-            self.speak(_("lower."))
-        except:
-            debug.printException(debug.LEVEL_SEVERE)
-
-    def increaseSpeechRate(self, step=5):
-        """Increases the speech rate.
-
-        [[[TODO: WDW - this is a hack for now.  Need to take min/max
-        values in account, plus also need to take into account that
-        different engines provide different rate ranges.]]]
-        """
-
-        voices = settings.voices
-        acss = voices[settings.DEFAULT_VOICE]
-        speaker = self.__getSpeaker(acss)
-
-        rateDelta = settings.speechRateDelta
-
-        try:
-            rate = min(100, self.__getRate(speaker) + rateDelta)
-            acss[ACSS.RATE] = rate
-            self.__setRate(speaker, rate)
-            debug.println(debug.LEVEL_CONFIGURATION,
-                          "speech.increaseSpeechRate: rate is now " \
-                          " %d" % rate)
-            # Translators: this is a short string saying that the speech
-            # synthesis engine is now speaking at a faster rate (words
-            # per minute).
-            #
-            self.speak(_("faster."))
-        except:
-            debug.printException(debug.LEVEL_SEVERE)
-
-    def decreaseSpeechRate(self, step=5):
-        """Decreases the rate of speech for the given ACSS.  If
-        acssName is None, the rate decrease will be applied to all
-        known ACSSs.
-
-        [[[TODO: WDW - this is a hack for now.  Need to take min/max
-        values in account, plus also need to take into account that
-        different engines provide different rate ranges.]]]
-
-        Arguments:
-        -acssName: the ACSS whose speech rate should be decreased
-        """
-
-        voices = settings.voices
-        acss = voices[settings.DEFAULT_VOICE]
-        speaker = self.__getSpeaker(acss)
-
-        rateDelta = settings.speechRateDelta
-
-        try:
-            rate = max(1, self.__getRate(speaker) - rateDelta)
-            acss[ACSS.RATE] = rate
-            self.__setRate(speaker, rate)
-            debug.println(debug.LEVEL_CONFIGURATION,
-                          "speech.decreaseSpeechRate: rate is now " \
-                          " %d" % rate)
-            # Translators: this is a short string saying that the speech
-            # synthesis engine is now speaking at a slower rate (words
-            # per minute).
-            #
-            self.speak(_("slower."))
-        except:
-            debug.printException(debug.LEVEL_SEVERE)
-
     def stop(self):
         """Stops ongoing speech and flushes the queue."""
         if self.__sayAll:
