UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tabs to spaces fix

Browse source
This commit is contained in:
Joshua Reisenauer 2016-04-24 18:18:18 -07:00
parent ec2cbaa5eb
commit cb05c51911
1 changed files with 62 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

124
src/audio.c
View file

@ -75,7 +75,7 @@
// NOTE: Anything longer than ~10 seconds should be streamed... // NOTE: Anything longer than ~10 seconds should be streamed...
typedef struct Music { typedef struct Music {
stb_vorbis *stream; stb_vorbis *stream;
jar_xm_context_t *chipctx; // Stores jar_xm context jar_xm_context_t *chipctx; // Stores jar_xm context
ALuint buffers[MUSIC_STREAM_BUFFERS]; ALuint buffers[MUSIC_STREAM_BUFFERS];
ALuint source; ALuint source;
@ -85,7 +85,7 @@ typedef struct Music {
int sampleRate; int sampleRate;
int totalSamplesLeft; int totalSamplesLeft;
bool loop; bool loop;
bool chipTune; // True if chiptune is loaded bool chipTune; // True if chiptune is loaded
} Music; } Music;
#if defined(AUDIO_STANDALONE) #if defined(AUDIO_STANDALONE)
@ -567,22 +567,22 @@ void PlayMusicStream(char *fileName)
currentMusic.totalSamplesLeft = stb_vorbis_stream_length_in_samples(currentMusic.stream) * currentMusic.channels; currentMusic.totalSamplesLeft = stb_vorbis_stream_length_in_samples(currentMusic.stream) * currentMusic.channels;
} }
} }
else if (strcmp(GetExtension(fileName),"xm") == 0) else if (strcmp(GetExtension(fileName),"xm") == 0)
{ {
currentMusic.chipTune = true; currentMusic.chipTune = true;
currentMusic.channels = 2; currentMusic.channels = 2;
currentMusic.sampleRate = 48000; currentMusic.sampleRate = 48000;
currentMusic.loop = true; currentMusic.loop = true;
// only stereo/float is supported for xm // only stereo/float is supported for xm
if(info.channels == 2 && !jar_xm_create_context_from_file(&currentMusic.chipctx, currentMusic.sampleRate, fileName)) if(info.channels == 2 && !jar_xm_create_context_from_file(&currentMusic.chipctx, currentMusic.sampleRate, fileName))
{ {
currentMusic.format = AL_FORMAT_STEREO_FLOAT32; currentMusic.format = AL_FORMAT_STEREO_FLOAT32;
jar_xm_set_max_loop_count(currentMusic.chipctx, 0); //infinite number of loops jar_xm_set_max_loop_count(currentMusic.chipctx, 0); //infinite number of loops
//currentMusic.totalSamplesLeft = ; // Unsure of how to calculate this //currentMusic.totalSamplesLeft = ; // Unsure of how to calculate this
musicEnabled = true; musicEnabled = true;
} }
} }
else TraceLog(WARNING, "[%s] Music extension not recognized, it can't be loaded", fileName); else TraceLog(WARNING, "[%s] Music extension not recognized, it can't be loaded", fileName);
} }
@ -591,19 +591,19 @@ void StopMusicStream(void)
{ {
if (musicEnabled) if (musicEnabled)
{ {
alSourceStop(currentMusic.source); alSourceStop(currentMusic.source);
EmptyMusicStream(); // Empty music buffers EmptyMusicStream(); // Empty music buffers
alDeleteSources(1, &currentMusic.source); alDeleteSources(1, &currentMusic.source);
alDeleteBuffers(2, currentMusic.buffers); alDeleteBuffers(2, currentMusic.buffers);
if (currentMusic.chipTune) if (currentMusic.chipTune)
{ {
jar_xm_free_context(currentMusic.chipctx); jar_xm_free_context(currentMusic.chipctx);
} }
else else
{ {
stb_vorbis_close(currentMusic.stream); stb_vorbis_close(currentMusic.stream);
} }
} }
musicEnabled = false; musicEnabled = false;
@ -657,15 +657,15 @@ void SetMusicVolume(float volume)
// Get current music time length (in seconds) // Get current music time length (in seconds)
float GetMusicTimeLength(void) float GetMusicTimeLength(void)
{ {
float totalSeconds; float totalSeconds;
if (currentMusic.chipTune) if (currentMusic.chipTune)
{ {
//totalSeconds = (float)samples; // Need to figure out how toget this //totalSeconds = (float)samples; // Need to figure out how toget this
} }
else else
{ {
totalSeconds = stb_vorbis_stream_length_in_seconds(currentMusic.stream); totalSeconds = stb_vorbis_stream_length_in_seconds(currentMusic.stream);
} }
return totalSeconds; return totalSeconds;
} }
@ -673,19 +673,19 @@ float GetMusicTimeLength(void)
// Get current music time played (in seconds) // Get current music time played (in seconds)
float GetMusicTimePlayed(void) float GetMusicTimePlayed(void)
{ {
float secondsPlayed; float secondsPlayed;
if (currentMusic.chipTune) if (currentMusic.chipTune)
{ {
uint64_t* samples; uint64_t* samples;
jar_xm_get_position(currentMusic.chipctx, NULL, NULL, NULL, samples); // Unsure if this is the desired value jar_xm_get_position(currentMusic.chipctx, NULL, NULL, NULL, samples); // Unsure if this is the desired value
secondsPlayed = (float)samples; secondsPlayed = (float)samples;
} }
else else
{ {
int totalSamples = stb_vorbis_stream_length_in_samples(currentMusic.stream) * currentMusic.channels; int totalSamples = stb_vorbis_stream_length_in_samples(currentMusic.stream) * currentMusic.channels;
int samplesPlayed = totalSamples - currentMusic.totalSamplesLeft; int samplesPlayed = totalSamples - currentMusic.totalSamplesLeft;
secondsPlayed = (float)samplesPlayed / (currentMusic.sampleRate * currentMusic.channels); secondsPlayed = (float)samplesPlayed / (currentMusic.sampleRate * currentMusic.channels);
} }
return secondsPlayed; return secondsPlayed;
@ -709,15 +709,15 @@ static bool BufferMusicStream(ALuint buffer)
{ {
while (size < MUSIC_BUFFER_SIZE) while (size < MUSIC_BUFFER_SIZE)
{ {
if (currentMusic.chipTune) if (currentMusic.chipTune)
{ {
jar_xm_generate_samples(currentMusic.chipctx, pcm + size, (MUSIC_BUFFER_SIZE - size)/2); jar_xm_generate_samples(currentMusic.chipctx, pcm + size, (MUSIC_BUFFER_SIZE - size)/2);
streamedBytes = (MUSIC_BUFFER_SIZE - size)/2; // There is no end of stream for xmfiles, once the end is reached zeros are generated for non looped chiptunes. streamedBytes = (MUSIC_BUFFER_SIZE - size)/2; // There is no end of stream for xmfiles, once the end is reached zeros are generated for non looped chiptunes.
} }
else else
{ {
streamedBytes = stb_vorbis_get_samples_short_interleaved(currentMusic.stream, currentMusic.channels, pcm + size, MUSIC_BUFFER_SIZE - size); streamedBytes = stb_vorbis_get_samples_short_interleaved(currentMusic.stream, currentMusic.channels, pcm + size, MUSIC_BUFFER_SIZE - size);
} }
if (streamedBytes > 0) size += (streamedBytes*currentMusic.channels); if (streamedBytes > 0) size += (streamedBytes*currentMusic.channels);
else break; else break;