[Scummvm-git-logs] scummvm master -> e54238c822c82bf6523196a3fa1e237c89898340

[athrxx]

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:
e54238c822 KYRA: try to fix RiscOs build


Commit: e54238c822c82bf6523196a3fa1e237c89898340
    https://github.com/scummvm/scummvm/commit/e54238c822c82bf6523196a3fa1e237c89898340
Author: athrxx (athrxx at scummvm.org)
Date: 2021-11-09T00:44:14+01:00

Commit Message:
KYRA: try to fix RiscOs build

The LoK/Mac sound class was accidently declared inside the ENABLE_EOB ifdef. I don't know whether the riscos build don't have EOB enabled, but this is at least a possible issue that I can see..

Changed paths:
    engines/kyra/sound/sound_intern.h


diff --git a/engines/kyra/sound/sound_intern.h b/engines/kyra/sound/sound_intern.h
index 619157affa..dbae8e5a67 100644
--- a/engines/kyra/sound/sound_intern.h
+++ b/engines/kyra/sound/sound_intern.h
@@ -354,6 +354,56 @@ protected:
 	int _tableSfxGame_Size;
 };
 
+class SoundMacRes;
+class HalestormDriver;
+class SoundMac : public Sound {
+public:
+	SoundMac(KyraEngine_v1 *vm, Audio::Mixer *mixer);
+	~SoundMac() override;
+
+	kType getMusicType() const override;
+
+	bool init() override { return init(true); }
+	bool init(bool hiQuality);
+	void initAudioResourceInfo(int, void*) override {}
+	void selectAudioResourceSet(int set) override;
+	bool hasSoundFile(uint) const override { return true; }
+	void loadSoundFile(uint) override {}
+	void loadSoundFile(Common::String) override {}
+	void playTrack(uint8 track) override;
+	void haltTrack() override;
+	void playSoundEffect(uint16 track, uint8) override;
+	bool isPlaying() const override;
+	void beginFadeOut() override;
+	void updateVolumeSettings() override;
+
+private:
+	void setQuality(bool hi);
+
+	SoundMacRes *_res;
+	HalestormDriver *_driver;
+	bool _ready;
+
+	const uint16 *_resIDMusic;
+	int _currentResourceSet;
+
+	static const uint16 _resIDMusicIntro[4];
+	static const uint16 _resIDMusicIngame[35];
+	static const uint8 _musicLoopTable[35];
+	static const uint16 _resIDSfxIntro[39];
+	static const uint16 _resIDSfxIngame[39];
+
+	struct SoundEffectDef {
+		uint8 note;
+		uint8 number;
+		uint16 rate;
+		uint8 unk;
+	};
+
+	static const SoundEffectDef _soundEffectDefsIntro[16];
+	static const SoundEffectDef _soundEffectDefsIngame[120];
+};
+
 #ifdef ENABLE_EOB
 
 class SoundTowns_Darkmoon : public Sound, public TownsAudioInterfacePluginDriver {
@@ -518,56 +568,6 @@ private:
 	static const uint8 _fmTrackMap[140];
 };
 
-class SoundMacRes;
-class HalestormDriver;
-class SoundMac : public Sound {
-public:
-	SoundMac(KyraEngine_v1 *vm, Audio::Mixer *mixer);
-	~SoundMac() override;
-
-	kType getMusicType() const override;
-
-	bool init() override { return init(true); }
-	bool init(bool hiQuality);
-	void initAudioResourceInfo(int, void*) override {}
-	void selectAudioResourceSet(int set) override;
-	bool hasSoundFile(uint) const override { return true; }
-	void loadSoundFile(uint) override {}
-	void loadSoundFile(Common::String) override {}
-	void playTrack(uint8 track) override;
-	void haltTrack() override;
-	void playSoundEffect(uint16 track, uint8) override;
-	bool isPlaying() const override;
-	void beginFadeOut() override;
-	void updateVolumeSettings() override;
-
-private:
-	void setQuality(bool hi);
-
-	SoundMacRes *_res;
-	HalestormDriver *_driver;
-	bool _ready;
-
-	const uint16 *_resIDMusic;
-	int _currentResourceSet;
-
-	static const uint16 _resIDMusicIntro[4];
-	static const uint16 _resIDMusicIngame[35];
-	static const uint8 _musicLoopTable[35];
-	static const uint16 _resIDSfxIntro[39];
-	static const uint16 _resIDSfxIngame[39];
-
-	struct SoundEffectDef {
-		uint8 note;
-		uint8 number;
-		uint16 rate;
-		uint8 unk;
-	};
-
-	static const SoundEffectDef _soundEffectDefsIntro[16];
-	static const SoundEffectDef _soundEffectDefsIngame[120];
-};
-
 #endif
 
 } // End of namespace Kyra