scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-07 17:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vdisp/gl: accept also mode names for size=

Browse Source
This commit is contained in:
Martin Pulec
2025-05-19 12:48:49 +02:00
parent 9c597ae19d
commit 0953b8cf76
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/video_display/gl.cpp
View File

@@ -547,6 +547,10 @@ static void gl_show_help(bool full) {
<< "\twindow size in pixels, with optional position; full\n"
<< "\t\t\tsyntax: " TBOLD("[<W>x<H>][{+-}<X>[{+-}<Y>]]")
<< (full ? " [1]" : "") << "\n";
if (full) {
col() << TBOLD("\tsize=<mode_name>")
<< " mode name (eg. VGA), use \"help\" to show\n";
}
col() << TBOLD("\tfixed_size") << "\tdo not resize window on new stream\n";
col() << TBOLD("\tnoresizable") << "\twindow won't be resizable (useful with size=)\n";
#ifdef SPOUT
@@ -614,6 +618,13 @@ static bool set_size(struct state_gl *s, const char *tok)
if (strchr(tok, '%') != NULL) {
s->window_size_factor = atof(tok) / 100.0;
} else if (strpbrk(tok, "x+-") == NULL) {
struct video_desc desc = get_video_desc_from_string(tok);
if (desc.width != 0) {
s->fixed_size = true;
s->fixed_w = desc.width;
s->fixed_h = desc.height;
return true;
}
log_msg(LOG_LEVEL_ERROR, MOD_NAME "Wrong size spec: %s\n", tok);
return false;
}