X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.lua;h=efd2280c93e0802b4b8f662c1adb9660b422147e;hb=5e01b03ee7850241a15f74e160ebbe2b8ad9b9ea;hp=1f00d52165aa4b7d5be0c042bd8028da734f4e5f;hpb=6b5c8411a2776e77d1bb7d66ee7ec255428f2a13;p=nageru

diff --git a/theme.lua b/theme.lua
index 1f00d52..efd2280 100644
--- a/theme.lua
+++ b/theme.lua
@@ -247,16 +247,30 @@ function num_channels()
 	return 4
 end
 
--- Helper function to write e.g. “720p”.
+-- Helper function to write e.g. “60” or “59.94”.
+function get_frame_rate(signal_num)
+	local nom = last_resolution[signal_num].frame_rate_nom
+	local den = last_resolution[signal_num].frame_rate_den
+	if last_resolution[signal_num].interlaced then
+		nom = nom * 2
+	end
+	if nom % den == 0 then
+		return nom / den
+	else
+		return string.format("%.2f", num / den)
+	end
+end
+
+-- Helper function to write e.g. “720p60”.
 function get_channel_resolution(signal_num)
 	if last_resolution[signal_num] then
 		if last_resolution[signal_num].height == 0 or
 		   last_resolution[signal_num].height == 525 then
 			return "no signal"
 		elseif last_resolution[signal_num].interlaced then
-			return (last_resolution[signal_num].height * 2) .. "i"
+			return (last_resolution[signal_num].height * 2) .. "i" .. get_frame_rate(signal_num)
 		else
-			return last_resolution[signal_num].height .. "p"
+			return last_resolution[signal_num].height .. "p" .. get_frame_rate(signal_num)
 		end
 	else
 		return "no signal"
@@ -454,7 +468,9 @@ function get_chain(num, t, width, height, signals)
 		last_resolution[signal_num] = {
 			width = signals:get_width(signal_num),
 			height = signals:get_height(signal_num),
-			interlaced = signals:get_interlaced(signal_num)
+			interlaced = signals:get_interlaced(signal_num),
+			frame_rate_nom = signals:get_frame_rate_nom(signal_num),
+			frame_rate_den = signals:get_frame_rate_den(signal_num)
 		}
 	end