From 5075c65f7ee2f2930735f6db908f305700f510aa Mon Sep 17 00:00:00 2001 From: JailDoctor Date: Fri, 13 Jan 2023 13:19:14 +0100 Subject: [PATCH] - on "playmusic" remove volume parameter, add loop parameter --- lua.cpp | 4 ++-- mini.cpp | 5 ++--- mini.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lua.cpp b/lua.cpp index e312b82..1b7e1a1 100644 --- a/lua.cpp +++ b/lua.cpp @@ -651,8 +651,8 @@ extern "C" { static int cpp_playmusic(lua_State *L) { const char* str = luaL_checkstring(L, 1); - const int volume = luaL_optinteger(L, 2, -1); - playmusic(str, volume); + const int loop = luaL_optinteger(L, 2, -1); + playmusic(str, loop); return 0; } diff --git a/mini.cpp b/mini.cpp index e8c7b2d..b7881aa 100644 --- a/mini.cpp +++ b/mini.cpp @@ -998,13 +998,12 @@ bool freadb() { return strcmp(fstr, "true")==0?true:false; } -void playmusic(const char *filename, const int volume) { +void playmusic(const char *filename, const int loop) { int size; char *buffer = file_getfilebuffer(filename, size); if (music != NULL) Mix_FreeMusic(music); music = Mix_LoadMUS_RW(SDL_RWFromMem(buffer, size), 1); - Mix_PlayMusic(music, -1); - Mix_VolumeMusic(volume!=-1?volume:MIX_MAX_VOLUME); + Mix_PlayMusic(music, loop); } void pausemusic() { diff --git a/mini.h b/mini.h index fbb5f8f..a1eb58b 100644 --- a/mini.h +++ b/mini.h @@ -257,7 +257,7 @@ const char *freads(); const char *freadw(); bool freadb(); -void playmusic(const char *filename, const int volume=-1); +void playmusic(const char *filename, const int loop=-1); void pausemusic(); void resumemusic(); void stopmusic();