mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-20 20:54:46 +00:00
352afa3f0f
SFXResource was always creating a new file for each sound resource. Sometimes this would happen 3 times since the asset was creating a resource, then the profile, then the object that was using it. Now if the sfxResource exists and we call openStream it returns the sfxFileStream linked to that file instead of just creating a new one.
84 lines
2.6 KiB
C++
84 lines
2.6 KiB
C++
//-----------------------------------------------------------------------------
|
|
// Copyright (c) 2012 GarageGames, LLC
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
// of this software and associated documentation files (the "Software"), to
|
|
// deal in the Software without restriction, including without limitation the
|
|
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
// sell copies of the Software, and to permit persons to whom the Software is
|
|
// furnished to do so, subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in
|
|
// all copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
// IN THE SOFTWARE.
|
|
//-----------------------------------------------------------------------------
|
|
|
|
#include "sfx/sfxResource.h"
|
|
#include "sfx/sfxFileStream.h"
|
|
#include "core/util/fourcc.h"
|
|
#include "core/resourceManager.h"
|
|
|
|
|
|
|
|
// Ugly workaround to keep the constructor protected.
|
|
struct SFXResource::_NewHelper
|
|
{
|
|
static SFXResource* New( String fileName, const ThreadSafeRef< SFXStream >& stream )
|
|
{
|
|
return new SFXResource( fileName, stream );
|
|
}
|
|
};
|
|
|
|
|
|
template<>
|
|
void* Resource< SFXResource >::create( const Torque::Path& path )
|
|
{
|
|
String fullPath = path.getFullPath();
|
|
|
|
// Try to open the stream.
|
|
ThreadSafeRef< SFXStream > stream = SFXFileStream::create( fullPath );
|
|
if( !stream )
|
|
return NULL;
|
|
|
|
// We have a valid stream... create the resource.
|
|
SFXResource* res = SFXResource::_NewHelper::New( fullPath, stream );
|
|
|
|
return res;
|
|
}
|
|
|
|
template<>
|
|
ResourceBase::Signature Resource< SFXResource >::signature()
|
|
{
|
|
return MakeFourCC( 's', 'f', 'x', 'r' );
|
|
}
|
|
|
|
Resource< SFXResource > SFXResource::load( String filename )
|
|
{
|
|
return ResourceManager::get().load( filename );
|
|
}
|
|
|
|
SFXResource::SFXResource( String fileName, const ThreadSafeRef<SFXStream>& stream)
|
|
: mFileName( fileName ),
|
|
mFormat( stream->getFormat() ),
|
|
mDuration( stream->getDuration() ),
|
|
mStream(stream)
|
|
{
|
|
}
|
|
|
|
bool SFXResource::exists( String filename )
|
|
{
|
|
return SFXFileStream::exists( filename );
|
|
}
|
|
|
|
ThreadSafeRef<SFXStream> SFXResource::openStream()
|
|
{
|
|
return mStream;
|
|
}
|