Complete review and update

Simplified module for Music and AudioStream
Added support for raw audio streaming (with example)

7 files changed, 107 insertions, 5 deletions

diff --git a/examples/audio_module_playing.c b/examples/audio_module_playing.c
index 07165c76..fe9ea15c 100644
--- a/examples/audio_module_playing.c
+++ b/examples/audio_module_playing.c
@@ -57,7 +57,7 @@ int main()
     // Create a RenderTexture2D to be used for render to texture
     RenderTexture2D target = LoadRenderTexture(screenWidth, screenHeight);
 
-    Music xm = LoadMusicStream("resources/audio/2t2m_spa.xm");
+    Music xm = LoadMusicStream("resources/audio/mini1111.xm");
     
     PlayMusicStream(xm);
 
diff --git a/examples/audio_music_stream.c b/examples/audio_music_stream.c
index 1d86bd1a..c552d030 100644
--- a/examples/audio_music_stream.c
+++ b/examples/audio_music_stream.c
@@ -59,9 +59,6 @@ int main()
             SetMusicVolume(volume);
         }
 */
-        if (IsWindowMinimized()) PauseMusicStream(music);
-        else ResumeMusicStream(music);
-
         timePlayed = GetMusicTimePlayed(music)/GetMusicTimeLength(music)*100*4; // We scale by 4 to fit 400 pixels
 
         UpdateMusicStream(music);        // Update music buffer with new stream data
diff --git a/examples/audio_raw_stream.c b/examples/audio_raw_stream.c
new file mode 100644
index 00000000..37a5b4ff
--- /dev/null
+++ b/examples/audio_raw_stream.c
@@ -0,0 +1,106 @@
+/*******************************************************************************************
+*
+*   raylib [audio] example - Raw audio streaming
+*
+*   NOTE: This example requires OpenAL Soft library installed
+*
+*   This example has been created using raylib 1.6 (www.raylib.com)
+*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
+*
+*   Copyright (c) 2015 Ramon Santamaria (@raysan5)
+*
+********************************************************************************************/
+
+#include "raylib.h"
+
+#include <stdlib.h>         // Required for: malloc(), free()
+#include <math.h>           // Required for: sinf()
+
+int main()
+{
+    // Initialization
+    //--------------------------------------------------------------------------------------
+    int screenWidth = 800;
+    int screenHeight = 450;
+
+    SetConfigFlags(FLAG_MSAA_4X_HINT);
+    InitWindow(screenWidth, screenHeight, "raylib [audio] example - raw audio streaming");
+
+    InitAudioDevice();              // Initialize audio device
+
+    AudioStream stream = InitAudioStream(44100, 32, 1);  // Init raw audio stream
+    
+    // Fill audio stream with some samples (sine wave)
+    float *data = (float *)malloc(sizeof(float)*44100);
+    
+    for (int i = 0; i < 44100; i++)
+    {
+        data[i] = sinf(2*PI*(float)i*DEG2RAD);
+    }
+    
+    PlayAudioStream(stream);
+    
+    int totalSamples = 44100;
+    int samplesLeft = totalSamples;
+    
+    Vector2 position = { 0, 0 };
+
+    SetTargetFPS(30);               // Set our game to run at 30 frames-per-second
+    //--------------------------------------------------------------------------------------
+
+    // Main game loop
+    while (!WindowShouldClose())    // Detect window close button or ESC key
+    {
+        // Update
+        //----------------------------------------------------------------------------------
+        
+        // Refill audio stream if required
+        if (IsAudioBufferProcessed(stream)) 
+        {
+            int numSamples = 0;
+            if (samplesLeft >= 4096) numSamples = 4096;
+            else numSamples = samplesLeft;
+
+            UpdateAudioStream(stream, data + (totalSamples - samplesLeft), numSamples);
+            
+            samplesLeft -= numSamples;
+            
+            // Reset samples feeding (loop audio)
+            if (samplesLeft <= 0) samplesLeft = totalSamples;
+        }
+        //----------------------------------------------------------------------------------
+
+        // Draw
+        //----------------------------------------------------------------------------------
+        BeginDrawing();
+
+            ClearBackground(RAYWHITE);
+
+            DrawText("SINE WAVE SHOULD BE PLAYING!", 240, 140, 20, LIGHTGRAY);
+            
+            // NOTE: Draw a part of the sine wave (only screen width)
+            for (int i = 0; i < GetScreenWidth(); i++)
+            {
+                position.x = i;
+                position.y = 250 + 50*data[i];
+                
+                DrawPixelV(position, RED);
+            }
+
+        EndDrawing();
+        //----------------------------------------------------------------------------------
+    }
+
+    // De-Initialization
+    //--------------------------------------------------------------------------------------
+    free(data);                 // Unload sine wave data
+    
+    CloseAudioStream(stream);   // Close raw audio stream and delete buffers from RAM
+
+    CloseAudioDevice();         // Close audio device (music streaming is automatically stopped)
+
+    CloseWindow();              // Close window and OpenGL context
+    //--------------------------------------------------------------------------------------
+
+    return 0;
+}
\ No newline at end of file
diff --git a/examples/audio_sound_loading.c b/examples/audio_sound_loading.c
index 8819aad1..f081e8ed 100644
--- a/examples/audio_sound_loading.c
+++ b/examples/audio_sound_loading.c
@@ -36,7 +36,6 @@ int main()
         // Update
         //----------------------------------------------------------------------------------
         if (IsKeyPressed(KEY_SPACE)) PlaySound(fxWav);      // Play WAV sound
-
         if (IsKeyPressed(KEY_ENTER)) PlaySound(fxOgg);      // Play OGG sound
         //----------------------------------------------------------------------------------
 
diff --git a/examples/resources/audio/2t2m_spa.xm b/examples/resources/audio/2t2m_spa.xm
deleted file mode 100644
index fa416ef2..00000000
--- a/examples/resources/audio/2t2m_spa.xm
+++ /dev/null
diff --git a/examples/resources/audio/chiptun1.mod b/examples/resources/audio/chiptun1.mod
new file mode 100644
index 00000000..00d16885
--- /dev/null
+++ b/examples/resources/audio/chiptun1.mod
diff --git a/examples/resources/audio/mini1111.xm b/examples/resources/audio/mini1111.xm
new file mode 100644
index 00000000..a185c1a2
--- /dev/null
+++ b/examples/resources/audio/mini1111.xm