mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-01 12:46:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/gui: skip mode selection if there's only one mode

Browse source
This commit is contained in:
Moses Turner 2022-01-06 13:28:30 -06:00 committed by Jakob Bornecrantz
parent c8b9bff356
commit dfd576e0ab
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/xrt/state_trackers/gui/gui_scene_video.c
View file

@ -133,6 +133,21 @@ render_mode(struct xrt_fs_mode *mode)
return igButton(tmp, button_dims); return igButton(tmp, button_dims);
} }
void
mode_selected_so_continue(struct gui_scene *scene, struct gui_program *p)
{
struct video_select *vs = (struct video_select *)scene;
gui_scene_calibrate(p, vs->xfctx, vs->xfs, vs->settings);
// We should not clean these up, zero them out.
vs->settings = NULL;
vs->xfctx = NULL;
vs->xfs = NULL;
// Schedule us to be deleted when it's safe.
gui_scene_delete_me(p, scene);
}
static void static void
scene_render(struct gui_scene *scene, struct gui_program *p) scene_render(struct gui_scene *scene, struct gui_program *p)
{ {
@ -158,24 +173,21 @@ scene_render(struct gui_scene *scene, struct gui_program *p)
igText("No modes found on '%s'!", vs->xfs->name); igText("No modes found on '%s'!", vs->xfs->name);
} }
// We have selected a stream device and it has modes. // We have selected a stream device and it has only one mode - user doesn't need to care what that is; proceed
for (size_t i = 0; i < vs->num_modes; i++) { // immediately
if (!render_mode(&vs->modes[i])) { if (vs->num_modes == 1) {
continue; vs->settings->camera_mode = 0;
mode_selected_so_continue(scene, p);
} else {
// We have selected a stream device and it has multiple modes - let user decide which to use
for (size_t i = 0; i < vs->num_modes; i++) {
if (!render_mode(&vs->modes[i])) {
continue;
}
vs->settings->camera_mode = i;
mode_selected_so_continue(scene, p);
} }
vs->settings->camera_mode = i;
// User selected this mode, create the next scene.
gui_scene_calibrate(p, vs->xfctx, vs->xfs, vs->settings);
// We should not clean these up, zero them out.
vs->settings = NULL;
vs->xfctx = NULL;
vs->xfs = NULL;
// Schedule us to be deleted when it's safe.
gui_scene_delete_me(p, scene);
} }
igSeparator(); igSeparator();