Preparing to merge.

This commit is contained in:
Storm Dragon
2025-09-05 00:01:59 -04:00
parent 08be529a33
commit c359c037e1
+16 -14
View File
@@ -126,12 +126,19 @@ if platform.system() == "Windows":
print(f"Failed to initialize accessible_output2: {e}") print(f"Failed to initialize accessible_output2: {e}")
sys.exit() sys.exit()
else: else:
# Linux/Mac path - prioritize Orca remote controller # Linux/Mac path - prioritize speech-dispatcher first
try:
import speechd
spd = speechd.Client()
speechProvider = "speechd"
except ImportError:
# Fall back to Orca remote controller
orca_remote = OrcaRemoteController() orca_remote = OrcaRemoteController()
if orca_remote.available: if orca_remote.available:
speechProvider = "orca_remote" speechProvider = "orca_remote"
orca = orca_remote orca = orca_remote
else: else:
# Fall back to Cthulhu
try: try:
output = subprocess.check_output(["pgrep", "cthulhu"]) output = subprocess.check_output(["pgrep", "cthulhu"])
speechProvider = "cthulhu" speechProvider = "cthulhu"
@@ -141,11 +148,6 @@ else:
s = accessible_output2.outputs.auto.Auto() s = accessible_output2.outputs.auto.Auto()
speechProvider = "accessible_output2" speechProvider = "accessible_output2"
except ImportError as e: except ImportError as e:
try:
import speechd
spd = speechd.Client()
speechProvider = "speechd"
except ImportError:
print("No speech providers found.") print("No speech providers found.")
sys.exit() sys.exit()
@@ -1961,7 +1963,14 @@ class DoomLauncher(QMainWindow):
except ImportError: except ImportError:
pass pass
else: else:
# On Linux, check each provider # On Linux, check each provider in priority order
# Check speechd first (highest priority)
try:
import speechd
available_providers.append("speechd")
except ImportError:
pass
# Check Orca remote controller # Check Orca remote controller
orca_remote = OrcaRemoteController() orca_remote = OrcaRemoteController()
if orca_remote.available: if orca_remote.available:
@@ -1981,13 +1990,6 @@ class DoomLauncher(QMainWindow):
except ImportError: except ImportError:
pass pass
# Check speechd
try:
import speechd
available_providers.append("speechd")
except ImportError:
pass
return available_providers return available_providers
def populate_speech_methods(self): def populate_speech_methods(self):