コミット: ee76712daadefef8642448c0cc8f7ef826f0f914 - zandronum-macos (hg)

This is a fork of Zandronum for Mac Os (Silicon and Intel)

コミットメタ情報

• リビジョン: ee76712daadefef8642448c0cc8f7ef826f0f914 (tree)
• 日時: 2023-01-24 04:25:06
• 作者: Joshua Surace <doomjoshuaboy@live...>
• コミッター: Joshua Surace

ログメッセージ

Fixed up CMake and related sound issues.

変更サマリ

• modified: src/CMakeLists.txt
• modified: src/sound/fmodsound.cpp
• modified: src/sound/fmodsound.h
• modified: src/sound/i_sound.cpp
• modified: src/sound/i_sound.h
• modified: src/sound/i_soundinternal.h
• modified: src/tarray.h

差分

diff -r 04d296eb008f -r ee76712daade src/CMakeLists.txt
--- a/src/CMakeLists.txt	Mon Jan 23 20:50:09 2023 +1100
+++ b/src/CMakeLists.txt	Tue Jan 24 06:25:06 2023 +1100
@@ -188,6 +188,8 @@
 		# [BB] The server doesn't need sound, GTK or OpenGL.
 		if( SERVERONLY )
 			set( NO_SOUND ON )
+			set( NO_FMOD ON )
+			set( NO_OPENAL ON )
 			set( NO_GTK ON )
 			set( NO_GL ON )
 			add_definitions ( -DSERVER_ONLY=1 )
@@ -351,7 +353,7 @@
  		set( NO_FMOD ON )
  	endif( FMOD_LIBRARY )
 endif( NOT NO_FMOD )
- 
+
 if( NO_FMOD )
  	add_definitions( -DNO_FMOD=1 )
 endif( NO_FMOD )
@@ -370,50 +372,6 @@
 
 	find_package( MPG123 )
 endif()
-# Search for FMOD include files
-
-if( NOT WIN32 )
-	find_path( FMOD_INCLUDE_DIR fmod.hpp
-		PATHS ${FMOD_LOCAL_INC_DIRS} )
-endif( NOT WIN32 )
-
-if( NOT FMOD_INCLUDE_DIR )
-	find_path( FMOD_INCLUDE_DIR fmod.hpp
-		PATHS ${FMOD_SEARCH_PATHS}
-		${FMOD_INC_PATH_SUFFIXES} )
-endif( NOT FMOD_INCLUDE_DIR )
-
-if( FMOD_INCLUDE_DIR )
-	message( STATUS "FMOD include files found at ${FMOD_INCLUDE_DIR}" )
-else( FMOD_INCLUDE_DIR )
-	# [BB] Without sound, we don't need FMOD.
-	if ( NOT NO_SOUND )
-		message( SEND_ERROR "Could not find FMOD include files" )
-	endif ( NOT NO_SOUND )
-endif( FMOD_INCLUDE_DIR )
-
-
-# Search for FMOD library
-
-if( WIN32 OR APPLE )
-	find_library( FMOD_LIBRARY ${FMOD_LIB_NAME}
-		PATHS ${FMOD_SEARCH_PATHS}
-		${FMOD_LIB_PATH_SUFFIXES} )
-else( WIN32 OR APPLE )
-	find_library( FMOD_LIBRARY
-		NAMES ${FMOD_VERSIONS}
-		PATHS ${FMOD_LOCAL_LIB_DIRS} )
-endif( WIN32 OR APPLE )
-
-if( FMOD_LIBRARY )
-	message( STATUS "FMOD library found at ${FMOD_LIBRARY}" )
-else( FMOD_LIBRARY )
-	# [BB] Without sound, we don't need FMOD.
-	if ( NOT NO_SOUND )
-		message( SEND_ERROR "Could not find FMOD library" )
-	endif ( NOT NO_SOUND )
-endif( FMOD_LIBRARY )
-
 
 # Search for FluidSynth
 
@@ -1405,8 +1363,9 @@
 	resourcefiles/resourcefile.cpp
 	sfmt/SFMT.cpp
 	sound/fmodsound.cpp
+	sound/oalsound.cpp
 	sound/i_music.cpp
-    sound/i_sound.cpp
+    	sound/i_sound.cpp
 	sound/music_cd.cpp
 	sound/music_dumb.cpp
 	sound/music_gme.cpp

