diff --git a/src/singe.c b/src/singe.c index 830f4be80..d2f2113e5 100644 --- a/src/singe.c +++ b/src/singe.c @@ -647,8 +647,8 @@ int32_t apiDiscAudio(lua_State *L) { if (lua_isnumber(L, 1)) { if (lua_isboolean(L, 2)) { if (_global.videoHandle >= 0) { - d = lua_tonumber(L, 1); channel = (int32_t)d; - d = lua_toboolean(L, 2); onOff = (bool)d; + d = lua_tonumber(L, 1); channel = (int32_t)d; + d = lua_toboolean(L, 2); onOff = (bool)d; videoGetVolume(_global.videoHandle, &left, &right); if (channel == 1) left = (onOff ? _global.conf->volumeVldp : 0); if (channel == 2) right = (onOff ? _global.conf->volumeVldp : 0); @@ -4708,140 +4708,140 @@ void singe(SDL_Window *window, SDL_Renderer *renderer, ConfigT *conf) { startLuaContext(_global.luaContext); // Lua API for Singe - lua_register(_global.luaContext, "colorBackground", apiColorBackground); - lua_register(_global.luaContext, "colorForeground", apiColorForeground); + lua_register(_global.luaContext, "colorBackground", apiColorBackground); // 1.xx + lua_register(_global.luaContext, "colorForeground", apiColorForeground); // 1.xx - lua_register(_global.luaContext, "controllerGetAxis", apiControllerGetAxis); + lua_register(_global.luaContext, "controllerGetAxis", apiControllerGetAxis); // 2.00 - lua_register(_global.luaContext, "debugPrint", apiDebugPrint); + lua_register(_global.luaContext, "debugPrint", apiDebugPrint); // 1.xx - lua_register(_global.luaContext, "discAudio", apiDiscAudio); - lua_register(_global.luaContext, "discChangeSpeed", apiDiscChangeSpeed); - lua_register(_global.luaContext, "discGetAudioTrack", apiDiscGetAudioTrack); - lua_register(_global.luaContext, "discGetAudioTracks", apiDiscGetAudioTracks); - lua_register(_global.luaContext, "discGetFrame", apiDiscGetFrame); - lua_register(_global.luaContext, "discGetHeight", apiDiscGetHeight); - lua_register(_global.luaContext, "discGetLanguage", apiDiscGetLanguage); - lua_register(_global.luaContext, "discGetState", apiDiscGetState); - lua_register(_global.luaContext, "discGetWidth", apiDiscGetWidth); - lua_register(_global.luaContext, "discPause", apiDiscPause); - lua_register(_global.luaContext, "discPauseAtFrame", apiDiscPauseAtFrame); - lua_register(_global.luaContext, "discPlay", apiDiscPlay); - lua_register(_global.luaContext, "discSearch", apiDiscSearch); - lua_register(_global.luaContext, "discSearchBlanking", apiDiscSearchBlanking); - lua_register(_global.luaContext, "discSetAudioTrack", apiDiscSetAudioTrack); - lua_register(_global.luaContext, "discSetFPS", apiDiscSetFps); - lua_register(_global.luaContext, "discSkipBackward", apiDiscSkipBackward); - lua_register(_global.luaContext, "discSkipBlanking", apiDiscSkipBlanking); - lua_register(_global.luaContext, "discSkipForward", apiDiscSkipForward); - lua_register(_global.luaContext, "discSkipToFrame", apiDiscSkipToFrame); - lua_register(_global.luaContext, "discStepBackward", apiDiscStepBackward); - lua_register(_global.luaContext, "discStepForward", apiDiscStepForward); - lua_register(_global.luaContext, "discStop", apiDiscStop); + lua_register(_global.luaContext, "discAudio", apiDiscAudio); // 1.xx + lua_register(_global.luaContext, "discChangeSpeed", apiDiscChangeSpeed); // 1.xx + lua_register(_global.luaContext, "discGetAudioTrack", apiDiscGetAudioTrack); // 2.10 + lua_register(_global.luaContext, "discGetAudioTracks", apiDiscGetAudioTracks); // 2.10 + lua_register(_global.luaContext, "discGetFrame", apiDiscGetFrame); // 1.xx + lua_register(_global.luaContext, "discGetHeight", apiDiscGetHeight); // 2.00 + lua_register(_global.luaContext, "discGetLanguage", apiDiscGetLanguage); // 2.10 + lua_register(_global.luaContext, "discGetState", apiDiscGetState); // 1.xx RDG + lua_register(_global.luaContext, "discGetWidth", apiDiscGetWidth); // 2.00 + lua_register(_global.luaContext, "discPause", apiDiscPause); // 1.xx + lua_register(_global.luaContext, "discPauseAtFrame", apiDiscPauseAtFrame); // 1.18 + lua_register(_global.luaContext, "discPlay", apiDiscPlay); // 1.xx + lua_register(_global.luaContext, "discSearch", apiDiscSearch); // 1.xx + lua_register(_global.luaContext, "discSearchBlanking", apiDiscSearchBlanking); // 1.xx + lua_register(_global.luaContext, "discSetAudioTrack", apiDiscSetAudioTrack); // 2.10 + lua_register(_global.luaContext, "discSetFPS", apiDiscSetFps); // 1.xx + lua_register(_global.luaContext, "discSkipBackward", apiDiscSkipBackward); // 1.xx + lua_register(_global.luaContext, "discSkipBlanking", apiDiscSkipBlanking); // 1.xx + lua_register(_global.luaContext, "discSkipForward", apiDiscSkipForward); // 1.xx + lua_register(_global.luaContext, "discSkipToFrame", apiDiscSkipToFrame); // 1.xx + lua_register(_global.luaContext, "discStepBackward", apiDiscStepBackward); // 1.xx + lua_register(_global.luaContext, "discStepForward", apiDiscStepForward); // 1.xx + lua_register(_global.luaContext, "discStop", apiDiscStop); // 1.xx - lua_register(_global.luaContext, "fontLoad", apiFontLoad); - lua_register(_global.luaContext, "fontPrint", apiFontPrint); - lua_register(_global.luaContext, "fontQuality", apiFontQuality); - lua_register(_global.luaContext, "fontSelect", apiFontSelect); - lua_register(_global.luaContext, "fontToSprite", apiFontToSprite); + lua_register(_global.luaContext, "fontLoad", apiFontLoad); // 1.xx + lua_register(_global.luaContext, "fontPrint", apiFontPrint); // 1.xx + lua_register(_global.luaContext, "fontQuality", apiFontQuality); // 1.xx + lua_register(_global.luaContext, "fontSelect", apiFontSelect); // 1.xx + lua_register(_global.luaContext, "fontToSprite", apiFontToSprite); // 1.xx lua_register(_global.luaContext, "fontUnload", apiFontUnload); - lua_register(_global.luaContext, "keyboardGetLastDown", apiKeyboardGetLastDown); - lua_register(_global.luaContext, "keyboardGetLastUp", apiKeyboardGetLastUp); - lua_register(_global.luaContext, "keyboardGetMode", apiKeyboardGetMode); - lua_register(_global.luaContext, "keyboardGetModifiers", apiKeyboardGetModifiers); - lua_register(_global.luaContext, "keyboardSetMode", apiKeyboardSetMode); - lua_register(_global.luaContext, "keyboardIsDown", apiKeyboardIsDown); + lua_register(_global.luaContext, "keyboardGetLastDown", apiKeyboardGetLastDown); // 2.10 + lua_register(_global.luaContext, "keyboardGetLastUp", apiKeyboardGetLastUp); // 2.10 + lua_register(_global.luaContext, "keyboardGetMode", apiKeyboardGetMode); // 1.xx RDG + lua_register(_global.luaContext, "keyboardGetModifiers", apiKeyboardGetModifiers); // 2.10 + lua_register(_global.luaContext, "keyboardSetMode", apiKeyboardSetMode); // 1.xx RDG + lua_register(_global.luaContext, "keyboardIsDown", apiKeyboardIsDown); // 2.10 - lua_register(_global.luaContext, "mouseEnable", apiMouseEnable); - lua_register(_global.luaContext, "mouseDisable", apiMouseDisable); - lua_register(_global.luaContext, "mouseGetPosition", apiMouseGetPosition); - lua_register(_global.luaContext, "mouseHowMany", apiMouseHowMany); - lua_register(_global.luaContext, "mouseSetCaptured", apiMouseSetCaptured); - lua_register(_global.luaContext, "mouseSetMode", apiMouseSetMode); + lua_register(_global.luaContext, "mouseEnable", apiMouseEnable); // 1.18 RDG + lua_register(_global.luaContext, "mouseDisable", apiMouseDisable); // 1.18 RDG + lua_register(_global.luaContext, "mouseGetPosition", apiMouseGetPosition); // 2.00 + lua_register(_global.luaContext, "mouseHowMany", apiMouseHowMany); // 1.18 RDG + lua_register(_global.luaContext, "mouseSetCaptured", apiMouseSetCaptured); // 2.00 + lua_register(_global.luaContext, "mouseSetMode", apiMouseSetMode); // 1.18 RDG - lua_register(_global.luaContext, "overlayBox", apiOverlayBox); - lua_register(_global.luaContext, "overlayCircle", apiOverlayCircle); - lua_register(_global.luaContext, "overlayClear", apiOverlayClear); - lua_register(_global.luaContext, "overlayEllipse", apiOverlayEllipse); - lua_register(_global.luaContext, "overlayGetHeight", apiOverlayGetHeight); - lua_register(_global.luaContext, "overlayGetWidth", apiOverlayGetWidth); - lua_register(_global.luaContext, "overlayLine", apiOverlayLine); - lua_register(_global.luaContext, "overlayPlot", apiOverlayPlot); - lua_register(_global.luaContext, "overlayPrint", apiOverlayPrint); - lua_register(_global.luaContext, "overlaySetResolution", apiOverlaySetResolution); + lua_register(_global.luaContext, "overlayBox", apiOverlayBox); // 2.00 + lua_register(_global.luaContext, "overlayCircle", apiOverlayCircle); // 2.00 + lua_register(_global.luaContext, "overlayClear", apiOverlayClear); // 1.xx + lua_register(_global.luaContext, "overlayEllipse", apiOverlayEllipse); // 2.00 + lua_register(_global.luaContext, "overlayGetHeight", apiOverlayGetHeight); // 1.xx + lua_register(_global.luaContext, "overlayGetWidth", apiOverlayGetWidth); // 1.xx + lua_register(_global.luaContext, "overlayLine", apiOverlayLine); // 2.00 + lua_register(_global.luaContext, "overlayPlot", apiOverlayPlot); // 2.00 + lua_register(_global.luaContext, "overlayPrint", apiOverlayPrint); // 1.xx + lua_register(_global.luaContext, "overlaySetResolution", apiOverlaySetResolution); // 2.00 - lua_register(_global.luaContext, "scriptExecute", apiScriptExecute); - lua_register(_global.luaContext, "scriptPush", apiScriptPush); + lua_register(_global.luaContext, "scriptExecute", apiScriptExecute); // 2.00 + lua_register(_global.luaContext, "scriptPush", apiScriptPush); // 2.00 - lua_register(_global.luaContext, "singeDisablePauseKey", apiSingeDisablePauseKey); - lua_register(_global.luaContext, "singeEnablePauseKey", apiSingeEnablePauseKey); + lua_register(_global.luaContext, "singeDisablePauseKey", apiSingeDisablePauseKey); // 1.18 RDG + lua_register(_global.luaContext, "singeEnablePauseKey", apiSingeEnablePauseKey); // 1.18 RDG lua_register(_global.luaContext, "singeGetDataPath", apiSingeGetDataPath); - lua_register(_global.luaContext, "singeGetHeight", apiSingeGetHeight); - lua_register(_global.luaContext, "singeGetPauseFlag", apiSingeGetPauseFlag); - lua_register(_global.luaContext, "singeGetScriptPath", apiSingeGetScriptPath); - lua_register(_global.luaContext, "singeGetWidth", apiSingeGetWidth); - lua_register(_global.luaContext, "singeScreenshot", apiSingeScreenshot); - lua_register(_global.luaContext, "singeSetGameName", apiSingeSetGameName); - lua_register(_global.luaContext, "singeSetPauseFlag", apiSingeSetPauseFlag); - lua_register(_global.luaContext, "singeQuit", apiSingeQuit); - lua_register(_global.luaContext, "singeVersion", apiSingeVersion); - lua_register(_global.luaContext, "singeWantsCrosshairs", apiSingeWantsCrosshairs); + lua_register(_global.luaContext, "singeGetHeight", apiSingeGetHeight); // 1.xx + lua_register(_global.luaContext, "singeGetPauseFlag", apiSingeGetPauseFlag); // 1.xx RDG + lua_register(_global.luaContext, "singeGetScriptPath", apiSingeGetScriptPath); // 1.15 RDG + lua_register(_global.luaContext, "singeGetWidth", apiSingeGetWidth); // 1.xx + lua_register(_global.luaContext, "singeScreenshot", apiSingeScreenshot); // 1.xx + lua_register(_global.luaContext, "singeSetGameName", apiSingeSetGameName); // 1.15 RDG + lua_register(_global.luaContext, "singeSetPauseFlag", apiSingeSetPauseFlag); // 1.xx RDG + lua_register(_global.luaContext, "singeQuit", apiSingeQuit); // 1.xx RDG + lua_register(_global.luaContext, "singeVersion", apiSingeVersion); // 1.xx RDG + lua_register(_global.luaContext, "singeWantsCrosshairs", apiSingeWantsCrosshairs); // 2.00 - lua_register(_global.luaContext, "soundFullStop", apiSoundFullStop); - lua_register(_global.luaContext, "soundGetVolume", apiSoundGetVolume); - lua_register(_global.luaContext, "soundIsPlaying", apiSoundIsPlaying); - lua_register(_global.luaContext, "soundLoad", apiSoundLoad); - lua_register(_global.luaContext, "soundPause", apiSoundPause); - lua_register(_global.luaContext, "soundPlay", apiSoundPlay); - lua_register(_global.luaContext, "soundResume", apiSoundResume); - lua_register(_global.luaContext, "soundSetVolume", apiSoundSetVolume); - lua_register(_global.luaContext, "soundStop", apiSoundStop); - lua_register(_global.luaContext, "soundUnload", apiSoundUnload); + lua_register(_global.luaContext, "soundFullStop", apiSoundFullStop); // 1.16 + lua_register(_global.luaContext, "soundGetVolume", apiSoundGetVolume); // 1.16 + lua_register(_global.luaContext, "soundIsPlaying", apiSoundIsPlaying); // 1.16 RDG + lua_register(_global.luaContext, "soundLoad", apiSoundLoad); // 1.xx + lua_register(_global.luaContext, "soundPause", apiSoundPause); // 1.16 RDG + lua_register(_global.luaContext, "soundPlay", apiSoundPlay); // 1.xx + lua_register(_global.luaContext, "soundResume", apiSoundResume); // 1.16 RDG + lua_register(_global.luaContext, "soundSetVolume", apiSoundSetVolume); // 1.16 + lua_register(_global.luaContext, "soundStop", apiSoundStop); // 1.xx RDG + lua_register(_global.luaContext, "soundUnload", apiSoundUnload); // 2.00 - lua_register(_global.luaContext, "spriteDraw", apiSpriteDraw); - lua_register(_global.luaContext, "spriteGetFrame", apiSpriteGetFrame); - lua_register(_global.luaContext, "spriteGetHeight", apiSpriteGetHeight); - lua_register(_global.luaContext, "spriteGetWidth", apiSpriteGetWidth); - lua_register(_global.luaContext, "spriteIsPlaying", apiSpriteIsPlaying); - lua_register(_global.luaContext, "spriteLoad", apiSpriteLoad); - lua_register(_global.luaContext, "spriteLoop", apiSpriteLoop); - lua_register(_global.luaContext, "spritePause", apiSpritePause); - lua_register(_global.luaContext, "spritePlay", apiSpritePlay); - lua_register(_global.luaContext, "spriteQuality", apiSpriteQuality); - lua_register(_global.luaContext, "spriteRotate", apiSpriteRotate); - lua_register(_global.luaContext, "spriteRotateAndScale", apiSpriteRotateAndScale); - lua_register(_global.luaContext, "spriteScale", apiSpriteScale); - lua_register(_global.luaContext, "spriteSetFrame", apiSpriteSetFrame); - lua_register(_global.luaContext, "spriteUnload", apiSpriteUnload); + lua_register(_global.luaContext, "spriteDraw", apiSpriteDraw); // 1.xx + lua_register(_global.luaContext, "spriteGetFrame", apiSpriteGetFrame); // 2.10 + lua_register(_global.luaContext, "spriteGetHeight", apiSpriteGetHeight); // 2.00 + lua_register(_global.luaContext, "spriteGetWidth", apiSpriteGetWidth); // 2.00 + lua_register(_global.luaContext, "spriteIsPlaying", apiSpriteIsPlaying); // 2.10 + lua_register(_global.luaContext, "spriteLoad", apiSpriteLoad); // 1.xx + lua_register(_global.luaContext, "spriteLoop", apiSpriteLoop); // 2.10 + lua_register(_global.luaContext, "spritePause", apiSpritePause); // 2.10 + lua_register(_global.luaContext, "spritePlay", apiSpritePlay); // 2.10 + lua_register(_global.luaContext, "spriteQuality", apiSpriteQuality); // 2.10 + lua_register(_global.luaContext, "spriteRotate", apiSpriteRotate); // 2.10 + lua_register(_global.luaContext, "spriteRotateAndScale", apiSpriteRotateAndScale); // 2.10 + lua_register(_global.luaContext, "spriteScale", apiSpriteScale); // 2.10 + lua_register(_global.luaContext, "spriteSetFrame", apiSpriteSetFrame); // 2.10 + lua_register(_global.luaContext, "spriteUnload", apiSpriteUnload); // 2.00 - lua_register(_global.luaContext, "videoDraw", apiVideoDraw); - lua_register(_global.luaContext, "videoGetAudioTrack", apiVideoGetAudioTrack); - lua_register(_global.luaContext, "videoGetAudioTracks", apiVideoGetAudioTracks); - lua_register(_global.luaContext, "videoGetFrame", apiVideoGetFrame); - lua_register(_global.luaContext, "videoGetFrameCount", apiVideoGetFrameCount); - lua_register(_global.luaContext, "videoGetHeight", apiVideoGetHeight); - lua_register(_global.luaContext, "videoGetLanguage", apiVideoGetLanguage); - lua_register(_global.luaContext, "videoGetLanguageDescription", apiVideoGetLanguageDescription); - lua_register(_global.luaContext, "videoGetVolume", apiVideoGetVolume); - lua_register(_global.luaContext, "videoGetWidth", apiVideoGetWidth); - lua_register(_global.luaContext, "videoIsPlaying", apiVideoIsPlaying); - lua_register(_global.luaContext, "videoLoad", apiVideoLoad); - lua_register(_global.luaContext, "videoPause", apiVideoPause); - lua_register(_global.luaContext, "videoPlay", apiVideoPlay); - lua_register(_global.luaContext, "videoQuality", apiVideoQuality); - lua_register(_global.luaContext, "videoRotate", apiVideoRotate); - lua_register(_global.luaContext, "videoRotateAndScale", apiVideoRotateAndScale); - lua_register(_global.luaContext, "videoScale", apiVideoScale); - lua_register(_global.luaContext, "videoSeek", apiVideoSeek); - lua_register(_global.luaContext, "videoSetAudioTrack", apiVideoSetAudioTrack); - lua_register(_global.luaContext, "videoSetVolume", apiVideoSetVolume); - lua_register(_global.luaContext, "videoUnload", apiVideoUnload); + lua_register(_global.luaContext, "videoDraw", apiVideoDraw); // 2.00 + lua_register(_global.luaContext, "videoGetAudioTrack", apiVideoGetAudioTrack); // 2.10 + lua_register(_global.luaContext, "videoGetAudioTracks", apiVideoGetAudioTracks); // 2.10 + lua_register(_global.luaContext, "videoGetFrame", apiVideoGetFrame); // 2.00 + lua_register(_global.luaContext, "videoGetFrameCount", apiVideoGetFrameCount); // 2.00 + lua_register(_global.luaContext, "videoGetHeight", apiVideoGetHeight); // 2.00 + lua_register(_global.luaContext, "videoGetLanguage", apiVideoGetLanguage); // 2.10 + lua_register(_global.luaContext, "videoGetLanguageDescription", apiVideoGetLanguageDescription); // 2.10 + lua_register(_global.luaContext, "videoGetVolume", apiVideoGetVolume); // 2.00 + lua_register(_global.luaContext, "videoGetWidth", apiVideoGetWidth); // 2.00 + lua_register(_global.luaContext, "videoIsPlaying", apiVideoIsPlaying); // 2.00 + lua_register(_global.luaContext, "videoLoad", apiVideoLoad); // 2.00 + lua_register(_global.luaContext, "videoPause", apiVideoPause); // 2.00 + lua_register(_global.luaContext, "videoPlay", apiVideoPlay); // 2.00 + lua_register(_global.luaContext, "videoQuality", apiVideoQuality); // 2.10 + lua_register(_global.luaContext, "videoRotate", apiVideoRotate); // 2.10 + lua_register(_global.luaContext, "videoRotateAndScale", apiVideoRotateAndScale); // 2.10 + lua_register(_global.luaContext, "videoScale", apiVideoScale); // 2.10 + lua_register(_global.luaContext, "videoSeek", apiVideoSeek); // 2.00 + lua_register(_global.luaContext, "videoSetAudioTrack", apiVideoSetAudioTrack); // 2.10 + lua_register(_global.luaContext, "videoSetVolume", apiVideoSetVolume); // 2.00 + lua_register(_global.luaContext, "videoUnload", apiVideoUnload); // 2.00 - lua_register(_global.luaContext, "vldpGetHeight", apiVldpGetHeight); - lua_register(_global.luaContext, "vldpGetPixel", apiVldpGetPixel); - lua_register(_global.luaContext, "vldpGetWidth", apiVldpGetWidth); - lua_register(_global.luaContext, "vldpSetVerbose", apiVldpVerbose); + lua_register(_global.luaContext, "vldpGetHeight", apiVldpGetHeight); // 1.xx + lua_register(_global.luaContext, "vldpGetPixel", apiVldpGetPixel); // 1.xx + lua_register(_global.luaContext, "vldpGetWidth", apiVldpGetWidth); // 1.xx + lua_register(_global.luaContext, "vldpSetVerbose", apiVldpVerbose); // 1.xx // Open main video file progTrace("Opening main video file");