aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoshua Reisenauer <kd7tck@msn.com>2016-04-24 18:18:18 -0700
committerJoshua Reisenauer <kd7tck@msn.com>2016-04-24 18:18:18 -0700
commitcb05c51911fdc885c8e91e51cbaa2ab32e114c7b (patch)
tree8c01e61e647527f8ad4f4df65c219c5e8cc10804 /src
parentec2cbaa5eb5c4bca059c5592932746369e1e293d (diff)
downloadraylib-cb05c51911fdc885c8e91e51cbaa2ab32e114c7b.tar.gz
raylib-cb05c51911fdc885c8e91e51cbaa2ab32e114c7b.zip
tabs to spaces fix
Diffstat (limited to 'src')
-rw-r--r--src/audio.c124
1 files changed, 62 insertions, 62 deletions
diff --git a/src/audio.c b/src/audio.c
index 9baa2222..e5bd6819 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -75,7 +75,7 @@
// NOTE: Anything longer than ~10 seconds should be streamed...
typedef struct Music {
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 source;
@@ -85,7 +85,7 @@ typedef struct Music {
int sampleRate;
int totalSamplesLeft;
bool loop;
- bool chipTune; // True if chiptune is loaded
+ bool chipTune; // True if chiptune is loaded
} Music;
#if defined(AUDIO_STANDALONE)
@@ -567,22 +567,22 @@ void PlayMusicStream(char *fileName)
currentMusic.totalSamplesLeft = stb_vorbis_stream_length_in_samples(currentMusic.stream) * currentMusic.channels;
}
}
- else if (strcmp(GetExtension(fileName),"xm") == 0)
- {
- currentMusic.chipTune = true;
- currentMusic.channels = 2;
- currentMusic.sampleRate = 48000;
- currentMusic.loop = true;
-
- // only stereo/float is supported for xm
- if(info.channels == 2 && !jar_xm_create_context_from_file(&currentMusic.chipctx, currentMusic.sampleRate, fileName))
- {
- currentMusic.format = AL_FORMAT_STEREO_FLOAT32;
- jar_xm_set_max_loop_count(currentMusic.chipctx, 0); //infinite number of loops
- //currentMusic.totalSamplesLeft = ; // Unsure of how to calculate this
- musicEnabled = true;
- }
- }
+ else if (strcmp(GetExtension(fileName),"xm") == 0)
+ {
+ currentMusic.chipTune = true;
+ currentMusic.channels = 2;
+ currentMusic.sampleRate = 48000;
+ currentMusic.loop = true;
+
+ // only stereo/float is supported for xm
+ if(info.channels == 2 && !jar_xm_create_context_from_file(&currentMusic.chipctx, currentMusic.sampleRate, fileName))
+ {
+ currentMusic.format = AL_FORMAT_STEREO_FLOAT32;
+ jar_xm_set_max_loop_count(currentMusic.chipctx, 0); //infinite number of loops
+ //currentMusic.totalSamplesLeft = ; // Unsure of how to calculate this
+ musicEnabled = true;
+ }
+ }
else TraceLog(WARNING, "[%s] Music extension not recognized, it can't be loaded", fileName);
}
@@ -591,19 +591,19 @@ void StopMusicStream(void)
{
if (musicEnabled)
{
- alSourceStop(currentMusic.source);
- EmptyMusicStream(); // Empty music buffers
- alDeleteSources(1, &currentMusic.source);
- alDeleteBuffers(2, currentMusic.buffers);
-
- if (currentMusic.chipTune)
- {
- jar_xm_free_context(currentMusic.chipctx);
- }
- else
- {
- stb_vorbis_close(currentMusic.stream);
- }
+ alSourceStop(currentMusic.source);
+ EmptyMusicStream(); // Empty music buffers
+ alDeleteSources(1, &currentMusic.source);
+ alDeleteBuffers(2, currentMusic.buffers);
+
+ if (currentMusic.chipTune)
+ {
+ jar_xm_free_context(currentMusic.chipctx);
+ }
+ else
+ {
+ stb_vorbis_close(currentMusic.stream);
+ }
}
musicEnabled = false;
@@ -657,15 +657,15 @@ void SetMusicVolume(float volume)
// Get current music time length (in seconds)
float GetMusicTimeLength(void)
{
- float totalSeconds;
- if (currentMusic.chipTune)
- {
- //totalSeconds = (float)samples; // Need to figure out how toget this
- }
- else
- {
- totalSeconds = stb_vorbis_stream_length_in_seconds(currentMusic.stream);
- }
+ float totalSeconds;
+ if (currentMusic.chipTune)
+ {
+ //totalSeconds = (float)samples; // Need to figure out how toget this
+ }
+ else
+ {
+ totalSeconds = stb_vorbis_stream_length_in_seconds(currentMusic.stream);
+ }
return totalSeconds;
}
@@ -673,19 +673,19 @@ float GetMusicTimeLength(void)
// Get current music time played (in seconds)
float GetMusicTimePlayed(void)
{
- float secondsPlayed;
- if (currentMusic.chipTune)
- {
- uint64_t* samples;
- jar_xm_get_position(currentMusic.chipctx, NULL, NULL, NULL, samples); // Unsure if this is the desired value
- secondsPlayed = (float)samples;
- }
- else
- {
- int totalSamples = stb_vorbis_stream_length_in_samples(currentMusic.stream) * currentMusic.channels;
- int samplesPlayed = totalSamples - currentMusic.totalSamplesLeft;
- secondsPlayed = (float)samplesPlayed / (currentMusic.sampleRate * currentMusic.channels);
- }
+ float secondsPlayed;
+ if (currentMusic.chipTune)
+ {
+ uint64_t* samples;
+ jar_xm_get_position(currentMusic.chipctx, NULL, NULL, NULL, samples); // Unsure if this is the desired value
+ secondsPlayed = (float)samples;
+ }
+ else
+ {
+ int totalSamples = stb_vorbis_stream_length_in_samples(currentMusic.stream) * currentMusic.channels;
+ int samplesPlayed = totalSamples - currentMusic.totalSamplesLeft;
+ secondsPlayed = (float)samplesPlayed / (currentMusic.sampleRate * currentMusic.channels);
+ }
return secondsPlayed;
@@ -709,15 +709,15 @@ static bool BufferMusicStream(ALuint buffer)
{
while (size < MUSIC_BUFFER_SIZE)
{
- if (currentMusic.chipTune)
- {
- 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.
- }
- else
- {
- streamedBytes = stb_vorbis_get_samples_short_interleaved(currentMusic.stream, currentMusic.channels, pcm + size, MUSIC_BUFFER_SIZE - size);
- }
+ if (currentMusic.chipTune)
+ {
+ 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.
+ }
+ else
+ {
+ streamedBytes = stb_vorbis_get_samples_short_interleaved(currentMusic.stream, currentMusic.channels, pcm + size, MUSIC_BUFFER_SIZE - size);
+ }
if (streamedBytes > 0) size += (streamedBytes*currentMusic.channels);
else break;