mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I added audio errors

Browse Source 
The only thing I did not change was the _g for globals. Is there any
other way we can mark globals?
This commit is contained in:
Joshua Reisenauer 2016-06-02 02:02:23 -07:00
parent 05f8e83ba9
commit af1eb5453a
4 changed files with 200 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

254
src/audio.c
View File

@ -99,7 +99,7 @@ typedef struct MixChannel_t {
typedef struct Music {
stb_vorbis *stream;
jar_xm_context_t *xmctx; // Stores jar_xm mixc, XM chiptune context
modcontext modctx; // Stores mod chiptune context
jar_mod_context_t modctx; // Stores mod chiptune context
MixChannel_t *mixc; // mix channel
unsigned int totalSamplesLeft;
@ -115,9 +115,9 @@ typedef enum { INFO = 0, ERROR, WARNING, DEBUG, OTHER } TraceLogType;
//----------------------------------------------------------------------------------
// Global Variables Definition
//----------------------------------------------------------------------------------
static MixChannel_t* mixChannelsActive_g[MAX_MIX_CHANNELS]; // What mix channels are currently active
static MixChannel_t* mixChannels_g[MAX_MIX_CHANNELS]; // What mix channels are currently active
static bool musicEnabled_g = false;
static Music currentMusic_g[MAX_MUSIC_STREAMS]; // Current music loaded, up to two can play at the same time
static Music musicChannels_g[MAX_MUSIC_STREAMS]; // Current music loaded, up to two can play at the same time
//----------------------------------------------------------------------------------
// Module specific Functions Declaration
@ -179,7 +179,7 @@ void CloseAudioDevice(void)
{
for(int index=0; index<MAX_MUSIC_STREAMS; index++)
{
if(currentMusic_g[index].mixc) StopMusicStream(index); // Stop music streaming and close current stream
if(musicChannels_g[index].mixc) StopMusicStream(index); // Stop music streaming and close current stream
}
@ -219,13 +219,13 @@ static MixChannel_t* InitMixChannel(unsigned short sampleRate, unsigned char mix
if(mixChannel >= MAX_MIX_CHANNELS) return NULL;
if(!IsAudioDeviceReady()) InitAudioDevice();
if(!mixChannelsActive_g[mixChannel]){
if(!mixChannels_g[mixChannel]){
MixChannel_t *mixc = (MixChannel_t*)malloc(sizeof(MixChannel_t));
mixc->sampleRate = sampleRate;
mixc->channels = channels;
mixc->mixChannel = mixChannel;
mixc->floatingPoint = floatingPoint;
mixChannelsActive_g[mixChannel] = mixc;
mixChannels_g[mixChannel] = mixc;
// setup openAL format
if(channels == 1)
@ -287,7 +287,7 @@ static void CloseMixChannel(MixChannel_t* mixc)
//delete source and buffers
alDeleteSources(1, &mixc->alSource);
alDeleteBuffers(MAX_STREAM_BUFFERS, mixc->alBuffer);
mixChannelsActive_g[mixc->mixChannel] = NULL;
mixChannels_g[mixc->mixChannel] = NULL;
free(mixc);
mixc = NULL;
}
@ -298,7 +298,7 @@ static void CloseMixChannel(MixChannel_t* mixc)
// @Returns number of samples that where processed.
static int BufferMixChannel(MixChannel_t* mixc, void *data, int numberElements)
{
if(!mixc || mixChannelsActive_g[mixc->mixChannel] != mixc) return 0; // when there is two channels there must be an even number of samples
if(!mixc || mixChannels_g[mixc->mixChannel] != mixc) return 0; // when there is two channels there must be an even number of samples
if (!data || !numberElements)
{ // pauses audio until data is given
@ -387,20 +387,20 @@ RawAudioContext InitRawAudioContext(int sampleRate, int channels, bool floatingP
int mixIndex;
for(mixIndex = 0; mixIndex < MAX_MIX_CHANNELS; mixIndex++) // find empty mix channel slot
{
if(mixChannelsActive_g[mixIndex] == NULL) break;
else if(mixIndex == MAX_MIX_CHANNELS - 1) return -1; // error
if(mixChannels_g[mixIndex] == NULL) break;
else if(mixIndex == MAX_MIX_CHANNELS - 1) return ERROR_OUT_OF_MIX_CHANNELS; // error
}
if(InitMixChannel(sampleRate, mixIndex, channels, floatingPoint))
return mixIndex;
else
return -2; // error
return ERROR_RAW_CONTEXT_CREATION; // error
}
void CloseRawAudioContext(RawAudioContext ctx)
{
if(mixChannelsActive_g[ctx])
CloseMixChannel(mixChannelsActive_g[ctx]);
if(mixChannels_g[ctx])
CloseMixChannel(mixChannels_g[ctx]);
}
// if 0 is returned, the buffers are still full and you need to keep trying with the same data until a + number is returned.
@ -411,7 +411,7 @@ int BufferRawAudioContext(RawAudioContext ctx, void *data, unsigned short number
int numBuffered = 0;
if(ctx >= 0)
{
MixChannel_t* mixc = mixChannelsActive_g[ctx];
MixChannel_t* mixc = mixChannels_g[ctx];
numBuffered = BufferMixChannel(mixc, data, numberElements);
}
return numBuffered;
@ -438,7 +438,10 @@ Sound LoadSound(char *fileName)
if (strcmp(GetExtension(fileName),"wav") == 0) wave = LoadWAV(fileName);
else if (strcmp(GetExtension(fileName),"ogg") == 0) wave = LoadOGG(fileName);
else TraceLog(WARNING, "[%s] Sound extension not recognized, it can't be loaded", fileName);
else{
TraceLog(WARNING, "[%s] Sound extension not recognized, it can't be loaded", fileName);
sound.error = ERROR_EXTENSION_NOT_RECOGNIZED; //error
}
if (wave.data != NULL)
{
@ -565,6 +568,7 @@ Sound LoadSoundFromRES(const char *rresName, int resId)
if (rresFile == NULL)
{
TraceLog(WARNING, "[%s] rRES raylib resource file could not be opened", rresName);
sound.error = ERROR_UNABLE_TO_OPEN_RRES_FILE; //error
}
else
{
@ -579,6 +583,7 @@ Sound LoadSoundFromRES(const char *rresName, int resId)
if ((id[0] != 'r') && (id[1] != 'R') && (id[2] != 'E') &&(id[3] != 'S'))
{
TraceLog(WARNING, "[%s] This is not a valid raylib resource file", rresName);
sound.error = ERROR_INVALID_RRES_FILE;
}
else
{
@ -669,6 +674,7 @@ Sound LoadSoundFromRES(const char *rresName, int resId)
else
{
TraceLog(WARNING, "[%s] Required resource do not seem to be a valid SOUND resource", rresName);
sound.error = ERROR_INVALID_RRES_RESOURCE;
}
}
else
@ -774,134 +780,134 @@ int PlayMusicStream(int musicIndex, char *fileName)
{
int mixIndex;
if(currentMusic_g[musicIndex].stream || currentMusic_g[musicIndex].xmctx) return 1; // error
if(musicChannels_g[musicIndex].stream || musicChannels_g[musicIndex].xmctx) return ERROR_UNINITIALIZED_CHANNELS; // error
for(mixIndex = 0; mixIndex < MAX_MIX_CHANNELS; mixIndex++) // find empty mix channel slot
{
if(mixChannelsActive_g[mixIndex] == NULL) break;
else if(mixIndex == MAX_MIX_CHANNELS - 1) return 2; // error
if(mixChannels_g[mixIndex] == NULL) break;
else if(mixIndex == MAX_MIX_CHANNELS - 1) return ERROR_OUT_OF_MIX_CHANNELS; // error
}
if (strcmp(GetExtension(fileName),"ogg") == 0)
{
// Open audio stream
currentMusic_g[musicIndex].stream = stb_vorbis_open_filename(fileName, NULL, NULL);
musicChannels_g[musicIndex].stream = stb_vorbis_open_filename(fileName, NULL, NULL);
if (currentMusic_g[musicIndex].stream == NULL)
if (musicChannels_g[musicIndex].stream == NULL)
{
TraceLog(WARNING, "[%s] OGG audio file could not be opened", fileName);
return 3; // error
return ERROR_LOADING_OGG; // error
}
else
{
// Get file info
stb_vorbis_info info = stb_vorbis_get_info(currentMusic_g[musicIndex].stream);
stb_vorbis_info info = stb_vorbis_get_info(musicChannels_g[musicIndex].stream);
TraceLog(INFO, "[%s] Ogg sample rate: %i", fileName, info.sample_rate);
TraceLog(INFO, "[%s] Ogg channels: %i", fileName, info.channels);
TraceLog(DEBUG, "[%s] Temp memory required: %i", fileName, info.temp_memory_required);
currentMusic_g[musicIndex].loop = true; // We loop by default
musicChannels_g[musicIndex].loop = true; // We loop by default
musicEnabled_g = true;
currentMusic_g[musicIndex].totalSamplesLeft = (unsigned int)stb_vorbis_stream_length_in_samples(currentMusic_g[musicIndex].stream) * info.channels;
currentMusic_g[musicIndex].totalLengthSeconds = stb_vorbis_stream_length_in_seconds(currentMusic_g[musicIndex].stream);
musicChannels_g[musicIndex].totalSamplesLeft = (unsigned int)stb_vorbis_stream_length_in_samples(musicChannels_g[musicIndex].stream) * info.channels;
musicChannels_g[musicIndex].totalLengthSeconds = stb_vorbis_stream_length_in_seconds(musicChannels_g[musicIndex].stream);
if (info.channels == 2){
currentMusic_g[musicIndex].mixc = InitMixChannel(info.sample_rate, mixIndex, 2, false);
currentMusic_g[musicIndex].mixc->playing = true;
musicChannels_g[musicIndex].mixc = InitMixChannel(info.sample_rate, mixIndex, 2, false);
musicChannels_g[musicIndex].mixc->playing = true;
}
else{
currentMusic_g[musicIndex].mixc = InitMixChannel(info.sample_rate, mixIndex, 1, false);
currentMusic_g[musicIndex].mixc->playing = true;
musicChannels_g[musicIndex].mixc = InitMixChannel(info.sample_rate, mixIndex, 1, false);
musicChannels_g[musicIndex].mixc->playing = true;
}
if(!currentMusic_g[musicIndex].mixc) return 4; // error
if(!musicChannels_g[musicIndex].mixc) return ERROR_LOADING_OGG; // error
}
}
else if (strcmp(GetExtension(fileName),"xm") == 0)
{
// only stereo is supported for xm
if(!jar_xm_create_context_from_file(&currentMusic_g[musicIndex].xmctx, 48000, fileName))
if(!jar_xm_create_context_from_file(&musicChannels_g[musicIndex].xmctx, 48000, fileName))
{
currentMusic_g[musicIndex].chipTune = true;
currentMusic_g[musicIndex].loop = true;
jar_xm_set_max_loop_count(currentMusic_g[musicIndex].xmctx, 0); // infinite number of loops
currentMusic_g[musicIndex].totalSamplesLeft = (unsigned int)jar_xm_get_remaining_samples(currentMusic_g[musicIndex].xmctx);
currentMusic_g[musicIndex].totalLengthSeconds = ((float)currentMusic_g[musicIndex].totalSamplesLeft) / 48000.f;
musicChannels_g[musicIndex].chipTune = true;
musicChannels_g[musicIndex].loop = true;
jar_xm_set_max_loop_count(musicChannels_g[musicIndex].xmctx, 0); // infinite number of loops
musicChannels_g[musicIndex].totalSamplesLeft = (unsigned int)jar_xm_get_remaining_samples(musicChannels_g[musicIndex].xmctx);
musicChannels_g[musicIndex].totalLengthSeconds = ((float)musicChannels_g[musicIndex].totalSamplesLeft) / 48000.f;
musicEnabled_g = true;
TraceLog(INFO, "[%s] XM number of samples: %i", fileName, currentMusic_g[musicIndex].totalSamplesLeft);
TraceLog(INFO, "[%s] XM track length: %11.6f sec", fileName, currentMusic_g[musicIndex].totalLengthSeconds);
TraceLog(INFO, "[%s] XM number of samples: %i", fileName, musicChannels_g[musicIndex].totalSamplesLeft);
TraceLog(INFO, "[%s] XM track length: %11.6f sec", fileName, musicChannels_g[musicIndex].totalLengthSeconds);
currentMusic_g[musicIndex].mixc = InitMixChannel(48000, mixIndex, 2, true);
if(!currentMusic_g[musicIndex].mixc) return 5; // error
currentMusic_g[musicIndex].mixc->playing = true;
musicChannels_g[musicIndex].mixc = InitMixChannel(48000, mixIndex, 2, true);
if(!musicChannels_g[musicIndex].mixc) return ERROR_XM_CONTEXT_CREATION; // error
musicChannels_g[musicIndex].mixc->playing = true;
}
else
{
TraceLog(WARNING, "[%s] XM file could not be opened", fileName);
return 6; // error
return ERROR_LOADING_XM; // error
}
}
else if (strcmp(GetExtension(fileName),"mod") == 0)
{
jar_mod_init(&currentMusic_g[musicIndex].modctx);
if(jar_mod_load_file(&currentMusic_g[musicIndex].modctx, fileName))
jar_mod_init(&musicChannels_g[musicIndex].modctx);
if(jar_mod_load_file(&musicChannels_g[musicIndex].modctx, fileName))
{
currentMusic_g[musicIndex].chipTune = true;
currentMusic_g[musicIndex].loop = true;
currentMusic_g[musicIndex].totalSamplesLeft = (unsigned int)jar_mod_max_samples(&currentMusic_g[musicIndex].modctx);
currentMusic_g[musicIndex].totalLengthSeconds = ((float)currentMusic_g[musicIndex].totalSamplesLeft) / 48000.f;
musicChannels_g[musicIndex].chipTune = true;
musicChannels_g[musicIndex].loop = true;
musicChannels_g[musicIndex].totalSamplesLeft = (unsigned int)jar_mod_max_samples(&musicChannels_g[musicIndex].modctx);
musicChannels_g[musicIndex].totalLengthSeconds = ((float)musicChannels_g[musicIndex].totalSamplesLeft) / 48000.f;
musicEnabled_g = true;
TraceLog(INFO, "[%s] MOD number of samples: %i", fileName, currentMusic_g[musicIndex].totalSamplesLeft);
TraceLog(INFO, "[%s] MOD track length: %11.6f sec", fileName, currentMusic_g[musicIndex].totalLengthSeconds);
TraceLog(INFO, "[%s] MOD number of samples: %i", fileName, musicChannels_g[musicIndex].totalSamplesLeft);
TraceLog(INFO, "[%s] MOD track length: %11.6f sec", fileName, musicChannels_g[musicIndex].totalLengthSeconds);
currentMusic_g[musicIndex].mixc = InitMixChannel(48000, mixIndex, 2, false);
if(!currentMusic_g[musicIndex].mixc) return 7; // error
currentMusic_g[musicIndex].mixc->playing = true;
musicChannels_g[musicIndex].mixc = InitMixChannel(48000, mixIndex, 2, false);
if(!musicChannels_g[musicIndex].mixc) return ERROR_MOD_CONTEXT_CREATION; // error
musicChannels_g[musicIndex].mixc->playing = true;
}
else
{
TraceLog(WARNING, "[%s] MOD file could not be opened", fileName);
return 8; // error
return ERROR_LOADING_MOD; // error
}
}
else
{
TraceLog(WARNING, "[%s] Music extension not recognized, it can't be loaded", fileName);
return 9; // error
return ERROR_EXTENSION_NOT_RECOGNIZED; // error
}
return 0; // normal return
}
// Stop music playing for individual music index of currentMusic_g array (close stream)
// Stop music playing for individual music index of musicChannels_g array (close stream)
void StopMusicStream(int index)
{
if (index < MAX_MUSIC_STREAMS && currentMusic_g[index].mixc)
if (index < MAX_MUSIC_STREAMS && musicChannels_g[index].mixc)
{
CloseMixChannel(currentMusic_g[index].mixc);
CloseMixChannel(musicChannels_g[index].mixc);
if (currentMusic_g[index].chipTune && currentMusic_g[index].xmctx)
if (musicChannels_g[index].chipTune && musicChannels_g[index].xmctx)
{
jar_xm_free_context(currentMusic_g[index].xmctx);
currentMusic_g[index].xmctx = 0;
jar_xm_free_context(musicChannels_g[index].xmctx);
musicChannels_g[index].xmctx = 0;
}
else if(currentMusic_g[index].chipTune && currentMusic_g[index].modctx.mod_loaded)
else if(musicChannels_g[index].chipTune && musicChannels_g[index].modctx.mod_loaded)
{
jar_mod_unload(&currentMusic_g[index].modctx);
jar_mod_unload(&musicChannels_g[index].modctx);
}
else
{
stb_vorbis_close(currentMusic_g[index].stream);
stb_vorbis_close(musicChannels_g[index].stream);
}
if(!getMusicStreamCount()) musicEnabled_g = false;
if(currentMusic_g[index].stream || currentMusic_g[index].xmctx)
if(musicChannels_g[index].stream || musicChannels_g[index].xmctx)
{
currentMusic_g[index].stream = NULL;
currentMusic_g[index].xmctx = NULL;
musicChannels_g[index].stream = NULL;
musicChannels_g[index].xmctx = NULL;
}
}
}
@ -911,7 +917,7 @@ int getMusicStreamCount(void)
{
int musicCount = 0;
for(int musicIndex = 0; musicIndex < MAX_MUSIC_STREAMS; musicIndex++) // find empty music slot
if(currentMusic_g[musicIndex].stream != NULL || currentMusic_g[musicIndex].chipTune) musicCount++;
if(musicChannels_g[musicIndex].stream != NULL || musicChannels_g[musicIndex].chipTune) musicCount++;
return musicCount;
}
@ -920,11 +926,11 @@ int getMusicStreamCount(void)
void PauseMusicStream(int index)
{
// Pause music stream if music available!
if (index < MAX_MUSIC_STREAMS && currentMusic_g[index].mixc && musicEnabled_g)
if (index < MAX_MUSIC_STREAMS && musicChannels_g[index].mixc && musicEnabled_g)
{
TraceLog(INFO, "Pausing music stream");
alSourcePause(currentMusic_g[index].mixc->alSource);
currentMusic_g[index].mixc->playing = false;
alSourcePause(musicChannels_g[index].mixc->alSource);
musicChannels_g[index].mixc->playing = false;
}
}
@ -933,13 +939,13 @@ void ResumeMusicStream(int index)
{
// Resume music playing... if music available!
ALenum state;
if(index < MAX_MUSIC_STREAMS && currentMusic_g[index].mixc){
alGetSourcei(currentMusic_g[index].mixc->alSource, AL_SOURCE_STATE, &state);
if(index < MAX_MUSIC_STREAMS && musicChannels_g[index].mixc){
alGetSourcei(musicChannels_g[index].mixc->alSource, AL_SOURCE_STATE, &state);
if (state == AL_PAUSED)
{
TraceLog(INFO, "Resuming music stream");
alSourcePlay(currentMusic_g[index].mixc->alSource);
currentMusic_g[index].mixc->playing = true;
alSourcePlay(musicChannels_g[index].mixc->alSource);
musicChannels_g[index].mixc->playing = true;
}
}
}
@ -950,8 +956,8 @@ bool IsMusicPlaying(int index)
bool playing = false;
ALint state;
if(index < MAX_MUSIC_STREAMS && currentMusic_g[index].mixc){
alGetSourcei(currentMusic_g[index].mixc->alSource, AL_SOURCE_STATE, &state);
if(index < MAX_MUSIC_STREAMS && musicChannels_g[index].mixc){
alGetSourcei(musicChannels_g[index].mixc->alSource, AL_SOURCE_STATE, &state);
if (state == AL_PLAYING) playing = true;
}
@ -961,15 +967,15 @@ bool IsMusicPlaying(int index)
// Set volume for music
void SetMusicVolume(int index, float volume)
{
if(index < MAX_MUSIC_STREAMS && currentMusic_g[index].mixc){
alSourcef(currentMusic_g[index].mixc->alSource, AL_GAIN, volume);
if(index < MAX_MUSIC_STREAMS && musicChannels_g[index].mixc){
alSourcef(musicChannels_g[index].mixc->alSource, AL_GAIN, volume);
}
}
void SetMusicPitch(int index, float pitch)
{
if(index < MAX_MUSIC_STREAMS && currentMusic_g[index].mixc){
alSourcef(currentMusic_g[index].mixc->alSource, AL_PITCH, pitch);
if(index < MAX_MUSIC_STREAMS && musicChannels_g[index].mixc){
alSourcef(musicChannels_g[index].mixc->alSource, AL_PITCH, pitch);
}
}
@ -977,13 +983,13 @@ void SetMusicPitch(int index, float pitch)
float GetMusicTimeLength(int index)
{
float totalSeconds;
if (currentMusic_g[index].chipTune)
if (musicChannels_g[index].chipTune)
{
totalSeconds = (float)currentMusic_g[index].totalLengthSeconds;
totalSeconds = (float)musicChannels_g[index].totalLengthSeconds;
}
else
{
totalSeconds = stb_vorbis_stream_length_in_seconds(currentMusic_g[index].stream);
totalSeconds = stb_vorbis_stream_length_in_seconds(musicChannels_g[index].stream);
}
return totalSeconds;
@ -993,24 +999,24 @@ float GetMusicTimeLength(int index)
float GetMusicTimePlayed(int index)
{
float secondsPlayed = 0.0f;
if(index < MAX_MUSIC_STREAMS && currentMusic_g[index].mixc)
if(index < MAX_MUSIC_STREAMS && musicChannels_g[index].mixc)
{
if (currentMusic_g[index].chipTune && currentMusic_g[index].xmctx)
if (musicChannels_g[index].chipTune && musicChannels_g[index].xmctx)
{
uint64_t samples;
jar_xm_get_position(currentMusic_g[index].xmctx, NULL, NULL, NULL, &samples);
secondsPlayed = (float)samples / (48000.f * currentMusic_g[index].mixc->channels); // Not sure if this is the correct value
jar_xm_get_position(musicChannels_g[index].xmctx, NULL, NULL, NULL, &samples);
secondsPlayed = (float)samples / (48000.f * musicChannels_g[index].mixc->channels); // Not sure if this is the correct value
}
else if(currentMusic_g[index].chipTune && currentMusic_g[index].modctx.mod_loaded)
else if(musicChannels_g[index].chipTune && musicChannels_g[index].modctx.mod_loaded)
{
long numsamp = jar_mod_current_samples(&currentMusic_g[index].modctx);
long numsamp = jar_mod_current_samples(&musicChannels_g[index].modctx);
secondsPlayed = (float)numsamp / (48000.f);
}
else
{
int totalSamples = stb_vorbis_stream_length_in_samples(currentMusic_g[index].stream) * currentMusic_g[index].mixc->channels;
int samplesPlayed = totalSamples - currentMusic_g[index].totalSamplesLeft;
secondsPlayed = (float)samplesPlayed / (currentMusic_g[index].mixc->sampleRate * currentMusic_g[index].mixc->channels);
int totalSamples = stb_vorbis_stream_length_in_samples(musicChannels_g[index].stream) * musicChannels_g[index].mixc->channels;
int samplesPlayed = totalSamples - musicChannels_g[index].totalSamplesLeft;
secondsPlayed = (float)samplesPlayed / (musicChannels_g[index].mixc->sampleRate * musicChannels_g[index].mixc->channels);
}
}
@ -1030,30 +1036,30 @@ static bool BufferMusicStream(int index, int numBuffers)
int size = 0; // Total size of data steamed in L+R samples for xm floats, individual L or R for ogg shorts
bool active = true; // We can get more data from stream (not finished)
if (currentMusic_g[index].chipTune) // There is no end of stream for xmfiles, once the end is reached zeros are generated for non looped chiptunes.
if (musicChannels_g[index].chipTune) // There is no end of stream for xmfiles, once the end is reached zeros are generated for non looped chiptunes.
{
for(int x=0; x<numBuffers; x++)
{
if(currentMusic_g[index].modctx.mod_loaded){
if(currentMusic_g[index].totalSamplesLeft >= MUSIC_BUFFER_SIZE_SHORT)
if(musicChannels_g[index].modctx.mod_loaded){
if(musicChannels_g[index].totalSamplesLeft >= MUSIC_BUFFER_SIZE_SHORT)
size = MUSIC_BUFFER_SIZE_SHORT / 2;
else
size = currentMusic_g[index].totalSamplesLeft / 2;
jar_mod_fillbuffer(&currentMusic_g[index].modctx, pcm, size, 0 );
BufferMixChannel(currentMusic_g[index].mixc, pcm, size * 2);
size = musicChannels_g[index].totalSamplesLeft / 2;
jar_mod_fillbuffer(&musicChannels_g[index].modctx, pcm, size, 0 );
BufferMixChannel(musicChannels_g[index].mixc, pcm, size * 2);
}
else if(currentMusic_g[index].xmctx){
if(currentMusic_g[index].totalSamplesLeft >= MUSIC_BUFFER_SIZE_FLOAT)
else if(musicChannels_g[index].xmctx){
if(musicChannels_g[index].totalSamplesLeft >= MUSIC_BUFFER_SIZE_FLOAT)
size = MUSIC_BUFFER_SIZE_FLOAT / 2;
else
size = currentMusic_g[index].totalSamplesLeft / 2;
jar_xm_generate_samples(currentMusic_g[index].xmctx, pcmf, size); // reads 2*readlen shorts and moves them to buffer+size memory location
BufferMixChannel(currentMusic_g[index].mixc, pcmf, size * 2);
size = musicChannels_g[index].totalSamplesLeft / 2;
jar_xm_generate_samples(musicChannels_g[index].xmctx, pcmf, size); // reads 2*readlen shorts and moves them to buffer+size memory location
BufferMixChannel(musicChannels_g[index].mixc, pcmf, size * 2);
}
currentMusic_g[index].totalSamplesLeft -= size;
if(currentMusic_g[index].totalSamplesLeft <= 0)
musicChannels_g[index].totalSamplesLeft -= size;
if(musicChannels_g[index].totalSamplesLeft <= 0)
{
active = false;
break;
@ -1062,17 +1068,17 @@ static bool BufferMusicStream(int index, int numBuffers)
}
else
{
if(currentMusic_g[index].totalSamplesLeft >= MUSIC_BUFFER_SIZE_SHORT)
if(musicChannels_g[index].totalSamplesLeft >= MUSIC_BUFFER_SIZE_SHORT)
size = MUSIC_BUFFER_SIZE_SHORT;
else
size = currentMusic_g[index].totalSamplesLeft;
size = musicChannels_g[index].totalSamplesLeft;
for(int x=0; x<numBuffers; x++)
{
int streamedBytes = stb_vorbis_get_samples_short_interleaved(currentMusic_g[index].stream, currentMusic_g[index].mixc->channels, pcm, size);
BufferMixChannel(currentMusic_g[index].mixc, pcm, streamedBytes * currentMusic_g[index].mixc->channels);
currentMusic_g[index].totalSamplesLeft -= streamedBytes * currentMusic_g[index].mixc->channels;
if(currentMusic_g[index].totalSamplesLeft <= 0)
int streamedBytes = stb_vorbis_get_samples_short_interleaved(musicChannels_g[index].stream, musicChannels_g[index].mixc->channels, pcm, size);
BufferMixChannel(musicChannels_g[index].mixc, pcm, streamedBytes * musicChannels_g[index].mixc->channels);
musicChannels_g[index].totalSamplesLeft -= streamedBytes * musicChannels_g[index].mixc->channels;
if(musicChannels_g[index].totalSamplesLeft <= 0)
{
active = false;
break;
@ -1089,11 +1095,11 @@ static void EmptyMusicStream(int index)
ALuint buffer = 0;
int queued = 0;
alGetSourcei(currentMusic_g[index].mixc->alSource, AL_BUFFERS_QUEUED, &queued);
alGetSourcei(musicChannels_g[index].mixc->alSource, AL_BUFFERS_QUEUED, &queued);
while (queued > 0)
{
alSourceUnqueueBuffers(currentMusic_g[index].mixc->alSource, 1, &buffer);
alSourceUnqueueBuffers(musicChannels_g[index].mixc->alSource, 1, &buffer);
queued--;
}
@ -1103,7 +1109,7 @@ static void EmptyMusicStream(int index)
static int IsMusicStreamReadyForBuffering(int index)
{
ALint processed = 0;
alGetSourcei(currentMusic_g[index].mixc->alSource, AL_BUFFERS_PROCESSED, &processed);
alGetSourcei(musicChannels_g[index].mixc->alSource, AL_BUFFERS_PROCESSED, &processed);
return processed;
}
@ -1114,21 +1120,21 @@ void UpdateMusicStream(int index)
bool active = true;
int numBuffers = IsMusicStreamReadyForBuffering(index);
if (currentMusic_g[index].mixc->playing && index < MAX_MUSIC_STREAMS && musicEnabled_g && currentMusic_g[index].mixc && numBuffers)
if (musicChannels_g[index].mixc->playing && index < MAX_MUSIC_STREAMS && musicEnabled_g && musicChannels_g[index].mixc && numBuffers)
{
active = BufferMusicStream(index, numBuffers);
if (!active && currentMusic_g[index].loop)
if (!active && musicChannels_g[index].loop)
{
if (currentMusic_g[index].chipTune)
if (musicChannels_g[index].chipTune)
{
if(currentMusic_g[index].modctx.mod_loaded) jar_mod_seek_start(&currentMusic_g[index].modctx);
currentMusic_g[index].totalSamplesLeft = currentMusic_g[index].totalLengthSeconds * 48000;
if(musicChannels_g[index].modctx.mod_loaded) jar_mod_seek_start(&musicChannels_g[index].modctx);
musicChannels_g[index].totalSamplesLeft = musicChannels_g[index].totalLengthSeconds * 48000;
}
else
{
stb_vorbis_seek_start(currentMusic_g[index].stream);
currentMusic_g[index].totalSamplesLeft = stb_vorbis_stream_length_in_samples(currentMusic_g[index].stream) * currentMusic_g[index].mixc->channels;
stb_vorbis_seek_start(musicChannels_g[index].stream);
musicChannels_g[index].totalSamplesLeft = stb_vorbis_stream_length_in_samples(musicChannels_g[index].stream) * musicChannels_g[index].mixc->channels;
}
active = true;
}
@ -1136,9 +1142,9 @@ void UpdateMusicStream(int index)
if (alGetError() != AL_NO_ERROR) TraceLog(WARNING, "Error buffering data...");
alGetSourcei(currentMusic_g[index].mixc->alSource, AL_SOURCE_STATE, &state);
alGetSourcei(musicChannels_g[index].mixc->alSource, AL_SOURCE_STATE, &state);
if (state != AL_PLAYING && active) alSourcePlay(currentMusic_g[index].mixc->alSource);
if (state != AL_PLAYING && active) alSourcePlay(musicChannels_g[index].mixc->alSource);
if (!active) StopMusicStream(index);

20
src/audio.h
View File

@ -47,10 +47,29 @@
#endif
#endif
typedef enum {
ERROR_RAW_CONTEXT_CREATION = -20,
ERROR_XM_CONTEXT_CREATION,
ERROR_MOD_CONTEXT_CREATION,
ERROR_MIX_CHANNEL_CREATION,
ERROR_MUSIC_CHANNEL_CREATION,
ERROR_LOADING_XM,
ERROR_LOADING_MOD,
ERROR_LOADING_WAV,
ERROR_LOADING_OGG,
ERROR_OUT_OF_MIX_CHANNELS,
ERROR_EXTENSION_NOT_RECOGNIZED,
ERROR_UNABLE_TO_OPEN_RRES_FILE,
ERROR_INVALID_RRES_FILE,
ERROR_INVALID_RRES_RESOURCE,
ERROR_UNINITIALIZED_CHANNELS
} AudioError;
// Sound source type
typedef struct Sound {
unsigned int source;
unsigned int buffer;
AudioError error; // if there was any error during the creation or use of this Sound
} Sound;
// Wave type, defines audio wave data
@ -64,6 +83,7 @@ typedef struct Wave {
typedef int RawAudioContext;
#ifdef __cplusplus
extern "C" { // Prevents name mangling of functions
#endif

58
src/jar_mod.h
View File

@ -15,7 +15,7 @@
// Other source files should just include jar_mod.h
//
// SAMPLE CODE:
// modcontext modctx;
// jar_mod_context_t modctx;
// short samplebuff[4096];
// bool bufferFull = false;
// int intro_load(void)
@ -54,17 +54,17 @@
///////////////////////////////////////////////////////////////////////////////////
// HxCMOD Core API:
// -------------------------------------------
// int jar_mod_init(modcontext * modctx)
// int jar_mod_init(jar_mod_context_t * modctx)
//
// - Initialize the modcontext buffer. Must be called before doing anything else.
// - Initialize the jar_mod_context_t buffer. Must be called before doing anything else.
// Return 1 if success. 0 in case of error.
// -------------------------------------------
// mulong jar_mod_load_file(modcontext * modctx, char* filename)
// mulong jar_mod_load_file(jar_mod_context_t * modctx, char* filename)
//
// - "Load" a MOD from file, context must already be initialized.
// Return size of file in bytes.
// -------------------------------------------
// void jar_mod_fillbuffer( modcontext * modctx, unsigned short * outbuffer, unsigned long nbsample, jar_mod_tracker_buffer_state * trkbuf )
// void jar_mod_fillbuffer( jar_mod_context_t * modctx, unsigned short * outbuffer, unsigned long nbsample, jar_mod_tracker_buffer_state * trkbuf )
//
// - Generate and return the next samples chunk to outbuffer.
// nbsample specify the number of stereo 16bits samples you want.
@ -72,7 +72,7 @@
// The output buffer size in bytes must be equal to ( nbsample * 2 * channels ).
// The optional trkbuf parameter can be used to get detailed status of the player. Put NULL/0 is unused.
// -------------------------------------------
// void jar_mod_unload( modcontext * modctx )
// void jar_mod_unload( jar_mod_context_t * modctx )
// - "Unload" / clear the player status.
// -------------------------------------------
///////////////////////////////////////////////////////////////////////////////////
@ -198,7 +198,7 @@ typedef struct {
muchar *modfile; // the raw mod file
mulong modfilesize;
muint loopcount;
} modcontext;
} jar_mod_context_t;
//
// Player states structures
@ -243,14 +243,14 @@ typedef struct jar_mod_tracker_buffer_state_
bool jar_mod_init(modcontext * modctx);
bool jar_mod_setcfg(modcontext * modctx, int samplerate, int bits, int stereo, int stereo_separation, int filter);
void jar_mod_fillbuffer(modcontext * modctx, short * outbuffer, unsigned long nbsample, jar_mod_tracker_buffer_state * trkbuf);
void jar_mod_unload(modcontext * modctx);
mulong jar_mod_load_file(modcontext * modctx, char* filename);
mulong jar_mod_current_samples(modcontext * modctx);
mulong jar_mod_max_samples(modcontext * modctx);
void jar_mod_seek_start(modcontext * ctx);
bool jar_mod_init(jar_mod_context_t * modctx);
bool jar_mod_setcfg(jar_mod_context_t * modctx, int samplerate, int bits, int stereo, int stereo_separation, int filter);
void jar_mod_fillbuffer(jar_mod_context_t * modctx, short * outbuffer, unsigned long nbsample, jar_mod_tracker_buffer_state * trkbuf);
void jar_mod_unload(jar_mod_context_t * modctx);
mulong jar_mod_load_file(jar_mod_context_t * modctx, char* filename);
mulong jar_mod_current_samples(jar_mod_context_t * modctx);
mulong jar_mod_max_samples(jar_mod_context_t * modctx);
void jar_mod_seek_start(jar_mod_context_t * ctx);
#ifdef __cplusplus
}
@ -398,7 +398,7 @@ static int memcompare( unsigned char * buf1, unsigned char * buf2, unsigned int
return 1;
}
static int getnote( modcontext * mod, unsigned short period, int finetune )
static int getnote( jar_mod_context_t * mod, unsigned short period, int finetune )
{
int i;
@ -413,7 +413,7 @@ static int getnote( modcontext * mod, unsigned short period, int finetune )
return MAXNOTES;
}
static void worknote( note * nptr, channel * cptr, char t, modcontext * mod )
static void worknote( note * nptr, channel * cptr, char t, jar_mod_context_t * mod )
{
muint sample, period, effect, operiod;
muint curnote, arpnote;
@ -1051,13 +1051,13 @@ static void workeffect( note * nptr, channel * cptr )
}
///////////////////////////////////////////////////////////////////////////////////
bool jar_mod_init(modcontext * modctx)
bool jar_mod_init(jar_mod_context_t * modctx)
{
muint i,j;
if( modctx )
{
memclear(modctx, 0, sizeof(modcontext));
memclear(modctx, 0, sizeof(jar_mod_context_t));
modctx->playrate = DEFAULT_SAMPLE_RATE;
modctx->stereo = 1;
modctx->stereo_separation = 1;
@ -1079,7 +1079,7 @@ bool jar_mod_init(modcontext * modctx)
return 0;
}
bool jar_mod_setcfg(modcontext * modctx, int samplerate, int bits, int stereo, int stereo_separation, int filter)
bool jar_mod_setcfg(jar_mod_context_t * modctx, int samplerate, int bits, int stereo, int stereo_separation, int filter)
{
if( modctx )
{
@ -1112,7 +1112,7 @@ bool jar_mod_setcfg(modcontext * modctx, int samplerate, int bits, int stereo, i
}
// make certain that mod_data stays in memory while playing
static bool jar_mod_load( modcontext * modctx, void * mod_data, int mod_data_size )
static bool jar_mod_load( jar_mod_context_t * modctx, void * mod_data, int mod_data_size )
{
muint i, max;
unsigned short t;
@ -1230,7 +1230,7 @@ static bool jar_mod_load( modcontext * modctx, void * mod_data, int mod_data_siz
return 0;
}
void jar_mod_fillbuffer( modcontext * modctx, short * outbuffer, unsigned long nbsample, jar_mod_tracker_buffer_state * trkbuf )
void jar_mod_fillbuffer( jar_mod_context_t * modctx, short * outbuffer, unsigned long nbsample, jar_mod_tracker_buffer_state * trkbuf )
{
unsigned long i, j;
unsigned long k;
@ -1472,7 +1472,7 @@ void jar_mod_fillbuffer( modcontext * modctx, short * outbuffer, unsigned long n
}
//resets internals for mod context
static void jar_mod_reset( modcontext * modctx)
static void jar_mod_reset( jar_mod_context_t * modctx)
{
if(modctx)
{
@ -1500,7 +1500,7 @@ static void jar_mod_reset( modcontext * modctx)
}
}
void jar_mod_unload( modcontext * modctx)
void jar_mod_unload( jar_mod_context_t * modctx)
{
if(modctx)
{
@ -1515,7 +1515,7 @@ void jar_mod_unload( modcontext * modctx)
mulong jar_mod_load_file(modcontext * modctx, char* filename)
mulong jar_mod_load_file(jar_mod_context_t * modctx, char* filename)
{
mulong fsize = 0;
if(modctx->modfile)
@ -1545,7 +1545,7 @@ mulong jar_mod_load_file(modcontext * modctx, char* filename)
return fsize;
}
mulong jar_mod_current_samples(modcontext * modctx)
mulong jar_mod_current_samples(jar_mod_context_t * modctx)
{
if(modctx)
return modctx->samplenb;
@ -1554,9 +1554,9 @@ mulong jar_mod_current_samples(modcontext * modctx)
}
// Works, however it is very slow, this data should be cached to ensure it is run only once per file
mulong jar_mod_max_samples(modcontext * ctx)
mulong jar_mod_max_samples(jar_mod_context_t * ctx)
{
modcontext tmpctx;
jar_mod_context_t tmpctx;
jar_mod_init(&tmpctx);
if(!jar_mod_load(&tmpctx, (void*)ctx->modfile, ctx->modfilesize)) return 0;
@ -1571,7 +1571,7 @@ mulong jar_mod_max_samples(modcontext * ctx)
}
// move seek_val to sample index, 0 -> jar_mod_max_samples is the range
void jar_mod_seek_start(modcontext * ctx)
void jar_mod_seek_start(jar_mod_context_t * ctx)
{
if(ctx)
{

21
src/raylib.h
View File

@ -452,10 +452,29 @@ typedef struct Ray {
Vector3 direction;
} Ray;
typedef enum {
ERROR_RAW_CONTEXT_CREATION = -20,
ERROR_XM_CONTEXT_CREATION,
ERROR_MOD_CONTEXT_CREATION,
ERROR_MIX_CHANNEL_CREATION,
ERROR_MUSIC_CHANNEL_CREATION,
ERROR_LOADING_XM,
ERROR_LOADING_MOD,
ERROR_LOADING_WAV,
ERROR_LOADING_OGG,
ERROR_OUT_OF_MIX_CHANNELS,
ERROR_EXTENSION_NOT_RECOGNIZED,
ERROR_UNABLE_TO_OPEN_RRES_FILE,
ERROR_INVALID_RRES_FILE,
ERROR_INVALID_RRES_RESOURCE,
ERROR_UNINITIALIZED_CHANNELS
} AudioError;
// Sound source type
typedef struct Sound {
unsigned int source;
unsigned int buffer;
AudioError error; // if there was any error during the creation or use of this Sound
} Sound;
// Wave type, defines audio wave data
@ -469,6 +488,8 @@ typedef struct Wave {
typedef int RawAudioContext;
// Texture formats
// NOTE: Support depends on OpenGL version and platform
typedef enum {