From 5247af8aebcf2fdb363071324d06a0b4f2dd5866 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 11 Aug 2016 20:15:18 -0400
Subject: TITANIC: Compilation fix for SoundType enum

---
 engines/titanic/sound/qmixer.h      |  2 +-
 engines/titanic/sound/wave_file.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/titanic/sound')

diff --git a/engines/titanic/sound/qmixer.h b/engines/titanic/sound/qmixer.h
index 32a5e58347..edb20b795c 100644
--- a/engines/titanic/sound/qmixer.h
+++ b/engines/titanic/sound/qmixer.h
@@ -157,7 +157,7 @@ struct QMIXPLAYPARAMS {
 
 	QMIXPLAYPARAMS() : dwSize(36), lpImage(nullptr), hwndNotify(0), callback(nullptr),
 		dwUser(nullptr), lStart(0), lStartLoop(0), lEndLoop(0), lEnd(0), 
-		lpChannelParams(nullptr), _soundType(Audio::Mixer::SoundType::kPlainSoundType)  {}
+		lpChannelParams(nullptr), _soundType(Audio::Mixer::kPlainSoundType)  {}
 };
 
 /**
diff --git a/engines/titanic/sound/wave_file.cpp b/engines/titanic/sound/wave_file.cpp
index 16bc9deda4..8c00637d73 100644
--- a/engines/titanic/sound/wave_file.cpp
+++ b/engines/titanic/sound/wave_file.cpp
@@ -29,11 +29,11 @@
 namespace Titanic {
 
 CWaveFile::CWaveFile() : _owner(nullptr), _stream(nullptr),
-		_soundType(Audio::Mixer::SoundType::kPlainSoundType) {
+		_soundType(Audio::Mixer::kPlainSoundType) {
 }
 
 CWaveFile::CWaveFile(QSoundManager *owner) : _owner(owner), _stream(nullptr),
-		_soundType(Audio::Mixer::SoundType::kPlainSoundType) {
+		_soundType(Audio::Mixer::kPlainSoundType) {
 }
 
 CWaveFile::~CWaveFile() {
@@ -58,7 +58,7 @@ bool CWaveFile::loadSound(const CString &name) {
 	Common::SeekableReadStream *stream = file.readStream();
 	_size = stream->size();
 	_stream = Audio::makeWAVStream(stream->readStream(_size), DisposeAfterUse::YES);
-	_soundType = Audio::Mixer::SoundType::kSFXSoundType;
+	_soundType = Audio::Mixer::kSFXSoundType;
 
 	return true;
 }
@@ -74,7 +74,7 @@ bool CWaveFile::loadSpeech(CDialogueFile *dialogueFile, int speechIndex) {
 	_size = res->_size;
 	_stream = Audio::makeWAVStream(new Common::MemoryReadStream(data, _size, DisposeAfterUse::YES),
 		DisposeAfterUse::YES);
-	_soundType = Audio::Mixer::SoundType::kSpeechSoundType;
+	_soundType = Audio::Mixer::kSpeechSoundType;
 
 	return true;
 }
@@ -89,7 +89,7 @@ bool CWaveFile::loadMusic(const CString &name) {
 	Common::SeekableReadStream *stream = file.readStream();
 	_size = stream->size();
 	_stream = Audio::makeWAVStream(stream->readStream(_size), DisposeAfterUse::YES);
-	_soundType = Audio::Mixer::SoundType::kMusicSoundType;
+	_soundType = Audio::Mixer::kMusicSoundType;
 
 	return true;
 }
-- 
cgit v1.2.3