diff options
| author | Ray <[email protected]> | 2017-03-05 15:49:19 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-03-05 15:49:19 +0100 |
| commit | bb7b9adb371f89f3c8677bdca5418013fe73d9c1 (patch) | |
| tree | 99f1dd9b8c42afb190dc30937dfe2ccc3458ff77 /src/audio.h | |
| parent | b16f11845259205b484c3633b9b9375a69a917ae (diff) | |
| parent | 203d1a154eb5b78fc5f56e9dead04c3a89bcd39e (diff) | |
| download | raylib-bb7b9adb371f89f3c8677bdca5418013fe73d9c1.tar.gz raylib-bb7b9adb371f89f3c8677bdca5418013fe73d9c1.zip | |
Merge pull request #236 from raysan5/develop
Integrate Develop branch
Diffstat (limited to 'src/audio.h')
| -rw-r--r-- | src/audio.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/audio.h b/src/audio.h index 05ba1a1d..01ed9f72 100644 --- a/src/audio.h +++ b/src/audio.h @@ -9,7 +9,7 @@ * Manage mixing channels * Manage raw audio context * -* External libs: +* DEPENDENCIES: * OpenAL Soft - Audio device management (http://kcat.strangesoft.net/openal.html) * stb_vorbis - OGG audio files loading (http://www.nothings.org/stb_vorbis/) * jar_xm - XM module file loading @@ -23,6 +23,8 @@ * Raw audio context support * * +* LICENSE: zlib/libpng +* * Copyright (c) 2014-2016 Ramon Santamaria (@raysan5) * * This software is provided "as-is", without any express or implied warranty. In no event @@ -115,7 +117,7 @@ Wave LoadWave(const char *fileName); // Load wave dat Wave LoadWaveEx(void *data, int sampleCount, int sampleRate, int sampleSize, int channels); // Load wave data from raw array data Sound LoadSound(const char *fileName); // Load sound from file Sound LoadSoundFromWave(Wave wave); // Load sound from wave data -void UpdateSound(Sound sound, const void *data, int numSamples);// Update sound buffer with new data +void UpdateSound(Sound sound, const void *data, int samplesCount); // Update sound buffer with new data void UnloadWave(Wave wave); // Unload wave data void UnloadSound(Sound sound); // Unload sound void PlaySound(Sound sound); // Play a sound @@ -146,7 +148,7 @@ float GetMusicTimePlayed(Music music); // Get current m AudioStream InitAudioStream(unsigned int sampleRate, unsigned int sampleSize, unsigned int channels); // Init audio stream (to stream raw audio pcm data) -void UpdateAudioStream(AudioStream stream, void *data, int numSamples); // Update audio stream buffers with data +void UpdateAudioStream(AudioStream stream, void *data, int samplesCount); // Update audio stream buffers with data void CloseAudioStream(AudioStream stream); // Close audio stream and free memory bool IsAudioBufferProcessed(AudioStream stream); // Check if any audio stream buffers requires refill void PlayAudioStream(AudioStream stream); // Play audio stream |