3 files changed, 211 insertions, 0 deletions
diff --git a/engines/pegasus/MMShell/Sounds/MMSound.cpp b/engines/pegasus/MMShell/Sounds/MMSound.cpp
new file mode 100755
index 0000000000..f5364636ac
--- /dev/null
+++ b/engines/pegasus/MMShell/Sounds/MMSound.cpp
@@ -0,0 +1,126 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * Additional copyright for this file:
+ * Copyright (C) 1995-1997 Presto Studios
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "audio/audiostream.h"
+#include "audio/decoders/aiff.h"
+#include "common/file.h"
+#include "common/system.h"
+
+#include "engines/pegasus/MMShell/Sounds/MMSound.h"
+
+namespace Pegasus {
+
+MMSound::MMSound() {
+	_aiffStream = 0;
+	_volume = 0xFF;
+}
+
+MMSound::~MMSound() {
+	DisposeSound();
+}
+
+void MMSound::DisposeSound() {
+	StopSound();
+	delete _aiffStream; _aiffStream = 0;
+}
+
+void MMSound::InitFromAIFFFile(const Common::String &fileName) {
+	Common::File *file = new Common::File();
+	if (!file->open(fileName)) {
+		delete file;
+		return;
+	}
+
+	_aiffStream = Audio::makeAIFFStream(file, DisposeAfterUse::YES);
+}
+
+#if 0
+// TODO!
+void MMSound::AttachFader(MMSoundFader *theFader) {
+	if (fTheFader)
+		fTheFader->AttachSound(NULL);
+
+	fTheFader = theFader;
+
+	if (fTheFader)
+		fTheFader->AttachSound(this);
+}
+#endif
+
+void MMSound::PlaySound() {
+	if (!SoundLoaded())
+		return;
+
+	StopSound();
+
+#if 0
+	// TODO!
+	if (fTheFader)
+		this->SetVolume(fTheFader->GetFaderValue());
+#endif
+
+	g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType, &_handle, _aiffStream, -1, _volume, 0, DisposeAfterUse::NO);
+}
+
+void MMSound::LoopSound() {
+	if (!SoundLoaded())
+		return;
+
+	StopSound();
+
+	// Create a looping stream
+	Audio::AudioStream *loopStream = new Audio::LoopingAudioStream(_aiffStream, 0, DisposeAfterUse::NO);
+
+#if 0
+	// TODO!
+	// Assume that if there is a fader, we're going to fade the sound in.
+	if (fTheFader)
+		this->SetVolume(0);
+#endif
+
+	g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType, &_handle, loopStream, -1, _volume, 0, DisposeAfterUse::YES);
+}
+
+void MMSound::StopSound(void) {
+	g_system->getMixer()->stopHandle(_handle);
+}
+
+void MMSound::SetVolume(const uint16 volume) {
+	// Clipping the volume to [0x00, 0xFF] instead of Apple's [0, 0x100]
+	// We store the volume in case SetVolume is called before the sound starts
+
+	_volume = (volume == 0x100) ? 0xFF : volume;
+	g_system->getMixer()->setChannelVolume(_handle, _volume);
+}
+
+bool MMSound::IsPlaying() {
+	return SoundLoaded() && g_system->getMixer()->isSoundHandleActive(_handle);
+}
+
+bool MMSound::SoundLoaded() const {
+	return _aiffStream != 0;
+}
+
+} // End of namespace Pegasus
diff --git a/engines/pegasus/MMShell/Sounds/MMSound.h b/engines/pegasus/MMShell/Sounds/MMSound.h
new file mode 100755
index 0000000000..8bcf4100aa
--- /dev/null
+++ b/engines/pegasus/MMShell/Sounds/MMSound.h
@@ -0,0 +1,84 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * Additional copyright for this file:
+ * Copyright (C) 1995-1997 Presto Studios
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef PEGASUS_MMSHELL_SOUNDS_MMSOUND_H
+#define PEGASUS_MMSHELL_SOUNDS_MMSOUND_H
+
+#include "audio/mixer.h"
+#include "common/str.h"
+
+namespace Audio {
+	class AudioStream;
+	class RewindableAudioStream;
+}
+
+namespace Pegasus {
+
+// TODO!
+//class MMSoundFader;
+
+//	Things you might want to do with sound:
+//		Start it
+//		Stop it
+//		Loop it
+//		Pause it
+//		Set the volume
+//		Set the pitch (rate)
+//		Pan the sound
+//		Change these settings dynamically over time
+
+class MMSound {
+public:
+	MMSound();
+	~MMSound();
+
+	// We only have one access point here because we should
+	// only be opening an AIFF file from a file name. We're
+	// not using the resource fork string resources.
+	void InitFromAIFFFile(const Common::String &fileName);
+
+	void DisposeSound();
+	bool SoundLoaded() const;
+	void PlaySound();
+	void LoopSound();
+	void StopSound();
+	void SetVolume(const uint16 volume);
+	bool IsPlaying();
+
+	// TODO!
+	//void AttachFader(MMSoundFader*);
+
+protected:
+	Audio::RewindableAudioStream *_aiffStream;
+	Audio::SoundHandle _handle;
+	byte _volume;
+
+	// TODO!
+	//MMSoundFader *fTheFader;
+};
+
+} // End of namespace Pegasus
+
+#endif
diff --git a/engines/pegasus/module.mk b/engines/pegasus/module.mk
index 62a2fe9575..1f5e6f5a28 100644
--- a/engines/pegasus/module.mk
+++ b/engines/pegasus/module.mk
@@ -11,6 +11,7 @@ MODULE_OBJS = \
 	sound.o \
 	video.o \
 	Game_Shell/CItem.o \
+	MMShell/Sounds/MMSound.o \
 	MMShell/Utilities/MMResourceFile.o