TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'SFXResource-fix' into change-to-use-libsndfile

Browse source
This commit is contained in:
marauder2k7 2024-03-24 15:56:01 +00:00
parent 6bc4ace2e5 352afa3f0f
commit d08583bef1
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/sfx/sfxResource.cpp
View file

@ -64,10 +64,11 @@ Resource< SFXResource > SFXResource::load( String filename )
return ResourceManager::get().load( filename );
}
SFXResource::SFXResource( String fileName, SFXStream *stream )
SFXResource::SFXResource( String fileName, const ThreadSafeRef<SFXStream>& stream)
: mFileName( fileName ),
mFormat( stream->getFormat() ),
mDuration( stream->getDuration() )
mDuration( stream->getDuration() ),
mStream(stream)
{
}
@ -76,7 +77,7 @@ bool SFXResource::exists( String filename )
return SFXFileStream::exists( filename );
}
SFXStream* SFXResource::openStream()
ThreadSafeRef<SFXStream> SFXResource::openStream()
{
return SFXFileStream::create( mFileName );
return mStream;
}

12
Engine/source/sfx/sfxResource.h
View file

@ -30,9 +30,9 @@
#include "core/resource.h"
#endif
class SFXStream;
#ifndef _SFXSTREAM_H_
#include "sfx/sfxStream.h"
#endif
/// This is the base class for all sound file resources including
/// streamed sound files. It acts much like an always in-core
@ -68,10 +68,12 @@ class SFXResource
/// The length of the sample in milliseconds.
U32 mDuration;
ThreadSafeRef<SFXStream> mStream;
/// Construct a resource instance for the given file. Format and duration
/// are read from the given stream.
SFXResource( String fileName, SFXStream* stream );
SFXResource( String fileName, const ThreadSafeRef<SFXStream>& stream);
public:
@ -103,7 +105,7 @@ class SFXResource
const SFXFormat& getFormat() const { return mFormat; }
/// Open a stream for reading the resource's sample data.
SFXStream* openStream();
ThreadSafeRef<SFXStream> openStream();
// Internal.
struct _NewHelper;