twix/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2026-02-02 20:29:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Working on new audio functions...

Browse Source
This commit is contained in:
Ray
2016-09-08 01:03:05 +02:00
parent 1e55c30824
commit 0c58c1198f
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/audio.c
View File

@ -218,11 +218,15 @@ Wave LoadWave(const char *fileName)
} }
// Load wave data from float array data (32bit) // Load wave data from float array data (32bit)
Wave LoadWaveEx(float *data, int sampleRate, int sampleSize, int channels) Wave LoadWaveEx(float *data, int sampleCount, int sampleRate, int sampleSize, int channels)
{ {
Wave wave; Wave wave;
wave.data = data; wave.data = data;
wave.sampleCount = sampleCount;
wave.sampleRate = sampleRate;
wave.sampleSize = sampleSize;
wave.channels = channels;
WaveFormat(&wave, sampleRate, sampleSize, channels); WaveFormat(&wave, sampleRate, sampleSize, channels);
@ -579,15 +583,15 @@ Wave WaveCopy(Wave wave)
{ {
Wave newWave; Wave newWave;
if (wave.sampleSize == 8) newWave.data = (unsigned char *)malloc(wave.sampleCount*sizeof(unsigned char)); if (wave.sampleSize == 8) newWave.data = (unsigned char *)malloc(wave.sampleCount*wave.channels*sizeof(unsigned char));
else if (wave.sampleSize == 16) newWave.data = (short *)malloc(wave.sampleCount*sizeof(short)); else if (wave.sampleSize == 16) newWave.data = (short *)malloc(wave.sampleCount*wave.channels*sizeof(short));
else if (wave.sampleSize == 32) newWave.data = (float *)malloc(wave.sampleCount*sizeof(float)); else if (wave.sampleSize == 32) newWave.data = (float *)malloc(wave.sampleCount*wave.channels*sizeof(float));
else TraceLog(WARNING, "Wave sample size not supported for copy"); else TraceLog(WARNING, "Wave sample size not supported for copy");
if (newWave.data != NULL) if (newWave.data != NULL)
{ {
// NOTE: Size must be provided in bytes // NOTE: Size must be provided in bytes
memcpy(newWave.data, wave.data, wave.sampleCount); memcpy(newWave.data, wave.data, wave.sampleCount*wave.channels*wave.sampleSize/8);
newWave.sampleCount = wave.sampleCount; newWave.sampleCount = wave.sampleCount;
newWave.sampleRate = wave.sampleRate; newWave.sampleRate = wave.sampleRate;
@ -602,7 +606,23 @@ Wave WaveCopy(Wave wave)
// NOTE: Security check in case of out-of-range // NOTE: Security check in case of out-of-range
void WaveCrop(Wave *wave, int initSample, int finalSample) void WaveCrop(Wave *wave, int initSample, int finalSample)
{ {
// TODO: Crop wave to a samples range if ((initSample >= 0) && (finalSample > 0) && (finalSample < wave->sampleCount))
{
// TODO: Review cropping (it could be simplified...)
float *samples = GetWaveData(*wave);
float *cropSamples = (float *)malloc((finalSample - initSample)*sizeof(float));
for (int i = initSample; i < finalSample; i++) cropSamples[i] = samples[i];
free(wave->data);
wave->data = cropSamples;
int sampleSize = wave->sampleSize;
wave->sampleSize = 32;
WaveFormat(wave, wave->sampleRate, sampleSize, wave->channels);
}
else TraceLog(WARNING, "Wave crop range out of bounds");
} }
// Get samples data from wave as a floats array // Get samples data from wave as a floats array

2
src/raylib.h
View File

@ -910,7 +910,7 @@ RLAPI void CloseAudioDevice(void); // Close t
RLAPI bool IsAudioDeviceReady(void); // Check if audio device has been initialized successfully RLAPI bool IsAudioDeviceReady(void); // Check if audio device has been initialized successfully
RLAPI Wave LoadWave(const char *fileName); // Load wave data from file into RAM RLAPI Wave LoadWave(const char *fileName); // Load wave data from file into RAM
RLAPI Wave LoadWaveEx(float *data, int sampleRate, int sampleSize, int channels); // Load wave data from float array data (32bit) RLAPI Wave LoadWaveEx(float *data, int sampleCount, int sampleRate, int sampleSize, int channels); // Load wave data from float array data (32bit)
RLAPI Sound LoadSound(const char *fileName); // Load sound to memory RLAPI Sound LoadSound(const char *fileName); // Load sound to memory
RLAPI Sound LoadSoundFromWave(Wave wave); // Load sound to memory from wave data RLAPI Sound LoadSoundFromWave(Wave wave); // Load sound to memory from wave data
RLAPI Sound LoadSoundFromRES(const char *rresName, int resId); // Load sound to memory from rRES file (raylib Resource) RLAPI Sound LoadSoundFromRES(const char *rresName, int resId); // Load sound to memory from rRES file (raylib Resource)