[orca] Clean up some debugging

[Joanmarie Diggs <joanied src gnome org>]

commit 020c2c0085f4c48ec75a06dd8c83ef919a4915f8
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Thu Jan 6 17:25:50 2022 +0100

    Clean up some debugging
    
    Also doing call Voice() even when debugging because that will now trigger
    language-switching logic we don't want to invoke purely to output the
    name of a voice.

 src/orca/generator.py        |  2 +-
 src/orca/speech_generator.py | 27 +++++----------------------
 2 files changed, 6 insertions(+), 23 deletions(-)
---
diff --git a/src/orca/generator.py b/src/orca/generator.py
index a7ff8f856..ebcdaaa22 100644
--- a/src/orca/generator.py
+++ b/src/orca/generator.py
@@ -282,7 +282,7 @@ class Generator:
 
     def _resultElementToString(self, element, includeAll=True):
         if not includeAll:
-            return str(element)
+            return str(element).replace("\n", "\\n")
 
         return "\n%s'%s'" % (" " * 18, element)
 
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 6f942d39b..45f9479e7 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -111,25 +111,14 @@ class SpeechGenerator(generator.Generator):
         return rv
 
     def _resultElementToString(self, element, includeAll=True):
-        if debug.LEVEL_ALL < debug.debugLevel:
-            return str(element)
-
-        if isinstance(element, str):
-            return super()._resultElementToString(element, includeAll)
-
-        if not isinstance(element, acss.ACSS):
-            return str(element)
-
-        if not includeAll:
+        if isinstance(element, acss.ACSS) and not includeAll:
             return ""
 
-        voices = {"default": self.voice(DEFAULT)[0],
-                  "system": self.voice(SYSTEM)[0],
-                  "hyperlink": self.voice(HYPERLINK)[0],
-                  "uppercase": self.voice(UPPERCASE)[0]}
+        if isinstance(element, list):
+            rv = [self._resultElementToString(x, includeAll) for x in element]
+            return " ".join(filter(lambda x: x, rv))
 
-        voicetypes = [k for k in voices if voices.get(k) == element]
-        return "Voice(s): (%s)" % ", ".join(voicetypes)
+        return super()._resultElementToString(element, includeAll)
 
     #####################################################################
     #                                                                   #
@@ -2870,10 +2859,6 @@ class SpeechGenerator(generator.Generator):
         decision making.
         """
 
-        msg = "SPEECH GENERATOR: Getting '%s' voice for obj=%s, language='%s', dialect='%s'" \
-            % (key, args.get("obj"), args.get("language"), args.get("dialect"))
-        debug.println(debug.LEVEL_INFO, msg, True)
-
         voicename = voiceType.get(key) or voiceType.get(DEFAULT)
         voices = _settingsManager.getSetting('voices')
         voice = acss.ACSS(voices.get(voiceType.get(DEFAULT)))
@@ -2890,8 +2875,6 @@ class SpeechGenerator(generator.Generator):
             if override and override.get('established', True):
                 voice.update(override)
 
-        msg = "SPEECH GENERATOR: Voice is %s" % voice
-        debug.println(debug.LEVEL_INFO, msg, True)
         return [voice]
 
     def utterancesToString(self, utterances):