[Scummvm-cvs-logs] scummvm master -> 5247af8aebcf2fdb363071324d06a0b4f2dd5866

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5247af8aeb TITANIC: Compilation fix for SoundType enum


Commit: 5247af8aebcf2fdb363071324d06a0b4f2dd5866
    https://github.com/scummvm/scummvm/commit/5247af8aebcf2fdb363071324d06a0b4f2dd5866
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-11T20:15:18-04:00

Commit Message:
TITANIC: Compilation fix for SoundType enum

Changed paths:
    engines/titanic/sound/qmixer.h
    engines/titanic/sound/wave_file.cpp



diff --git a/engines/titanic/sound/qmixer.h b/engines/titanic/sound/qmixer.h
index 32a5e58..edb20b7 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 16bc9de..8c00637 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;
 }