From 7c789129316e6afabe9c06fd2cac22d45f44cae4 Mon Sep 17 00:00:00 2001
From: Jaromir Wysoglad
Date: Thu, 18 Jul 2019 23:33:48 +0200
Subject: TTS: Move popState to the base class

---
 .../windows/windows-text-to-speech.cpp              | 21 ---------------------
 .../text-to-speech/windows/windows-text-to-speech.h |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)

(limited to 'backends/text-to-speech/windows')

diff --git a/backends/text-to-speech/windows/windows-text-to-speech.cpp b/backends/text-to-speech/windows/windows-text-to-speech.cpp
index c646b9b3b3..506220a9c7 100644
--- a/backends/text-to-speech/windows/windows-text-to-speech.cpp
+++ b/backends/text-to-speech/windows/windows-text-to-speech.cpp
@@ -347,27 +347,6 @@ void WindowsTextToSpeechManager::updateVoices() {
 		_speechState = READY;
 }
 
-bool WindowsTextToSpeechManager::popState() {
-	if (_ttsState->_next == nullptr)
-		return true;
-
-	for (Common::TTSVoice *i = _ttsState->_availaibleVoices.begin(); i < _ttsState->_availaibleVoices.end(); i++) {
-		ISpObjectToken *voiceToken = (ISpObjectToken *) i->getData();
-		voiceToken->Release();
-	}
-
-	Common::TTSState *oldState = _ttsState;
-	_ttsState = _ttsState->_next;
-
-	delete oldState;
-
-	setLanguage(_ttsState->_language);
-	setPitch(_ttsState->_pitch);
-	setVolume(_ttsState->_volume);
-	setRate(_ttsState->_rate);
-	setVoice(_ttsState->_activeVoice);
-	return false;
-}
 void WindowsTextToSpeechManager::freeVoiceData(void *data) {
 	ISpObjectToken *voiceToken = (ISpObjectToken *) data;
 	voiceToken->Release();
diff --git a/backends/text-to-speech/windows/windows-text-to-speech.h b/backends/text-to-speech/windows/windows-text-to-speech.h
index 848ae854eb..6498c9cc2c 100644
--- a/backends/text-to-speech/windows/windows-text-to-speech.h
+++ b/backends/text-to-speech/windows/windows-text-to-speech.h
@@ -64,7 +64,7 @@ public:
 
 	virtual void setLanguage(Common::String language);
 
-	virtual bool popState();
+	bool popState();
 
 	virtual void freeVoiceData(void *data);
 
-- 
cgit v1.2.3