1 files changed, 2 insertions, 35 deletions

diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h
index f09706e155..2b4b1ce091 100644
--- a/engines/mohawk/sound.h
+++ b/engines/mohawk/sound.h
@@ -42,20 +42,6 @@ namespace Mohawk {
 
 #define MAX_CHANNELS 2         // Can there be more than 2?
 
-struct SLSTRecord {
-	uint16 index;
-	uint16 sound_count;
-	uint16 *sound_ids;
-	uint16 fade_flags;
-	uint16 loop;
-	uint16 global_volume;
-	uint16 u0;
-	uint16 u1;
-	uint16 *volumes;
-	int16 *balances;
-	uint16 *u2;
-};
-
 enum SndHandleType {
 	kFreeHandle,
 	kUsedHandle
@@ -68,11 +54,6 @@ struct SndHandle {
 	uint16 id;
 };
 
-struct SLSTSndHandle {
-	Audio::SoundHandle *handle;
-	uint16 id;
-};
-
 struct ADPCMStatus { // Holds ADPCM status data, but is irrelevant for us.
 	uint32 size;
 	uint16 itemCount;
@@ -116,6 +97,8 @@ struct DataChunk {
 	Common::SeekableReadStream *audioData;
 };
 
+Audio::RewindableAudioStream *makeMohawkWaveStream(Common::SeekableReadStream *stream, CueList *cueList = nullptr);
+
 class MohawkEngine;
 
 class Sound {
@@ -130,8 +113,6 @@ public:
 	void stopMidi();
 	void stopSound();
 	void stopSound(uint16 id);
-	void pauseSound();
-	void resumeSound();
 	bool isPlaying(uint16 id);
 	bool isPlaying();
 	uint getNumSamplesPlayed(uint16 id);
@@ -144,21 +125,12 @@ public:
 	void stopBackgroundMyst();
 	void changeBackgroundVolumeMyst(uint16 vol);
 
-	// Riven-specific sound functions
-	void playSLST(uint16 index, uint16 card);
-	void playSLST(SLSTRecord slstRecord);
-	void pauseSLST();
-	void resumeSLST();
-	void stopAllSLST(bool fade = false);
-	static byte convertRivenVolume(uint16 volume);
-
 private:
 	MohawkEngine *_vm;
 	MidiDriver *_midiDriver;
 	MidiParser *_midiParser;
 	byte *_midiData;
 
-	static Audio::RewindableAudioStream *makeMohawkWaveStream(Common::SeekableReadStream *stream, CueList *cueList = NULL);
 	static Audio::RewindableAudioStream *makeLivingBooksWaveStream_v1(Common::SeekableReadStream *stream);
 	void initMidi();
 
@@ -169,11 +141,6 @@ private:
 
 	// Myst-specific
 	SndHandle _mystBackgroundSound;
-
-	// Riven-specific
-	void playSLSTSound(uint16 index, bool fade, bool loop, uint16 volume, int16 balance);
-	void stopSLSTSound(uint16 id, bool fade);
-	Common::Array<SLSTSndHandle> _currentSLSTSounds;
 };
 
 } // End of namespace Mohawk