1 files changed, 108 insertions, 95 deletions

diff --git a/src/lua/modules/audio/audio.cpp b/src/lua/modules/audio/audio.cpp
index 8e11b88..198323d 100644
--- a/src/lua/modules/audio/audio.cpp
+++ b/src/lua/modules/audio/audio.cpp
@@ -3,108 +3,121 @@
 #include "lua/common/common.h"
 #include "libjin/jin.h"
 
-namespace jin
+namespace JinEngine
 {
-namespace lua
-{   
+    namespace Lua
+    {   
 
-	using namespace jin::audio;
-	using namespace jin::filesystem;
+	    using namespace JinEngine::Audio;
+	    using namespace JinEngine::Filesystem;
 
-	typedef SDLAudio Audio;
-	typedef SDLSource Source;
+	    typedef SDLAudio Audio;
+	    typedef SDLSource Source;
 
-    static int l_init(lua_State* L) 
-    {
-		Audio::Setting setting;
-        setting.samplerate = 44100;
-        setting.samples = 44100;
-        if (!Audio::get()->init(&setting))
+        static int l_init(lua_State* L) 
         {
-            luax_error(L, "could not init audio");
-            luax_pushboolean(L, false);
+		    Audio::Setting setting;
+            setting.samplerate = 44100;
+            setting.samples = 44100;
+            if (!Audio::get()->init(&setting))
+            {
+                luax_error(L, "could not init audio");
+                luax_pushboolean(L, false);
+                return 1;
+            }
+            luax_pushboolean(L, true); 
             return 1;
         }
-        luax_pushboolean(L, true); 
-        return 1;
-    }
-
-    static int l_play(lua_State* L)
-    {
-        Audio::get()->play();
-        return 0;
-    }
-
-    static int l_stop(lua_State* L)
-    {
-        Audio::get()->stop();
-        return 0;
-    }
-
-    static int l_pause(lua_State* L)
-    {
-        Audio::get()->pause();
-        return 0;
-    }
-
-    static int l_resume(lua_State* L)
-    {
-        Audio::get()->resume();
-        return 0;
-    }
-
-    static int l_setVolume(lua_State* L)
-    {
-        float volume = luax_checknumber(L, 1);
-        Audio::get()->setVolume(volume);
-        return 0;
-    }
-
-    static int l_newSource(lua_State* L)
-    {
-        Filesystem* fs = Filesystem::get();
-        const char* f = luax_checkstring(L, 1);
-        if (!fs->exists(f))
+
+        static int l_play(lua_State* L)
+        {
+            Audio::get()->play();
+            return 0;
+        }
+
+        static int l_stop(lua_State* L)
+        {
+            Audio::get()->stop();
+            return 0;
+        }
+
+        static int l_pause(lua_State* L)
+        {
+            Audio::get()->pause();
+            return 0;
+        }
+
+        static int l_resume(lua_State* L)
+        {
+            Audio::get()->resume();
+            return 0;
+        }
+
+        static int l_setVolume(lua_State* L)
+        {
+            float volume = luax_checknumber(L, 1);
+            Audio::get()->setVolume(volume);
+            return 0;
+        }
+
+        static int l_newSource(lua_State* L)
         {
-            printf("Error: no such image %s\n", f);
-            exit(1);
+            AssetDatabase* fs = AssetDatabase::get();
+            const char* f = luax_checkstring(L, 1);
+            Buffer b;
+            if (!fs->exists(f))
+            {
+                error(L, "No such image %s", f);
+                goto fail;
+            }
+            if (!fs->read(f, b))
+            {
+                error(L, "Failed to read source file %s", f);
+                goto fail;
+            }
+            Source* src = Source::createSource((void*)&b, b.size());
+            if (src == nullptr)
+            {
+                error(L, "Failed to decode source file %s", f);
+                goto fail;
+            }
+            Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_AUDIO_SOURCE, sizeof(Proxy));
+            proxy->bind(new Ref<Source>(src, JIN_AUDIO_SOURCE));
+            return 1;
+        fail:
+            luax_pushnil(L);
+            return 1;
         }
-        Buffer b;
-        fs->read(f, &b);
-        Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_AUDIO_SOURCE, sizeof(Proxy));
-        Source* src = Source::createSource(b.data, b.size);
-        proxy->bind(new Ref<Source>(src, JIN_AUDIO_SOURCE));
-        return 1;
-    }
     
-    static int l_destroy(lua_State* L)
-    {
-        Audio* audio = Audio::get();
-        audio->quit();
-        return 0;
-    }
-
-    static const luaL_Reg f[] = {
-        { "init",      l_init      },
-        { "play",      l_play      },
-        { "stop",      l_stop      },
-        { "pause",     l_pause     },
-        { "resume",    l_resume    },
-        { "setVolume", l_setVolume },
-        { "newSource", l_newSource },
-        { "destroy",   l_destroy   },
-        { 0,           0           }
-    };
-
-    extern int luaopen_Source(lua_State* L);
-
-    int luaopen_audio(lua_State* L)
-    {
-        luaopen_Source(L);
-
-        luax_newlib(L, f);
-
-        return 1; 
-    }
-}
-}
\ No newline at end of file
+        static int l_destroy(lua_State* L)
+        {
+            Audio* audio = Audio::get();
+            audio->quit();
+            return 0;
+        }
+
+        static const luaL_Reg f[] = {
+            { "init",      l_init      },
+            { "play",      l_play      },
+            { "stop",      l_stop      },
+            { "pause",     l_pause     },
+            { "resume",    l_resume    },
+            { "setVolume", l_setVolume },
+            { "newSource", l_newSource },
+            { "destroy",   l_destroy   },
+            { 0,           0           }
+        };
+
+        extern int luaopen_Source(lua_State* L);
+
+        int luaopen_audio(lua_State* L)
+        {
+            luaopen_Source(L);
+
+            luax_newlib(L, f);
+
+            return 1; 
+        }
+
+    } // namespace Lua
+} // namespace JinEngine
\ No newline at end of file