mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Make the project context available to lua C functions so that they can use that instead of VideoContext::Get()

Browse source 
Originally committed to SVN as r5647.
This commit is contained in:
Thomas Goyne 2011-09-28 19:49:47 +00:00
parent dfef9191f9
commit 5bb5f146a7
1 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
aegisub/src/auto4_lua.cpp
View file

@ -120,6 +120,22 @@ namespace {
lua_pop(L, 1); lua_pop(L, 1);
return ret; return ret;
} }
void set_context(lua_State *L, const agi::Context *c)
{
// Explicit cast is needed to discard the const
lua_pushlightuserdata(L, (void *)c);
lua_setfield(L, LUA_REGISTRYINDEX, "project_context");
}
const agi::Context *get_context(lua_State *L)
{
lua_getfield(L, LUA_REGISTRYINDEX, "project_context");
assert(lua_islightuserdata(L, -1));
const agi::Context * c = static_cast<const agi::Context *>(lua_touserdata(L, -1));
lua_pop(L, 1);
return c;
}
} }
// LuaStackcheck // LuaStackcheck
@ -414,10 +430,11 @@ namespace Automation4 {
int LuaScript::LuaFrameFromMs(lua_State *L) int LuaScript::LuaFrameFromMs(lua_State *L)
{ {
const agi::Context *c = get_context(L);
int ms = lua_tointeger(L, -1); int ms = lua_tointeger(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
if (VideoContext::Get()->TimecodesLoaded()) if (c->videoController->TimecodesLoaded())
lua_pushnumber(L, VideoContext::Get()->FrameAtTime(ms, agi::vfr::START)); lua_pushnumber(L, c->videoController->FrameAtTime(ms, agi::vfr::START));
else else
lua_pushnil(L); lua_pushnil(L);
@ -426,10 +443,11 @@ namespace Automation4 {
int LuaScript::LuaMsFromFrame(lua_State *L) int LuaScript::LuaMsFromFrame(lua_State *L)
{ {
const agi::Context *c = get_context(L);
int frame = lua_tointeger(L, -1); int frame = lua_tointeger(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
if (VideoContext::Get()->TimecodesLoaded()) if (c->videoController->TimecodesLoaded())
lua_pushnumber(L, VideoContext::Get()->TimeAtFrame(frame, agi::vfr::START)); lua_pushnumber(L, c->videoController->TimeAtFrame(frame, agi::vfr::START));
else else
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
@ -437,14 +455,15 @@ namespace Automation4 {
int LuaScript::LuaVideoSize(lua_State *L) int LuaScript::LuaVideoSize(lua_State *L)
{ {
VideoContext *ctx = VideoContext::Get(); const agi::Context *c = get_context(L);
if (ctx->IsLoaded()) { if (c->videoController->IsLoaded()) {
lua_pushnumber(L, ctx->GetWidth()); lua_pushnumber(L, c->videoController->GetWidth());
lua_pushnumber(L, ctx->GetHeight()); lua_pushnumber(L, c->videoController->GetHeight());
lua_pushnumber(L, ctx->GetAspectRatioValue()); lua_pushnumber(L, c->videoController->GetAspectRatioValue());
lua_pushnumber(L, ctx->GetAspectRatioType()); lua_pushnumber(L, c->videoController->GetAspectRatioType());
return 4; return 4;
} else { }
else {
lua_pushnil(L); lua_pushnil(L);
return 1; return 1;
} }
@ -586,6 +605,8 @@ namespace Automation4 {
{ {
if (!(cmd_type & cmd::COMMAND_VALIDATE)) return true; if (!(cmd_type & cmd::COMMAND_VALIDATE)) return true;
set_context(L, c);
GetFeatureFunction("validate"); GetFeatureFunction("validate");
LuaAssFile *subsobj = new LuaAssFile(L, c->ass); LuaAssFile *subsobj = new LuaAssFile(L, c->ass);
lua_pushinteger(L, transform_selection(L, c)); lua_pushinteger(L, transform_selection(L, c));
@ -608,6 +629,8 @@ namespace Automation4 {
void LuaCommand::operator()(agi::Context *c) void LuaCommand::operator()(agi::Context *c)
{ {
set_context(L, c);
GetFeatureFunction("run"); GetFeatureFunction("run");
LuaAssFile *subsobj = new LuaAssFile(L, c->ass, true, true); LuaAssFile *subsobj = new LuaAssFile(L, c->ass, true, true);
lua_pushinteger(L, transform_selection(L, c)); lua_pushinteger(L, transform_selection(L, c));
@ -657,6 +680,8 @@ namespace Automation4 {
{ {
if (!(cmd_type & cmd::COMMAND_TOGGLE)) return false; if (!(cmd_type & cmd::COMMAND_TOGGLE)) return false;
set_context(L, c);
GetFeatureFunction("isactive"); GetFeatureFunction("isactive");
LuaAssFile *subsobj = new LuaAssFile(L, c->ass); LuaAssFile *subsobj = new LuaAssFile(L, c->ass);
lua_pushinteger(L, transform_selection(L, c)); lua_pushinteger(L, transform_selection(L, c));
@ -749,6 +774,8 @@ namespace Automation4 {
if (!has_config) if (!has_config)
return 0; return 0;
set_context(L, c);
GetFeatureFunction("config"); // 2 = config dialog function GetFeatureFunction("config"); // 2 = config dialog function
// prepare function call // prepare function call