summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c47f147)
raw | patch | inline | side by side (parent: c47f147)
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Mon, 7 Dec 2015 18:06:22 +0000 (20:06 +0200) | ||
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | |
Tue, 12 Jan 2016 12:52:37 +0000 (14:52 +0200) |
tests/testpat.cpp | patch | blob | history |
diff --git a/tests/testpat.cpp b/tests/testpat.cpp
index c51d3ec4cc989ac373f610ff3b937e7c339da0b5..56ad7a5830289d398d9ffdd02a89393595dbb97e 100644 (file)
--- a/tests/testpat.cpp
+++ b/tests/testpat.cpp
static void parse_crtc(Card& card, const string& crtc_str, OutputInfo& output)
{
// @12:1920x1200-60
- const regex mode_re("(?:(@?)(\\d+):)?(?:(\\d+)x(\\d+))(?:-(\\d+))?");
+ const regex mode_re("(?:(@?)(\\d+):)?(?:(\\d+)x(\\d+)(i)?)(?:-(\\d+))?");
smatch sm;
if (!regex_match(crtc_str, sm, mode_re))
@@ -150,11 +150,10 @@ static void parse_crtc(Card& card, const string& crtc_str, OutputInfo& output)
unsigned w = stoul(sm[3]);
unsigned h = stoul(sm[4]);
- unsigned refresh = 0;
- if (sm[5].matched)
- refresh = stoul(sm[5]);
+ bool ilace = sm[5].matched ? true : false;
+ unsigned refresh = sm[6].matched ? stoul(sm[6]) : 0;
- output.mode = output.connector->get_mode(w, h, refresh);
+ output.mode = output.connector->get_mode(w, h, refresh, ilace);
}
static void parse_plane(Card& card, const string& plane_str, const OutputInfo& output, PlaneInfo& pinfo)