Drop SSML support for now, as it is broken and incomplete anyway.

CMakeLists.txt

@@ -16,7 +16,7 @@ endif()
 project ("SRAL")
 add_library(${PROJECT_NAME}_obj OBJECT)
 target_sources(${PROJECT_NAME}_obj PRIVATE
-  "SRC/SRAL.cpp" "SRC/Engine.h" "SRC/Util.h" "SRC/Util.cpp")
+  "SRC/SRAL.cpp" "SRC/Engine.h")
 target_sources(${PROJECT_NAME}_obj PUBLIC
   FILE_SET HEADERS
   BASE_DIRS "${INCLUDES}"

SRC/NVDA.cpp

@@ -1,6 +1,5 @@
 #include "Encoding.h"
 #include "NVDA.h"
-#include "Util.h"
 #include<Windows.h>
 
 bool NVDA::Initialize() {
@@ -10,7 +9,6 @@ bool NVDA::Initialize() {
 	nvdaController_brailleMessage = (NVDAController_brailleMessage)GetProcAddress(lib, "nvdaController_brailleMessage");
 	nvdaController_cancelSpeech = (NVDAController_cancelSpeech)GetProcAddress(lib, "nvdaController_cancelSpeech");
 	nvdaController_testIfRunning = (NVDAController_testIfRunning)GetProcAddress(lib, "nvdaController_testIfRunning");
-	nvdaController_speakSsml = (NVDAController_speakSsml)GetProcAddress(lib, "nvdaController_speakSsml");
 	return true;
 }
 bool NVDA::Uninitialize() {
@@ -20,7 +18,6 @@ bool NVDA::Uninitialize() {
 	nvdaController_brailleMessage = nullptr;
 	nvdaController_cancelSpeech = nullptr;
 	nvdaController_testIfRunning = nullptr;
-	nvdaController_speakSsml = nullptr;
 	return true;
 }
 bool NVDA::GetActive() {
@@ -33,19 +30,9 @@ bool NVDA::Speak(const char* text, bool interrupt) {
 	if (interrupt)
 		nvdaController_cancelSpeech();
 	std::string text_str(text);
-	if (!IsSsml(text_str))AddSsml(text_str);
-
 	std::wstring out;
 	UnicodeConvert(text_str, out);
-	error_status_t result = nvdaController_speakSsml(out.c_str(), -1, 0, true);
-	if (result == 0)return true;
-	else if (result == 1717) {
-		RemoveSsml(text_str);
-		UnicodeConvert(text_str, out);
-		result = nvdaController_speakText(out.c_str());
-		return result == 0;
-	}
-	return false;
+	return nvdaController_speakText(out.c_str()) == 0;
 }
 bool NVDA::Braille(const char* text) {
 	if (!GetActive())return false;

SRC/NVDA.h

@@ -19,7 +19,7 @@ class NVDA : public Engine {
 	bool Initialize()override;
 	bool Uninitialize()override;
 	int GetFeatures()override {
-		return SUPPORTS_SPEECH | SUPPORTS_BRAILLE | SUPPORTS_PAUSE_SPEECH | SUPPORTS_SSML;
+		return SUPPORTS_SPEECH | SUPPORTS_BRAILLE | SUPPORTS_PAUSE_SPEECH;
 	}
 	void SetVolume(uint64_t)override { return; }
 	uint64_t GetVolume()override { return 0; }

SRC/SAPI.cpp

@@ -1,6 +1,5 @@
 #ifdef _WIN32
 #include "SAPI.h"
-#include "Util.h"
 #include <cstdio>
 #include<string>
 #include<thread>
@@ -132,7 +131,6 @@ bool SAPI::Speak(const char* text, bool interrupt) {
 		this->Initialize();
 	}
 	std::string text_str(text);
-	if (!IsSsml(text_str))AddSsml(text_str);
 	unsigned long bytes;
 	char* audio_ptr = blastspeak_speak_to_memory(instance, &bytes, text_str.c_str());
 	if (audio_ptr == nullptr)

SRC/SRAL.cpp

@@ -1,7 +1,6 @@
 #define SRAL_EXPORT
 #include "../Include/SRAL.h"
 #include "Engine.h"
-#include "Util.h"
 #if defined(_WIN32)
 #define UNICODE
 #include "NVDA.h"
@@ -367,9 +366,7 @@ extern "C" SRAL_API bool SRAL_Output(const char* text, bool interrupt) {
 	if (g_currentEngine == nullptr)return false;
 	speech_engine_update();
 	const bool speech = SRAL_Speak(text, interrupt);
-	std::string braille_str(text);
-	if (IsSsml(braille_str))RemoveSsml(braille_str);
-	const bool braille = SRAL_Braille(braille_str.c_str());
+	const bool braille = SRAL_Braille(text);
 	return speech || braille;
 }
 extern "C" SRAL_API bool SRAL_StopSpeech(void) {