Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Audaspace:

Browse Source 
Replacing AUD_Reference with boost::shared_ptr.
This commit is contained in:
Joerg Mueller
2012-11-05 14:24:35 +00:00
parent 0f9559fe71
commit 5a8d5f77af
137 changed files with 1091 additions and 1040 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
View File

@@ -46,10 +46,10 @@ AUD_FFMPEGFactory::AUD_FFMPEGFactory(const data_t* buffer, int size) :
memcpy(m_buffer->getBuffer(), buffer, size);
}
AUD_Reference<AUD_IReader> AUD_FFMPEGFactory::createReader()
boost::shared_ptr<AUD_IReader> AUD_FFMPEGFactory::createReader()
{
if(m_buffer.isNull())
return new AUD_FFMPEGReader(m_filename);
if(m_buffer.get())
return boost::shared_ptr<AUD_IReader>(new AUD_FFMPEGReader(m_buffer));
else
return new AUD_FFMPEGReader(m_buffer);
return boost::shared_ptr<AUD_IReader>(new AUD_FFMPEGReader(m_filename));
}

6
intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
View File

@@ -31,10 +31,10 @@
#define __AUD_FFMPEGFACTORY_H__
#include "AUD_IFactory.h"
#include "AUD_Reference.h"
#include "AUD_Buffer.h"
#include <string>
#include <boost/shared_ptr.hpp>
/**
* This factory reads a sound file via ffmpeg.
@@ -52,7 +52,7 @@ private:
/**
* The buffer to read from.
*/
AUD_Reference<AUD_Buffer> m_buffer;
boost::shared_ptr<AUD_Buffer> m_buffer;
// hide copy constructor and operator=
AUD_FFMPEGFactory(const AUD_FFMPEGFactory&);
@@ -72,7 +72,7 @@ public:
*/
AUD_FFMPEGFactory(const data_t* buffer, int size);
virtual AUD_Reference<AUD_IReader> createReader();
virtual boost::shared_ptr<AUD_IReader> createReader();
};
#endif //__AUD_FFMPEGFACTORY_H__

2
intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
View File

@@ -197,7 +197,7 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(std::string filename) :
static const char* streamopen_error = "AUD_FFMPEGReader: Stream couldn't be "
"opened.";
AUD_FFMPEGReader::AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer) :
AUD_FFMPEGReader::AUD_FFMPEGReader(boost::shared_ptr<AUD_Buffer> buffer) :
m_pkgbuf(AVCODEC_MAX_AUDIO_FRAME_SIZE<<1),
m_membuffer(buffer),
m_membufferpos(0)

6
intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
View File

@@ -32,10 +32,10 @@
#include "AUD_ConverterFunctions.h"
#include "AUD_IReader.h"
#include "AUD_Reference.h"
#include "AUD_Buffer.h"
#include <string>
#include <boost/shared_ptr.hpp>
struct AVCodecContext;
extern "C" {
@@ -99,7 +99,7 @@ private:
/**
* The memory file to read from.
*/
AUD_Reference<AUD_Buffer> m_membuffer;
boost::shared_ptr<AUD_Buffer> m_membuffer;
/**
* The buffer to read with.
@@ -143,7 +143,7 @@ public:
* \exception AUD_Exception Thrown if the buffer specified cannot be read
* with ffmpeg.
*/
AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer);
AUD_FFMPEGReader(boost::shared_ptr<AUD_Buffer> buffer);
/**
* Destroys the reader and closes the file.