diff -r 04d296eb008f -r ee76712daade src/sound/fmodsound.cpp
--- a/src/sound/fmodsound.cpp	Mon Jan 23 20:50:09 2023 +1100
+++ b/src/sound/fmodsound.cpp	Tue Jan 24 06:25:06 2023 +1100
@@ -54,7 +54,7 @@
 #endif
 
 #include "templates.h"
-#ifndef NO_SOUND
+#ifndef NO_FMOD
 #include "fmodsound.h"
 #endif
 #include "c_cvars.h"
@@ -145,7 +145,7 @@
 	}
 }
 
-#ifndef NO_SOUND
+#ifndef NO_FMOD
 
 // PRIVATE DATA DEFINITIONS ------------------------------------------------
 

diff -r 04d296eb008f -r ee76712daade src/sound/fmodsound.h
--- a/src/sound/fmodsound.h	Mon Jan 23 20:50:09 2023 +1100
+++ b/src/sound/fmodsound.h	Tue Jan 24 06:25:06 2023 +1100
@@ -1,8 +1,9 @@
 #ifndef FMODSOUND_H
 #define FMODSOUND_H
 
-#ifndef NO_SOUND
 #include "i_sound.h"
+
+#ifndef NO_FMOD
 #include "fmod_wrap.h"
 
 class FMODSoundRenderer : public SoundRenderer

diff -r 04d296eb008f -r ee76712daade src/sound/i_sound.cpp
--- a/src/sound/i_sound.cpp	Mon Jan 23 20:50:09 2023 +1100
+++ b/src/sound/i_sound.cpp	Tue Jan 24 06:25:06 2023 +1100
@@ -60,9 +60,11 @@
 #include "doomtype.h"
 #include <math.h>
 
-#ifndef NO_SOUND
 #include "fmodsound.h"
-#endif
+#include "oalsound.h"
+
+#include "mpg123_decoder.h"
+#include "sndfile_decoder.h"
 
 #include "m_swap.h"
 #include "stats.h"
