- on "playmusic" remove volume parameter, add loop parameter
This commit is contained in:
4
lua.cpp
4
lua.cpp
@@ -651,8 +651,8 @@ extern "C" {
|
|||||||
|
|
||||||
static int cpp_playmusic(lua_State *L) {
|
static int cpp_playmusic(lua_State *L) {
|
||||||
const char* str = luaL_checkstring(L, 1);
|
const char* str = luaL_checkstring(L, 1);
|
||||||
const int volume = luaL_optinteger(L, 2, -1);
|
const int loop = luaL_optinteger(L, 2, -1);
|
||||||
playmusic(str, volume);
|
playmusic(str, loop);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
5
mini.cpp
5
mini.cpp
@@ -998,13 +998,12 @@ bool freadb() {
|
|||||||
return strcmp(fstr, "true")==0?true:false;
|
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;
|
int size;
|
||||||
char *buffer = file_getfilebuffer(filename, size);
|
char *buffer = file_getfilebuffer(filename, size);
|
||||||
if (music != NULL) Mix_FreeMusic(music);
|
if (music != NULL) Mix_FreeMusic(music);
|
||||||
music = Mix_LoadMUS_RW(SDL_RWFromMem(buffer, size), 1);
|
music = Mix_LoadMUS_RW(SDL_RWFromMem(buffer, size), 1);
|
||||||
Mix_PlayMusic(music, -1);
|
Mix_PlayMusic(music, loop);
|
||||||
Mix_VolumeMusic(volume!=-1?volume:MIX_MAX_VOLUME);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void pausemusic() {
|
void pausemusic() {
|
||||||
|
|||||||
2
mini.h
2
mini.h
@@ -257,7 +257,7 @@ const char *freads();
|
|||||||
const char *freadw();
|
const char *freadw();
|
||||||
bool freadb();
|
bool freadb();
|
||||||
|
|
||||||
void playmusic(const char *filename, const int volume=-1);
|
void playmusic(const char *filename, const int loop=-1);
|
||||||
void pausemusic();
|
void pausemusic();
|
||||||
void resumemusic();
|
void resumemusic();
|
||||||
void stopmusic();
|
void stopmusic();
|
||||||
|
|||||||
Reference in New Issue
Block a user