X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.cpp;h=35046c18ee17a0b77dc474c51d3cf5fae9c21b39;hb=c9181491b62cb8b928e7c92ae204ed234bf7f3ea;hp=f7f752250615323ebcc1c4f7d37c4fd8770a0006;hpb=9f5622b1cb36a07b5b717ab5c4cbd938a550c7c3;p=nageru

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index f7f7522..35046c1 100644
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -745,10 +745,10 @@ int InputStateInfo_get_human_readable_resolution(lua_State* L)
 	string str;
 	if (!input_state_info->last_is_connected[signal_num]) {
 		str = "disconnected";
-	} else if (input_state_info->last_height[signal_num]) {
+	} else if (input_state_info->last_height[signal_num] <= 0) {
 		str = "no signal";
 	} else if (!input_state_info->last_has_signal[signal_num]) {
-		if (input_state_info->last_height[signal_num]) {
+		if (input_state_info->last_height[signal_num] == 525) {
 			// Special mode for the USB3 cards.
 			str = "no signal";
 		} else {
@@ -858,6 +858,7 @@ const luaL_Reg Block_funcs[] = {
 	{ "enable", Block_enable },
 	{ "enable_if", Block_enable_if },
 	{ "disable", Block_disable },
+	{ "always_disable_if_disabled", Block_always_disable_if_disabled },
 	{ "set_int", Block_set_int },
 	{ "set_float", Block_set_float },
 	{ "set_vec3", Block_set_vec3 },
@@ -1247,6 +1248,34 @@ int Nageru_set_num_channels(lua_State *L)
 	return 0;
 }
 
+int Nageru_set_channel_signal(lua_State *L)
+{
+	// NOTE: m is already locked.
+	Theme *theme = get_theme_updata(L);
+	if (theme->startup_finished) {
+		luaL_error(L, "set_channel_signal() can only be called at startup.");
+	}
+	unsigned channel = luaL_checknumber(L, 1);
+	int signal = luaL_checknumber(L, 2);
+	theme->channel_signals[channel] = signal;
+	lua_pop(L, 2);
+	return 0;
+}
+
+int Nageru_set_supports_wb(lua_State *L)
+{
+	// NOTE: m is already locked.
+	Theme *theme = get_theme_updata(L);
+	if (theme->startup_finished) {
+		luaL_error(L, "set_supports_wb() can only be called at startup.");
+	}
+	unsigned channel = luaL_checknumber(L, 1);
+	bool supports_wb = checkbool(L, 2);
+	theme->channel_supports_wb[channel] = supports_wb;
+	lua_pop(L, 2);
+	return 0;
+}
+
 Theme::Theme(const string &filename, const vector<string> &search_dirs, ResourcePool *resource_pool, unsigned num_cards)
 	: resource_pool(resource_pool), num_cards(num_cards), signal_to_card_mapping(global_flags.default_stream_mapping)
 {
@@ -1388,6 +1417,8 @@ void Theme::register_globals()
 	const luaL_Reg Nageru_funcs[] = {
 		{ "set_channel_name", Nageru_set_channel_name },
 		{ "set_num_channels", Nageru_set_num_channels },
+		{ "set_channel_signal", Nageru_set_channel_signal },
+		{ "set_supports_wb", Nageru_set_supports_wb },
 		{ NULL, NULL }
 	};
 	lua_pushlightuserdata(L, this);
@@ -1538,6 +1569,7 @@ string Theme::get_channel_name(unsigned channel)
 	const char *ret = lua_tostring(L, -1);
 	if (ret == nullptr) {
 		fprintf(stderr, "function `channel_name' returned nil for channel %d\n", channel);
+		fprintf(stderr, "Try Nageru.set_channel_name(channel, name) at the start of the script instead.\n");
 		abort();
 	}
 
@@ -1551,9 +1583,19 @@ int Theme::get_channel_signal(unsigned channel)
 {
 	lock_guard<mutex> lock(m);
 	lua_getglobal(L, "channel_signal");
+	if (lua_isnil(L, -1)) {
+		lua_pop(L, 1);
+		if (channel_signals.count(channel)) {
+			return channel_signals[channel];
+		} else {
+			return -1;
+		}
+	}
+
 	lua_pushnumber(L, channel);
 	if (lua_pcall(L, 1, 1, 0) != 0) {
 		fprintf(stderr, "error running function `channel_signal': %s\n", lua_tostring(L, -1));
+		fprintf(stderr, "Try Nageru.set_channel_signal(channel, signal) at the start of the script instead.\n");
 		abort();
 	}
 
@@ -1589,9 +1631,19 @@ bool Theme::get_supports_set_wb(unsigned channel)
 {
 	lock_guard<mutex> lock(m);
 	lua_getglobal(L, "supports_set_wb");
+	if (lua_isnil(L, -1)) {
+		lua_pop(L, 1);
+		if (channel_supports_wb.count(channel)) {
+			return channel_supports_wb[channel];
+		} else {
+			return false;
+		}
+	}
+
 	lua_pushnumber(L, channel);
 	if (lua_pcall(L, 1, 1, 0) != 0) {
 		fprintf(stderr, "error running function `supports_set_wb': %s\n", lua_tostring(L, -1));
+		fprintf(stderr, "Try Nageru.set_supports_wb(channel, bool) at the start of the script instead.\n");
 		abort();
 	}
 
@@ -1716,9 +1768,9 @@ void destroy(T &ref)
 Theme::MenuEntry::~MenuEntry()
 {
 	if (is_submenu) {
-		luaL_unref(entry.L, LUA_REGISTRYINDEX, entry.lua_ref);
-	} else {
 		destroy(submenu);
+	} else {
+		luaL_unref(entry.L, LUA_REGISTRYINDEX, entry.lua_ref);
 	}
 }
 
@@ -1770,9 +1822,7 @@ int Theme::set_theme_menu(lua_State *L)
 	for (int i = 1; i <= num_elements; ++i) {
 		root_menu.emplace_back(create_theme_menu_entry(L, i));
 	}
-	fprintf(stderr, "now creating a new one\n");
 	theme_menu.reset(new MenuEntry("", move(root_menu)));
-	fprintf(stderr, "DONE reset\n");
 
 	lua_pop(L, num_elements);
 	assert(lua_gettop(L) == 0);