@@ -87,6 +89,14 @@
 CVAR (Int, snd_buffersize, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR (String, snd_output, "default", CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 
+#ifndef NO_FMOD
+CVAR (String, snd_backend, "fmod", CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+#elif !defined(NO_OPENAL)
+CVAR (String, snd_backend, "openal", CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+#else
+CVAR (String, snd_backend, "null", CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+#endif
+
 // killough 2/21/98: optionally use varying pitched sounds
 CVAR (Bool, snd_pitched, false, CVAR_ARCHIVE)
 
@@ -248,10 +258,6 @@
 
 void I_InitSound ()
 {
-#ifdef NO_SOUND
-	GSnd = new NullSoundRenderer;
-	I_InitMusic ();
-#else
 	/* Get command line options: */
 	nosound = !!Args->CheckParm ("-nosound") || !!Args->CheckParm("-host"); // [BB] No sound for the server
 	nosfx = !!Args->CheckParm ("-nosfx") || !!Args->CheckParm("-host"); // [BB]
@@ -263,17 +269,25 @@
 		return;
 	}
 
-	GSnd = new FMODSoundRenderer;
+    if(stricmp(snd_backend, "null") == 0)
+        GSnd = new NullSoundRenderer;
+    #ifndef NO_FMOD
+    else if(stricmp(snd_backend, "fmod") == 0)
+        GSnd = new FMODSoundRenderer;
+    #endif
+    #ifndef NO_OPENAL
+    else if(stricmp(snd_backend, "openal") == 0)
+        GSnd = new OpenALSoundRenderer;
+    #endif
 
 	if (!GSnd->IsValid ())
 	{
 		I_CloseSound();
 		GSnd = new NullSoundRenderer;
-		Printf (TEXTCOLOR_RED"Sound init failed. Using nosound.\n");
+		Printf ( TEXTCOLOR_RED "Sound init failed. Using nosound.\n");
 	}
 	I_InitMusic ();
 	snd_sfxvolume.Callback ();
-#endif
 }
 
 
@@ -336,9 +350,28 @@
 	return "No stats for this sound renderer.";
 }
 
-short *SoundRenderer::DecodeSample(int outlen, const void *coded, int sizebytes, ECodecType type)
+short *SoundRenderer::DecodeSample(int outlen, const void *coded, int sizebytes, ECodecType ctype)
 {
-	return NULL;
+    MemoryReader reader((const char*)coded, sizebytes);
+    short *samples = (short*)calloc(1, outlen);
+    ChannelConfig chans;
+    SampleType type;
+    int srate;
+
+    SoundDecoder *decoder = CreateDecoder(&reader);
+    if(!decoder) return samples;
+
+    decoder->getInfo(&srate, &chans, &type);
+    if(chans != ChannelConfig_Mono || type != SampleType_Int16)
+    {
+        DPrintf("Sample is not 16-bit mono\n");
+        delete decoder;
+        return samples;
+    }
+
+    decoder->read((char*)samples, outlen);
+    delete decoder;
+    return samples;
 }
 
 void SoundRenderer::DrawWaveDebug(int mode)
@@ -519,3 +552,46 @@
 	return retval;
 }
 
+SoundDecoder *SoundRenderer::CreateDecoder(FileReader *reader)
+{
+    SoundDecoder *decoder = NULL;
+    int pos = reader->Tell();
+
+#ifdef HAVE_MPG123
+        decoder = new MPG123Decoder;
+        if (decoder->open(reader))
+            return decoder;
+        reader->Seek(pos, SEEK_SET);
+
+        delete decoder;
+        decoder = NULL;
+#endif
+#ifdef HAVE_SNDFILE
+        decoder = new SndFileDecoder;
+        if (decoder->open(reader))
+            return decoder;
+        reader->Seek(pos, SEEK_SET);
+
+        delete decoder;
+        decoder = NULL;
+#endif
+    return decoder;
+}
+
+
+// Default readAll implementation, for decoders that can't do anything better
+TArray<char> SoundDecoder::readAll()
+{
+    TArray<char> output;
+    size_t total = 0;
+    size_t got;
+
+    output.Resize(total+32768);
+    while((got=read(&output[total], output.Size()-total)) > 0)
+    {
+        total += got;
+        output.Resize(total*2);
+    }
+    output.Resize(total);
+    return output;
+}

diff -r 04d296eb008f -r ee76712daade src/sound/i_sound.h
--- a/src/sound/i_sound.h	Mon Jan 23 20:50:09 2023 +1100
+++ b/src/sound/i_sound.h	Tue Jan 24 06:25:06 2023 +1100
@@ -40,44 +40,44 @@
 
 enum ECodecType
 {
-	CODEC_Unknown,
-	CODEC_Vorbis,
+    CODEC_Unknown,
+    CODEC_Vorbis,
 };
 
 enum EStartSoundFlags
 {
-	SNDF_LOOP=1,
-	SNDF_NOPAUSE=2,
-	SNDF_AREA=4,
-	SNDF_ABSTIME=8,
-	SNDF_NOREVERB=16,
+    SNDF_LOOP=1,
+    SNDF_NOPAUSE=2,
+    SNDF_AREA=4,
+    SNDF_ABSTIME=8,
+    SNDF_NOREVERB=16,
 };
 
 class SoundStream
 {
 public:
-	virtual ~SoundStream ();
-
-	enum
-	{	// For CreateStream
-		Mono = 1,
-		Bits8 = 2,
-		Bits32 = 4,
-		Float = 8,
+    virtual ~SoundStream ();
 
-		// For OpenStream
-		Loop = 16
-	};
+    enum
+    {    // For CreateStream
+        Mono = 1,
+        Bits8 = 2,
+        Bits32 = 4,
+        Float = 8,
 
-	virtual bool Play(bool looping, float volume) = 0;
-	virtual void Stop() = 0;
-	virtual void SetVolume(float volume) = 0;
-	virtual bool SetPaused(bool paused) = 0;
-	virtual unsigned int GetPosition() = 0;
-	virtual bool IsEnded() = 0;
-	virtual bool SetPosition(unsigned int pos);
-	virtual bool SetOrder(int order);
-	virtual FString GetStats();
+        // For OpenStream
+        Loop = 16
+    };
+
+    virtual bool Play(bool looping, float volume) = 0;
+    virtual void Stop() = 0;
+    virtual void SetVolume(float volume) = 0;
+    virtual bool SetPaused(bool paused) = 0;
+    virtual unsigned int GetPosition() = 0;
+    virtual bool IsEnded() = 0;
+    virtual bool SetPosition(unsigned int pos);
+    virtual bool SetOrder(int order);
+    virtual FString GetStats();
 };
 
 typedef bool (*SoundStreamCallback)(SoundStream *stream, void *buff, int len, void *userdata);
@@ -85,71 +85,73 @@
 class SoundRenderer
 {
 public:
-	SoundRenderer ();
-	virtual ~SoundRenderer ();
-
-	virtual bool IsNull() { return false; }
-	virtual void SetSfxVolume (float volume) = 0;
-	virtual void SetMusicVolume (float volume) = 0;
-	virtual SoundHandle LoadSound(BYTE *sfxdata, int length) = 0;
-	SoundHandle LoadSoundVoc(BYTE *sfxdata, int length);
-	virtual SoundHandle LoadSoundRaw(BYTE *sfxdata, int length, int frequency, int channels, int bits, int loopstart, int loopend = -1) = 0;
-	virtual void UnloadSound (SoundHandle sfx) = 0;	// unloads a sound from memory
-	virtual unsigned int GetMSLength(SoundHandle sfx) = 0;	// Gets the length of a sound at its default frequency
-	virtual unsigned int GetSampleLength(SoundHandle sfx) = 0;	// Gets the length of a sound at its default frequency
-	virtual float GetOutputRate() = 0;
-
-	// Streaming sounds.
-	virtual SoundStream *CreateStream (SoundStreamCallback callback, int buffbytes, int flags, int samplerate, void *userdata) = 0;
-	virtual SoundStream *OpenStream (const char *filename, int flags, int offset, int length) = 0;
-
-	// Starts a sound.
-	virtual FISoundChannel *StartSound (SoundHandle sfx, float vol, int pitch, int chanflags, FISoundChannel *reuse_chan) = 0;
-	virtual FISoundChannel *StartSound3D (SoundHandle sfx, SoundListener *listener, float vol, FRolloffInfo *rolloff, float distscale, int pitch, int priority, const FVector3 &pos, const FVector3 &vel, int channum, int chanflags, FISoundChannel *reuse_chan) = 0;
-
-	// Stops a sound channel.
-	virtual void StopChannel (FISoundChannel *chan) = 0;
-
-	// Changes a channel's volume.
-	virtual void ChannelVolume (FISoundChannel *chan, float volume) = 0;
-
-	// Marks a channel's start time without actually playing it.
-	virtual void MarkStartTime (FISoundChannel *chan) = 0;
+    SoundRenderer ();
+    virtual ~SoundRenderer ();
 
-	// Returns position of sound on this channel, in samples.
-	virtual unsigned int GetPosition(FISoundChannel *chan) = 0;
-
-	// Gets a channel's audibility (real volume).
-	virtual float GetAudibility(FISoundChannel *chan) = 0;
-
-	// Synchronizes following sound startups.
-	virtual void Sync (bool sync) = 0;
-
-	// Pauses or resumes all sound effect channels.
-	virtual void SetSfxPaused (bool paused, int slot) = 0;
+    virtual bool IsNull() { return false; }
+    virtual void SetSfxVolume (float volume) = 0;
+    virtual void SetMusicVolume (float volume) = 0;
+    virtual SoundHandle LoadSound(BYTE *sfxdata, int length) = 0;
+    SoundHandle LoadSoundVoc(BYTE *sfxdata, int length);
+    virtual SoundHandle LoadSoundRaw(BYTE *sfxdata, int length, int frequency, int channels, int bits, int loopstart, int loopend = -1) = 0;
+    virtual void UnloadSound (SoundHandle sfx) = 0;    // unloads a sound from memory
+    virtual unsigned int GetMSLength(SoundHandle sfx) = 0;    // Gets the length of a sound at its default frequency
+    virtual unsigned int GetSampleLength(SoundHandle sfx) = 0;    // Gets the length of a sound at its default frequency
+    virtual float GetOutputRate() = 0;
 
-	// Pauses or resumes *every* channel, including environmental reverb.
-	enum EInactiveState
-	{
-		INACTIVE_Active,		// sound is active
-		INACTIVE_Complete,		// sound is completely paused
-		INACTIVE_Mute			// sound is only muted
-	};
-	virtual void SetInactive(EInactiveState inactive) = 0;
+    // Streaming sounds.
+    virtual SoundStream *CreateStream (SoundStreamCallback callback, int buffbytes, int flags, int samplerate, void *userdata) = 0;
+    virtual SoundStream *OpenStream (const char *filename, int flags, int offset, int length) = 0;
 
-	// Updates the volume, separation, and pitch of a sound channel.
-	virtual void UpdateSoundParams3D (SoundListener *listener, FISoundChannel *chan, bool areasound, const FVector3 &pos, const FVector3 &vel) = 0;
-
-	virtual void UpdateListener (SoundListener *) = 0;
-	virtual void UpdateSounds () = 0;
+    // Starts a sound.
+    virtual FISoundChannel *StartSound (SoundHandle sfx, float vol, int pitch, int chanflags, FISoundChannel *reuse_chan) = 0;
+    virtual FISoundChannel *StartSound3D (SoundHandle sfx, SoundListener *listener, float vol, FRolloffInfo *rolloff, float distscale, int pitch, int priority, const FVector3 &pos, const FVector3 &vel, int channum, int chanflags, FISoundChannel *reuse_chan) = 0;
 
-	virtual bool IsValid () = 0;
-	virtual void PrintStatus () = 0;
-	virtual void PrintDriversList () = 0;
-	virtual FString GatherStats ();
-	virtual short *DecodeSample(int outlen, const void *coded, int sizebytes, ECodecType type);
+    // Stops a sound channel.
+    virtual void StopChannel (FISoundChannel *chan) = 0;
 
-	virtual void DrawWaveDebug(int mode);
+    // Changes a channel's volume.
+    virtual void ChannelVolume (FISoundChannel *chan, float volume) = 0;
+
+    // Marks a channel's start time without actually playing it.
+    virtual void MarkStartTime (FISoundChannel *chan) = 0;
+
+    // Returns position of sound on this channel, in samples.
+    virtual unsigned int GetPosition(FISoundChannel *chan) = 0;
+
+    // Gets a channel's audibility (real volume).
+    virtual float GetAudibility(FISoundChannel *chan) = 0;
+
+    // Synchronizes following sound startups.
+    virtual void Sync (bool sync) = 0;
+
+    // Pauses or resumes all sound effect channels.
+    virtual void SetSfxPaused (bool paused, int slot) = 0;
+
+    // Pauses or resumes *every* channel, including environmental reverb.
+    enum EInactiveState
+    {
+        INACTIVE_Active,        // sound is active
+        INACTIVE_Complete,        // sound is completely paused
+        INACTIVE_Mute            // sound is only muted
+    };
+    virtual void SetInactive(EInactiveState inactive) = 0;
+
+    // Updates the volume, separation, and pitch of a sound channel.
+    virtual void UpdateSoundParams3D (SoundListener *listener, FISoundChannel *chan, bool areasound, const FVector3 &pos, const FVector3 &vel) = 0;
+
+    virtual void UpdateListener (SoundListener *) = 0;
+    virtual void UpdateSounds () = 0;
+
+    virtual bool IsValid () = 0;
+    virtual void PrintStatus () = 0;
+    virtual void PrintDriversList () = 0;
+    virtual FString GatherStats ();
+    virtual short *DecodeSample(int outlen, const void *coded, int sizebytes, ECodecType type);
+
+    virtual void DrawWaveDebug(int mode);
+protected:
+    virtual SoundDecoder *CreateDecoder(FileReader *reader);
 };
 
 extern SoundRenderer *GSnd;

diff -r 04d296eb008f -r ee76712daade src/sound/i_soundinternal.h
--- a/src/sound/i_soundinternal.h	Mon Jan 23 20:50:09 2023 +1100
+++ b/src/sound/i_soundinternal.h	Tue Jan 24 06:25:06 2023 +1100
@@ -2,14 +2,18 @@
 #define __SNDINT_H
 
 #include "basictypes.h"
+#include "vectors.h"
+#include "tarray.h"
+
+class FileReader;
 
 // For convenience, this structure matches FMOD_REVERB_PROPERTIES.
 // Since I can't very well #include system-specific stuff in the
 // main game files, I duplicate it here.
 struct REVERB_PROPERTIES
-{                
-	int			 Instance;
-    int			 Environment;
+{
+    int             Instance;
+    int             Environment;
     float        EnvSize;
     float        EnvDiffusion;
     int          Room;
@@ -21,13 +25,13 @@
     int          Reflections;
     float        ReflectionsDelay;
     float        ReflectionsPan0;
-	float        ReflectionsPan1;
-	float        ReflectionsPan2;
+    float        ReflectionsPan1;
+    float        ReflectionsPan2;
     int          Reverb;
     float        ReverbDelay;
     float        ReverbPan0;
-	float        ReverbPan1;
-	float        ReverbPan2;
+    float        ReverbPan1;
+    float        ReverbPan2;
     float        EchoTime;
     float        EchoDepth;
     float        ModulationTime;
@@ -52,52 +56,91 @@
 
 struct ReverbContainer
 {
-	ReverbContainer *Next;
-	const char *Name;
-	WORD ID;
-	bool Builtin;
-	bool Modified;
-	REVERB_PROPERTIES Properties;
-	bool SoftwareWater;
+    ReverbContainer *Next;
+    const char *Name;
+    WORD ID;
+    bool Builtin;
+    bool Modified;
+    REVERB_PROPERTIES Properties;
+    bool SoftwareWater;
 };
 
 struct SoundListener
 {
-	FVector3 position;
-	FVector3 velocity;
-	float angle;
-	bool underwater;
-	bool valid;
-	ReverbContainer *Environment;
+    FVector3 position;
+    FVector3 velocity;
+    float angle;
+    bool underwater;
+    bool valid;
+    ReverbContainer *Environment;
 };
 
 // Default rolloff information.
 struct FRolloffInfo
 {
-	int RolloffType;
-	float MinDistance;
-	union { float MaxDistance; float RolloffFactor; };
+    int RolloffType;
+    float MinDistance;
+    union { float MaxDistance; float RolloffFactor; };
 };
 
 struct SoundHandle
 {
-	void *data;
+    void *data;
 
-	bool isValid() const { return data != NULL; }
-	void Clear() { data = NULL; }
+    bool isValid() const { return data != NULL; }
+    void Clear() { data = NULL; }
 };
 
 struct FISoundChannel
 {
-	void		*SysChannel;	// Channel information from the system interface.
-	QWORD_UNION	StartTime;		// Sound start time in DSP clocks.
+    void        *SysChannel;    // Channel information from the system interface.
+    QWORD_UNION    StartTime;        // Sound start time in DSP clocks.
 
-	// The sound interface doesn't use these directly but it needs to pass them to a
-	// callback that can't be passed a sound channel pointer
-	FRolloffInfo Rolloff;
-	float		DistanceScale;
+    // The sound interface doesn't use these directly but it needs to pass them to a
+    // callback that can't be passed a sound channel pointer
+    FRolloffInfo Rolloff;
+    float        DistanceScale;
+    float    DistanceSqr;
+    bool        ManualRolloff;
+};
+
+enum SampleType
+{
+    SampleType_UInt8,
+    SampleType_Int16
+};
+enum ChannelConfig
+{
+    ChannelConfig_Mono,
+    ChannelConfig_Stereo
+};
+
+const char *GetSampleTypeName(enum SampleType type);
+const char *GetChannelConfigName(enum ChannelConfig chan);
+
+struct SoundDecoder
+{
+    virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type) = 0;
+
+    virtual size_t read(char *buffer, size_t bytes) = 0;
+    virtual TArray<char> readAll();
+    virtual bool seek(size_t ms_offset) = 0;
+    virtual size_t getSampleOffset() = 0;
+    virtual size_t getSampleLength() { return 0; }
+
+    SoundDecoder() { }
+    virtual ~SoundDecoder() { }
+
+protected:
+    virtual bool open(FileReader *reader) = 0;
+    friend class SoundRenderer;
+
+private:
+    // Make non-copyable
+    SoundDecoder(const SoundDecoder &rhs);
+    SoundDecoder& operator=(const SoundDecoder &rhs);
 };
 
 
+#endif
 
-#endif

diff -r 04d296eb008f -r ee76712daade src/tarray.h
--- a/src/tarray.h	Mon Jan 23 20:50:09 2023 +1100
+++ b/src/tarray.h	Tue Jan 24 06:25:06 2023 +1100
@@ -137,8 +137,18 @@
 	{
 		return Array[Count-1];
 	}
-
-	unsigned int Push (const T &item)
+    
+    unsigned int Find(const T& item) const
+    {
+        unsigned int i;
+        for(i = 0;i < Count;++i)
+        {
+            if(Array[i] == item)
+                break;
+        }
+        return i;
+    }
+    unsigned int Push (const T &item)
 	{
 		Grow (1);
 		::new((void*)&Array[Count]) T(item);