sdr/gr-fosphor
sdr
/
gr-fosphor
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fosphor/main: Fix the render option initialization sequence 

Since the width/height will be set as part of the initial reshape
callback and this is done in glfw_init, we need to make sure we
do the first init of the render option _before_ that, or we'll
undo what glfw_init did.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
Sylvain Munaut 2014-07-24 13:39:39 +02:00
parent 65a19326d4
commit 02e0db8fdb
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/fosphor/main.c
View File

@ -407,6 +407,14 @@ int main(int argc, char *argv[])
g_as->zoom_center = 0.5;
g_as->zoom_width = 0.2;
/* Default fosphor render options */
fosphor_render_defaults(&g_as->render_main);
fosphor_render_defaults(&g_as->render_zoom);
g_as->render_zoom.options &= ~(FRO_LABEL_PWR | FRO_LABEL_TIME);
g_as->render_main.histo_wf_ratio = 0.35f;
g_as->render_zoom.histo_wf_ratio = 0.35f;
/* Init GLFW */
wnd = glfw_init();
if (!wnd) {
@ -423,13 +431,6 @@ int main(int argc, char *argv[])
goto error;
}
fosphor_render_defaults(&g_as->render_main);
fosphor_render_defaults(&g_as->render_zoom);
g_as->render_zoom.options &= ~(FRO_LABEL_PWR | FRO_LABEL_TIME);
g_as->render_main.histo_wf_ratio = 0.35f;
g_as->render_zoom.histo_wf_ratio = 0.35f;
fosphor_set_power_range(g_as->fosphor, g_as->db_ref, k_db_per_div[g_as->db_per_div_idx]);
/* Run ! */