From 5c9af043503f92852a1a765b6ecfbc1aea24d2e9 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 14 Aug 2018 14:56:47 +0800 Subject: *update --- src/lua/audio/luaopen_audio.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/lua/audio/luaopen_audio.cpp') diff --git a/src/lua/audio/luaopen_audio.cpp b/src/lua/audio/luaopen_audio.cpp index 33f0561..2bb2f3a 100644 --- a/src/lua/audio/luaopen_audio.cpp +++ b/src/lua/audio/luaopen_audio.cpp @@ -1,20 +1,21 @@ #include "lua/luax.h" #include "../luaopen_types.h" -#include "libjin/jin.h" +#include "Source.h" +#include "Audio.h" namespace jin { namespace lua { using namespace jin::filesystem; - using namespace jin::audio; + using namespace jin::lua::audio; static int l_init(lua_State* L) { - SDLAudio::Setting setting; + Audio::Setting setting; setting.samplerate = 44100; setting.samples = 44100; - if (! SDLAudio::get()->init(&setting)) + if (!Audio::get()->init(&setting)) { luax_error(L, "could not init audio"); luax_pushboolean(L, false); @@ -26,32 +27,32 @@ namespace lua static int l_play(lua_State* L) { - SDLAudio::get()->play(); + Audio::get()->play(); return 0; } static int l_stop(lua_State* L) { - SDLAudio::get()->stop(); + Audio::get()->stop(); return 0; } static int l_pause(lua_State* L) { - SDLAudio::get()->pause(); + Audio::get()->pause(); return 0; } static int l_resume(lua_State* L) { - SDLAudio::get()->resume(); + Audio::get()->resume(); return 0; } static int l_setVolume(lua_State* L) { float volume = luax_checknumber(L, 1); - SDLAudio::get()->setVolume(volume); + Audio::get()->setVolume(volume); return 0; } @@ -66,16 +67,15 @@ namespace lua } Buffer b; fs->read(f, &b); - Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_AUDIO_SOURCE, sizeof(Proxy)); - SDLSource* src = SDLSource::createSource(b.data, b.size); + Source* src = Source::createSource(b.data, b.size); proxy->bind(src, JIN_AUDIO_SOURCE); return 1; } static int l_destroy(lua_State* L) { - SDLAudio* audio = SDLAudio::get(); + Audio* audio = Audio::get(); audio->quit(); return 0; } -- cgit v1.1-26-g67d0