X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.lua;h=349d33b865fa7ebbfae90179ab8d05235cd363e9;hb=948d715655a84b93d8292e64731ea3c32b45deb7;hp=011dc4f84c79c1636ffd6a46de2816eadaa1f50b;hpb=87509c3d91b3726ba3186cb92c44db2e8fb50a40;p=nageru

diff --git a/nageru/theme.lua b/nageru/theme.lua
index 011dc4f..349d33b 100644
--- a/nageru/theme.lua
+++ b/nageru/theme.lua
@@ -110,9 +110,6 @@ local static_scene = Scene.new(16, 9)
 static_scene:add_input(static_image)  -- Note: Locks this input to images only.
 static_scene:finalize()
 
--- Set some global state.
-Nageru.set_num_channels(4)  -- Can only be called at the start of the program.
-
 -- Set some global state. Unless marked otherwise, these can only be set once,
 -- at the start of the program.
 Nageru.set_num_channels(4)
@@ -346,8 +343,10 @@ end
 --
 -- <signals> is basically an exposed InputState, which you can use to
 -- query for information about the signals at the point of the current
--- frame. In particular, you can call get_width() and get_height()
+-- frame. In particular, you can call get_frame_width() and get_frame_height()
 -- for any signal number, and use that to e.g. assist in scene selection.
+-- (You can also use get_width() and get_height(), which return the
+-- _field_ size. This has half the height for interlaced signals.)
 --
 -- You should return scene to use, after having set any parameters you
 -- want to set (through set_int() etc.). The parameters will be snapshot
@@ -356,14 +355,9 @@ function get_scene(num, t, width, height, signals)
 	local input_resolution = {}
 	for signal_num=0,1 do
 		local res = {
-			width = signals:get_width(signal_num),
-			height = signals:get_height(signal_num),
+			width = signals:get_frame_width(signal_num),
+			height = signals:get_frame_height(signal_num),
 		}
-		if signals:get_interlaced(signal_num) then
-			-- Convert height from frame height to field height.
-			-- (Needed for e.g. place_rectangle.)
-			res.height = res.height * 2
-		end
 		input_resolution[signal_num] = res
 
 		local text_res = signals:get_human_readable_resolution(signal_num)