josh/anaglym
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update AV to remove FileLoader

Browse Source
This commit is contained in:
Josh Holtrop 2011-05-19 17:14:00 -04:00
parent 6e29f8adf6
commit e40a79435d
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/AV.cc
View File

@ -238,8 +238,7 @@ void AV::playCallback(Uint8 * stream, int len)
/******************** AV::Sound ********************/ /******************** AV::Sound ********************/
AV::Sound::Sound(AV & av) AV::Sound::Sound(AV & av)
: m_av(av), : m_av(av)
m_buff(1)
{ {
m_rwops = NULL; m_rwops = NULL;
m_ss = NULL; m_ss = NULL;
@ -255,29 +254,20 @@ AV::Sound::~Sound()
} }
} }
bool AV::Sound::load(FileLoader & fileLoader, const FileLoader::Path & path) bool AV::Sound::load(unsigned char *data, unsigned int size)
{ {
m_buff = fileLoader.load(path); m_rwops = SDL_RWFromMem(data, size);
if (m_buff.size > 0) Sound_AudioInfo desired;
desired.channels = CHANNELS;
desired.format = AUDIO_S16SYS;
desired.rate = SOUND_RATE;
m_ss = Sound_NewSample(m_rwops, NULL, &desired,
CALLBACK_SAMPLES * BYTES_PER_SAMPLE);
if (m_ss != NULL)
{ {
m_rwops = SDL_RWFromMem(m_buff.data, m_buff.size); return true;
Sound_AudioInfo desired;
desired.channels = CHANNELS;
desired.format = AUDIO_S16SYS;
desired.rate = SOUND_RATE;
m_ss = Sound_NewSample(m_rwops, NULL, &desired,
CALLBACK_SAMPLES * BYTES_PER_SAMPLE);
if (m_ss != NULL)
{
return true;
}
else
{
cerr << "Error loading sound " << path.toString() << ": "
<< Sound_GetError() << endl;
m_rwops = NULL;
}
} }
m_rwops = NULL;
return false; return false;
} }

5
src/AV.h
View File

@ -8,7 +8,6 @@
#include <set> #include <set>
#include "FileLoader/FileLoader.h"
#include "refptr/refptr.h" #include "refptr/refptr.h"
#define AV_SOUND_FORMAT AUDIO_S16SYS #define AV_SOUND_FORMAT AUDIO_S16SYS
@ -28,8 +27,7 @@ class AV
public: public:
Sound(AV & av); Sound(AV & av);
~Sound(); ~Sound();
bool load(FileLoader & fileLoader, bool load(unsigned char *data, unsigned int size);
const FileLoader::Path & path);
void play(); void play();
void resume(); void resume();
void stop(); void stop();
@ -42,7 +40,6 @@ class AV
AV & m_av; AV & m_av;
SDL_RWops * m_rwops; SDL_RWops * m_rwops;
Sound_Sample * m_ss; Sound_Sample * m_ss;
FileLoader::Buffer m_buff;
int m_loop_count; int m_loop_count;
int m_buff_bytes_left; int m_buff_bytes_left;
float m_volume; float m_volume;