scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 10:40:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Initialize display prior to capture

Browse Source
This commit is contained in:
Martin Pulec
2013-03-12 13:25:24 +01:00
parent de13f02efd
commit bd1cbee75f
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.c
View File

@@ -1246,6 +1246,18 @@ int main(int argc, char *argv[])
uv->participants = pdb_init();
// Display initialization should be prior to modules that may use graphic card (eg. GLSL) in order
// to initalize shared resource (X display) first
if ((uv->display_device =
initialize_video_display(uv->requested_display, display_cfg, display_flags)) == NULL) {
printf("Unable to open display device: %s\n",
uv->requested_display);
exit_uv(EXIT_FAIL_DISPLAY);
goto cleanup_wait_audio;
}
printf("Display initialized-%s\n", uv->requested_display);
if ((uv->capture_device =
initialize_video_capture(uv->requested_capture, capture_cfg, vidcap_flags)) == NULL) {
printf("Unable to open capture device: %s\n",
@@ -1255,16 +1267,6 @@ int main(int argc, char *argv[])
}
printf("Video capture initialized-%s\n", uv->requested_capture);
if ((uv->display_device =
initialize_video_display(uv->requested_display, display_cfg, display_flags)) == NULL) {
printf("Unable to open display device: %s\n",
uv->requested_display);
exit_uv(EXIT_FAIL_DISPLAY);
goto cleanup_wait_capture;
}
printf("Display initialized-%s\n", uv->requested_display);
signal(SIGINT, signal_handler);
signal(SIGTERM, signal_handler);
#ifndef WIN32