summaryrefslogtreecommitdiffhomepage
path: root/examples/audio
diff options
context:
space:
mode:
authorRay <[email protected]>2019-05-20 16:36:42 +0200
committerRay <[email protected]>2019-05-20 16:36:42 +0200
commitb525039e0ab8bcaa2fd6bde34c72a6405f88ae49 (patch)
tree08f1c79bfe693643564ed78202c9474b7eb83a79 /examples/audio
parenta43a7980a30a52462956b23f2473e8ef8f38d1fb (diff)
downloadraylib-b525039e0ab8bcaa2fd6bde34c72a6405f88ae49.tar.gz
raylib-b525039e0ab8bcaa2fd6bde34c72a6405f88ae49.zip
Review ALL examples
Diffstat (limited to 'examples/audio')
-rw-r--r--examples/audio/audio_module_playing.c40
-rw-r--r--examples/audio/audio_music_stream.c28
-rw-r--r--examples/audio/audio_raw_stream.c60
-rw-r--r--examples/audio/audio_sound_loading.c14
4 files changed, 71 insertions, 71 deletions
diff --git a/examples/audio/audio_module_playing.c b/examples/audio/audio_module_playing.c
index 54bfa3d2..4aebd1e6 100644
--- a/examples/audio/audio_module_playing.c
+++ b/examples/audio/audio_module_playing.c
@@ -23,25 +23,25 @@ typedef struct {
Color color;
} CircleWave;
-int main()
+int main(void)
{
// Initialization
//--------------------------------------------------------------------------------------
- int screenWidth = 800;
- int screenHeight = 450;
+ const int screenWidth = 800;
+ const int screenHeight = 450;
SetConfigFlags(FLAG_MSAA_4X_HINT); // NOTE: Try to enable MSAA 4X
-
+
InitWindow(screenWidth, screenHeight, "raylib [audio] example - module playing (streaming)");
InitAudioDevice(); // Initialize audio device
-
+
Color colors[14] = { ORANGE, RED, GOLD, LIME, BLUE, VIOLET, BROWN, LIGHTGRAY, PINK,
YELLOW, GREEN, SKYBLUE, PURPLE, BEIGE };
-
+
// Creates ome circles for visual effect
CircleWave circles[MAX_CIRCLES];
-
+
for (int i = MAX_CIRCLES - 1; i >= 0; i--)
{
circles[i].alpha = 0.0f;
@@ -53,7 +53,7 @@ int main()
}
Music xm = LoadMusicStream("resources/chiptun1.mod");
-
+
PlayMusicStream(xm);
float timePlayed = 0.0f;
@@ -68,34 +68,34 @@ int main()
// Update
//----------------------------------------------------------------------------------
UpdateMusicStream(xm); // Update music buffer with new stream data
-
+
// Restart music playing (stop and play)
- if (IsKeyPressed(KEY_SPACE))
+ if (IsKeyPressed(KEY_SPACE))
{
StopMusicStream(xm);
PlayMusicStream(xm);
}
-
- // Pause/Resume music playing
+
+ // Pause/Resume music playing
if (IsKeyPressed(KEY_P))
{
pause = !pause;
-
+
if (pause) PauseMusicStream(xm);
else ResumeMusicStream(xm);
}
-
+
// Get timePlayed scaled to bar dimensions
timePlayed = GetMusicTimePlayed(xm)/GetMusicTimeLength(xm)*(screenWidth - 40);
-
+
// Color circles animation
for (int i = MAX_CIRCLES - 1; (i >= 0) && !pause; i--)
{
circles[i].alpha += circles[i].speed;
circles[i].radius += circles[i].speed*10.0f;
-
+
if (circles[i].alpha > 1.0f) circles[i].speed *= -1;
-
+
if (circles[i].alpha <= 0.0f)
{
circles[i].alpha = 0.0f;
@@ -113,12 +113,12 @@ int main()
BeginDrawing();
ClearBackground(RAYWHITE);
-
+
for (int i = MAX_CIRCLES - 1; i >= 0; i--)
{
DrawCircleV(circles[i].position, circles[i].radius, Fade(circles[i].color, circles[i].alpha));
}
-
+
// Draw time bar
DrawRectangle(20, screenHeight - 20 - 12, screenWidth - 40, 12, LIGHTGRAY);
DrawRectangle(20, screenHeight - 20 - 12, (int)timePlayed, 12, MAROON);
@@ -131,7 +131,7 @@ int main()
// De-Initialization
//--------------------------------------------------------------------------------------
UnloadMusicStream(xm); // Unload music stream buffers from RAM
-
+
CloseAudioDevice(); // Close audio device (music streaming is automatically stopped)
CloseWindow(); // Close window and OpenGL context
diff --git a/examples/audio/audio_music_stream.c b/examples/audio/audio_music_stream.c
index 80dc6f5a..76efb7db 100644
--- a/examples/audio/audio_music_stream.c
+++ b/examples/audio/audio_music_stream.c
@@ -4,7 +4,7 @@
*
* NOTE: This example requires OpenAL Soft library installed
*
-* This example has been created using raylib 1.7 (www.raylib.com)
+* This example has been created using raylib 1.3 (www.raylib.com)
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
*
* Copyright (c) 2015 Ramon Santamaria (@raysan5)
@@ -13,19 +13,19 @@
#include "raylib.h"
-int main()
+int main(void)
{
// Initialization
//--------------------------------------------------------------------------------------
- int screenWidth = 800;
- int screenHeight = 450;
+ const int screenWidth = 800;
+ const int screenHeight = 450;
InitWindow(screenWidth, screenHeight, "raylib [audio] example - music playing (streaming)");
InitAudioDevice(); // Initialize audio device
Music music = LoadMusicStream("resources/guitar_noodling.ogg");
-
+
PlayMusicStream(music);
float timePlayed = 0.0f;
@@ -39,27 +39,27 @@ int main()
{
// Update
//----------------------------------------------------------------------------------
- UpdateMusicStream(music); // Update music buffer with new stream data
-
+ UpdateMusicStream(music); // Update music buffer with new stream data
+
// Restart music playing (stop and play)
- if (IsKeyPressed(KEY_SPACE))
+ if (IsKeyPressed(KEY_SPACE))
{
StopMusicStream(music);
PlayMusicStream(music);
}
-
- // Pause/Resume music playing
+
+ // Pause/Resume music playing
if (IsKeyPressed(KEY_P))
{
pause = !pause;
-
+
if (pause) PauseMusicStream(music);
else ResumeMusicStream(music);
}
-
+
// Get timePlayed scaled to bar dimensions (400 pixels)
timePlayed = GetMusicTimePlayed(music)/GetMusicTimeLength(music)*400;
-
+
if (timePlayed > 400) StopMusicStream(music);
//----------------------------------------------------------------------------------
@@ -74,7 +74,7 @@ int main()
DrawRectangle(200, 200, 400, 12, LIGHTGRAY);
DrawRectangle(200, 200, (int)timePlayed, 12, MAROON);
DrawRectangleLines(200, 200, 400, 12, GRAY);
-
+
DrawText("PRESS SPACE TO RESTART MUSIC", 215, 250, 20, LIGHTGRAY);
DrawText("PRESS P TO PAUSE/RESUME MUSIC", 208, 280, 20, LIGHTGRAY);
diff --git a/examples/audio/audio_raw_stream.c b/examples/audio/audio_raw_stream.c
index d7fa5d79..b114173a 100644
--- a/examples/audio/audio_raw_stream.c
+++ b/examples/audio/audio_raw_stream.c
@@ -20,12 +20,12 @@
#define MAX_SAMPLES 512
#define MAX_SAMPLES_PER_UPDATE 4096
-int main()
+int main(void)
{
// Initialization
//--------------------------------------------------------------------------------------
- int screenWidth = 800;
- int screenHeight = 450;
+ const int screenWidth = 800;
+ const int screenHeight = 450;
InitWindow(screenWidth, screenHeight, "raylib [audio] example - raw audio streaming");
@@ -33,30 +33,30 @@ int main()
// Init raw audio stream (sample rate: 22050, sample size: 16bit-short, channels: 1-mono)
AudioStream stream = InitAudioStream(22050, 16, 1);
-
+
// Buffer for the single cycle waveform we are synthesizing
short *data = (short *)malloc(sizeof(short)*MAX_SAMPLES);
// Frame buffer, describing the waveform when repeated over the course of a frame
short *writeBuf = (short *)malloc(sizeof(short)*MAX_SAMPLES_PER_UPDATE);
-
+
PlayAudioStream(stream); // Start processing stream buffer (no data loaded currently)
-
+
// Position read in to determine next frequency
Vector2 mousePosition = { -100.0f, -100.0f };
-
+
// Cycles per second (hz)
float frequency = 440.0f;
-
+
// Previous value, used to test if sine needs to be rewritten, and to smoothly modulate frequency
float oldFrequency = 1.0f;
-
+
// Cursor to read and copy the samples of the sine wave buffer
int readCursor = 0;
-
+
// Computed size in samples of the sine wave
int waveLength = 1;
-
+
Vector2 position = { 0, 0 };
SetTargetFPS(30); // Set our game to run at 30 frames-per-second
@@ -67,62 +67,62 @@ int main()
{
// Update
//----------------------------------------------------------------------------------
-
+
// Sample mouse input.
mousePosition = GetMousePosition();
-
- if (IsMouseButtonDown(MOUSE_LEFT_BUTTON))
+
+ if (IsMouseButtonDown(MOUSE_LEFT_BUTTON))
{
float fp = (float)(mousePosition.y);
frequency = 40.0f + (float)(fp);
}
-
+
// Rewrite the sine wave.
// Compute two cycles to allow the buffer padding, simplifying any modulation, resampling, etc.
- if (frequency != oldFrequency)
+ if (frequency != oldFrequency)
{
// Compute wavelength. Limit size in both directions.
int oldWavelength = waveLength;
waveLength = (int)(22050/frequency);
if (waveLength > MAX_SAMPLES/2) waveLength = MAX_SAMPLES/2;
if (waveLength < 1) waveLength = 1;
-
+
// Write sine wave.
for (int i = 0; i < waveLength*2; i++)
{
data[i] = (short)(sinf(((2*PI*(float)i/waveLength)))*32000);
}
-
+
// Scale read cursor's position to minimize transition artifacts
readCursor = (int)(readCursor * ((float)waveLength / (float)oldWavelength));
oldFrequency = frequency;
}
-
+
// Refill audio stream if required
- if (IsAudioBufferProcessed(stream))
+ if (IsAudioBufferProcessed(stream))
{
// Synthesize a buffer that is exactly the requested size
int writeCursor = 0;
-
- while (writeCursor < MAX_SAMPLES_PER_UPDATE)
+
+ while (writeCursor < MAX_SAMPLES_PER_UPDATE)
{
// Start by trying to write the whole chunk at once
int writeLength = MAX_SAMPLES_PER_UPDATE-writeCursor;
-
+
// Limit to the maximum readable size
int readLength = waveLength-readCursor;
-
+
if (writeLength > readLength) writeLength = readLength;
// Write the slice
memcpy(writeBuf + writeCursor, data + readCursor, writeLength*sizeof(short));
-
+
// Update cursors and loop audio
readCursor = (readCursor + writeLength) % waveLength;
-
+
writeCursor += writeLength;
}
-
+
// Copy finished frame to audio stream
UpdateAudioStream(stream, writeBuf, MAX_SAMPLES_PER_UPDATE);
}
@@ -136,13 +136,13 @@ int main()
DrawText(FormatText("sine frequency: %i",(int)frequency), GetScreenWidth() - 220, 10, 20, RED);
DrawText("click mouse button to change frequency", 10, 10, 20, DARKGRAY);
-
+
// Draw the current buffer state proportionate to the screen
for (int i = 0; i < screenWidth; i++)
{
position.x = i;
position.y = 250 + 50*data[i*MAX_SAMPLES/screenWidth]/32000;
-
+
DrawPixelV(position, RED);
}
@@ -154,7 +154,7 @@ int main()
//--------------------------------------------------------------------------------------
free(data); // Unload sine wave data
free(writeBuf); // Unload write buffer
-
+
CloseAudioStream(stream); // Close raw audio stream and delete buffers from RAM
CloseAudioDevice(); // Close audio device (music streaming is automatically stopped)
diff --git a/examples/audio/audio_sound_loading.c b/examples/audio/audio_sound_loading.c
index f66a3afd..d208dd9a 100644
--- a/examples/audio/audio_sound_loading.c
+++ b/examples/audio/audio_sound_loading.c
@@ -4,21 +4,21 @@
*
* NOTE: This example requires OpenAL Soft library installed
*
-* This example has been created using raylib 1.3 (www.raylib.com)
+* This example has been created using raylib 1.0 (www.raylib.com)
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
*
-* Copyright (c) 2015 Ramon Santamaria (@raysan5)
+* Copyright (c) 2014 Ramon Santamaria (@raysan5)
*
********************************************************************************************/
#include "raylib.h"
-int main()
+int main(void)
{
// Initialization
//--------------------------------------------------------------------------------------
- int screenWidth = 800;
- int screenHeight = 450;
+ const int screenWidth = 800;
+ const int screenHeight = 450;
InitWindow(screenWidth, screenHeight, "raylib [audio] example - sound loading and playing");
@@ -26,8 +26,8 @@ int main()
Sound fxWav = LoadSound("resources/sound.wav"); // Load WAV audio file
Sound fxOgg = LoadSound("resources/tanatana.ogg"); // Load OGG audio file
-
- SetTargetFPS(60);
+
+ SetTargetFPS(60); // Set our game to run at 60 frames-per-second
//--------------------------------------------------------------------------------------
// Main game loop