Browse Source

added set pitch for music streams

pull/116/head
Joshua Reisenauer 9 years ago
parent
commit
ad3d270c42
3 changed files with 26 additions and 20 deletions
  1. +22
    -18
      src/audio.c
  2. +2
    -1
      src/audio.h
  3. +2
    -1
      src/raylib.h

+ 22
- 18
src/audio.c View File

@ -113,7 +113,7 @@ typedef enum { INFO = 0, ERROR, WARNING, DEBUG, OTHER } TraceLogType;
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
static AudioContext_t* mixChannelsActive_g[MAX_AUDIO_CONTEXTS]; // What mix channels are currently active static AudioContext_t* mixChannelsActive_g[MAX_AUDIO_CONTEXTS]; // What mix channels are currently active
static bool musicEnabled = false; static bool musicEnabled = false;
static Music currentMusic[mi">2]; // Current music loaded, up to two can play at the same time
static Music currentMusic[n">MAX_MUSIC_STREAMS]; // Current music loaded, up to two can play at the same time
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Module specific Functions Declaration // Module specific Functions Declaration
@ -797,18 +797,18 @@ void PlayMusicStream(char *fileName)
TraceLog(INFO, "[%s] Ogg channels: %i", fileName, info.channels); TraceLog(INFO, "[%s] Ogg channels: %i", fileName, info.channels);
TraceLog(DEBUG, "[%s] Temp memory required: %i", fileName, info.temp_memory_required); TraceLog(DEBUG, "[%s] Temp memory required: %i", fileName, info.temp_memory_required);
currentMusic[musicIndex].loop = true; // We loop by default
musicEnabled = true;
currentMusic[musicIndex].totalSamplesLeft = stb_vorbis_stream_length_in_samples(currentMusic[musicIndex].stream) * info.channels;
currentMusic[musicIndex].totalLengthSeconds = stb_vorbis_stream_length_in_seconds(currentMusic[musicIndex].stream);
if (info.channels == 2){ if (info.channels == 2){
currentMusic[musicIndex].ctx = InitAudioContext(info.sample_rate, mixIndex, 2, false); currentMusic[musicIndex].ctx = InitAudioContext(info.sample_rate, mixIndex, 2, false);
} }
else{ else{
currentMusic[musicIndex].ctx = InitAudioContext(info.sample_rate, mixIndex, 1, false); currentMusic[musicIndex].ctx = InitAudioContext(info.sample_rate, mixIndex, 1, false);
} }
currentMusic[musicIndex].loop = true; // We loop by default
musicEnabled = true;
currentMusic[musicIndex].totalSamplesLeft = stb_vorbis_stream_length_in_samples(currentMusic[musicIndex].stream) * currentMusic[musicIndex].channels;
currentMusic[musicIndex].totalLengthSeconds = stb_vorbis_stream_length_in_seconds(currentMusic[musicIndex].stream);
} }
} }
else if (strcmp(GetExtension(fileName),"xm") == 0) else if (strcmp(GetExtension(fileName),"xm") == 0)
@ -820,7 +820,7 @@ void PlayMusicStream(char *fileName)
currentMusic[musicIndex].loop = true; currentMusic[musicIndex].loop = true;
jar_xm_set_max_loop_count(currentMusic[musicIndex].chipctx, 0); // infinite number of loops jar_xm_set_max_loop_count(currentMusic[musicIndex].chipctx, 0); // infinite number of loops
currentMusic[musicIndex].totalSamplesLeft = jar_xm_get_remaining_samples(currentMusic[musicIndex].chipctx); currentMusic[musicIndex].totalSamplesLeft = jar_xm_get_remaining_samples(currentMusic[musicIndex].chipctx);
currentMusic[musicIndex].totalLengthSeconds = ((float)currentMusic[musicIndex].totalSamplesLeft) / p">((float)currentMusic[musicIndex].sampleRate);
currentMusic[musicIndex].totalLengthSeconds = ((float)currentMusic[musicIndex].totalSamplesLeft) / mf">48000.f;
musicEnabled = true; musicEnabled = true;
TraceLog(INFO, "[%s] XM number of samples: %i", fileName, currentMusic[musicIndex].totalSamplesLeft); TraceLog(INFO, "[%s] XM number of samples: %i", fileName, currentMusic[musicIndex].totalSamplesLeft);
@ -891,18 +891,15 @@ void ResumeMusicStream(int index)
} }
} }
// Check if music is playing
bool IsMusicPlaying(void)
// Check if any music is playing
bool IsMusicPlaying(int index)
{ {
bool playing = false; bool playing = false;
ALint state; ALint state;
for(int musicIndex = 0; musicIndex < MAX_MUSIC_STREAMS; musicIndex++)
{
if(currentMusic[musicIndex].ctx){
alGetSourcei(currentMusic[musicIndex].ctx->alSource, AL_SOURCE_STATE, &state);
if (state == AL_PLAYING) playing = true;
}
if(index < MAX_MUSIC_STREAMS && currentMusic[index].ctx){
alGetSourcei(currentMusic[index].ctx->alSource, AL_SOURCE_STATE, &state);
if (state == AL_PLAYING) playing = true;
} }
return playing; return playing;
@ -911,8 +908,15 @@ bool IsMusicPlaying(void)
// Set volume for music // Set volume for music
void SetMusicVolume(int index, float volume) void SetMusicVolume(int index, float volume)
{ {
if(currentMusic[musicIndex].ctx){
alSourcef(currentMusic[musicIndex].ctx->alSource, AL_GAIN, volume);
if(index < MAX_MUSIC_STREAMS && currentMusic[index].ctx){
alSourcef(currentMusic[index].ctx->alSource, AL_GAIN, volume);
}
}
void SetMusicPitch(int index, float pitch)
{
if(index < MAX_MUSIC_STREAMS && currentMusic[index].ctx){
alSourcef(currentMusic[index].ctx->alSource, AL_PITCH, pitch);
} }
} }

+ 2
- 1
src/audio.h View File

@ -105,11 +105,12 @@ void UpdateMusicStream(void); // Updates buffe
void StopMusicStream(int index); // Stop music playing (close stream) void StopMusicStream(int index); // Stop music playing (close stream)
void PauseMusicStream(int index); // Pause music playing void PauseMusicStream(int index); // Pause music playing
void ResumeMusicStream(int index); // Resume playing paused music void ResumeMusicStream(int index); // Resume playing paused music
bool IsMusicPlaying(void); // Check if music is playing
bool IsMusicPlaying(int index); // Check if music is playing
void SetMusicVolume(int index, float volume); // Set volume for music (1.0 is max level) void SetMusicVolume(int index, float volume); // Set volume for music (1.0 is max level)
float GetMusicTimeLength(void); // Get music time length (in seconds) float GetMusicTimeLength(void); // Get music time length (in seconds)
float GetMusicTimePlayed(void); // Get current music time played (in seconds) float GetMusicTimePlayed(void); // Get current music time played (in seconds)
int getMusicStreamCount(void); int getMusicStreamCount(void);
void SetMusicPitch(int index, float pitch);
#ifdef __cplusplus #ifdef __cplusplus
} }

+ 2
- 1
src/raylib.h View File

@ -896,11 +896,12 @@ void UpdateMusicStream(void); // Updates buffe
void StopMusicStream(int index); // Stop music playing (close stream) void StopMusicStream(int index); // Stop music playing (close stream)
void PauseMusicStream(int index); // Pause music playing void PauseMusicStream(int index); // Pause music playing
void ResumeMusicStream(int index); // Resume playing paused music void ResumeMusicStream(int index); // Resume playing paused music
bool IsMusicPlaying(void); // Check if music is playing
bool IsMusicPlaying(int index); // Check if music is playing
void SetMusicVolume(int index, float volume); // Set volume for music (1.0 is max level) void SetMusicVolume(int index, float volume); // Set volume for music (1.0 is max level)
float GetMusicTimeLength(void); // Get current music time length (in seconds) float GetMusicTimeLength(void); // Get current music time length (in seconds)
float GetMusicTimePlayed(void); // Get current music time played (in seconds) float GetMusicTimePlayed(void); // Get current music time played (in seconds)
int getMusicStreamCount(void); int getMusicStreamCount(void);
void SetMusicPitch(int index, float pitch);
#ifdef __cplusplus #ifdef __cplusplus
} }

Loading…
Cancel
Save