From 75bc53c1a8490b2ff8dfe9d78007076e2edeaab3 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Fri, 7 Jun 2019 16:09:43 +0300
Subject: [PATCH] Added sample for audio module, fixed sound streaming

---
 samples/CMakeLists.txt                        |  1 +
 samples/sources/sample_05/sample_05.cpp       | 81 +++++++++++++++++++
 .../enduro2d/core/audio_impl/audio_bass.cpp   | 18 ++++-
 3 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 samples/sources/sample_05/sample_05.cpp

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index f61c16da..6da5094a 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -34,3 +34,4 @@ add_e2d_sample(01)
 add_e2d_sample(02)
 add_e2d_sample(03)
 add_e2d_sample(04)
+add_e2d_sample(05)
diff --git a/samples/sources/sample_05/sample_05.cpp b/samples/sources/sample_05/sample_05.cpp
new file mode 100644
index 00000000..0f890989
--- /dev/null
+++ b/samples/sources/sample_05/sample_05.cpp
@@ -0,0 +1,81 @@
+
+#include "../common.hpp"
+using namespace e2d;
+
+namespace
+{
+    class game final : public engine::application {
+    public:
+        bool initialize() final {
+            
+            auto fs_file = std::make_unique<filesystem_file_source>();
+            
+            auto sstream1 = the<audio>().preload_stream(fs_file->read("bin/library/Example.ogg"));
+            auto sstream2 = the<audio>().create_stream(fs_file->read("bin/library/Example.ogg"));
+
+            if ( !sstream1 || !sstream2 ) {
+                return false;
+            }
+
+            sound_src1_ = the<audio>().create_source(sstream2);
+            sound_src2_ = the<audio>().create_source(sstream1);
+            sound_src3_ = the<audio>().create_source(sstream1);
+            
+            if ( !sound_src1_ || !sound_src2_ || !sound_src3_ ) {
+                return false;
+            }
+            
+            sound_src1_->play();
+            sound_src1_->looping(true);
+
+            sound_src2_->position(secf(1.0f));
+            sound_src2_->looping(true);
+            sound_src2_->play();
+            
+            sound_src3_->position(secf(2.0f));
+            sound_src3_->looping(true);
+            sound_src3_->play();
+
+            return true;
+        }
+
+        bool frame_tick() final {
+            const keyboard& k = the<input>().keyboard();
+
+            if ( the<window>().should_close() || k.is_key_just_released(keyboard_key::escape) ) {
+                return false;
+            }
+
+            if ( k.is_key_just_pressed(keyboard_key::f12) ) {
+                the<dbgui>().toggle_visible(!the<dbgui>().visible());
+            }
+
+            if ( k.is_key_pressed(keyboard_key::lsuper) && k.is_key_just_released(keyboard_key::enter) ) {
+                the<window>().toggle_fullscreen(!the<window>().fullscreen());
+            }
+
+            return true;
+        }
+
+        void frame_render() final {
+            the<render>().execute(render::command_block<64>()
+                .add_command(render::viewport_command(
+                    the<window>().real_size()))
+                .add_command(render::clear_command()
+                    .color_value({1.f, 0.4f, 0.f, 1.f})));
+        }
+    private:
+        sound_source_ptr sound_src1_;
+        sound_source_ptr sound_src2_;
+        sound_source_ptr sound_src3_;
+    };
+}
+
+int e2d_main(int argc, char *argv[]) {
+    auto params = engine::parameters("sample_05", "enduro2d")
+        .timer_params(engine::timer_parameters()
+            .maximal_framerate(100));
+    modules::initialize<engine>(argc, argv, params).start<game>();
+    modules::shutdown<engine>();
+    return 0;
+}
diff --git a/sources/enduro2d/core/audio_impl/audio_bass.cpp b/sources/enduro2d/core/audio_impl/audio_bass.cpp
index add87e9c..3ce3647e 100644
--- a/sources/enduro2d/core/audio_impl/audio_bass.cpp
+++ b/sources/enduro2d/core/audio_impl/audio_bass.cpp
@@ -31,12 +31,24 @@ namespace e2d
 
     static DWORD CALLBACK sound_stream_read_proc(void *buffer, DWORD length, void *user) {
         auto* self = static_cast<input_stream*>(user);
-        return self->read(buffer, length);
+        DWORD result;
+        try {
+            result = self->read(buffer, length);
+        } catch (...) {
+            result = DWORD(-1);
+        }
+        return result;
     }
 
     static BOOL CALLBACK sound_stream_seek_proc(QWORD offset, void *user) {
         auto* self = static_cast<input_stream*>(user);
-        return self->seek(offset, false);
+        bool result;
+        try {
+            result = self->seek(offset, false) == offset;
+        } catch(...) {
+            result = false;
+        }
+        return result;
     }
 
     //
@@ -192,7 +204,7 @@ namespace e2d
         procs.length = &sound_stream_length_proc;
         procs.read = &sound_stream_read_proc;
         procs.seek = &sound_stream_seek_proc;
-        HSTREAM stream = BASS_StreamCreateFileUser(STREAMFILE_NOBUFFER, 0, &procs, file_stream.get());
+        HSTREAM stream = BASS_StreamCreateFileUser(STREAMFILE_NOBUFFER, BASS_ASYNCFILE, &procs, file_stream.get());
         if ( stream == 0 ) {
             state_->dbg().error("AUDIO: Failed to create sound stream, code (%0)", std::to_string(BASS_ErrorGetCode()));
             return nullptr;