X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmain.cpp;h=f8b5395f4f9ffceb4cce3a9c65184309b7dfcfe9;hb=HEAD;hp=212c0691211a58d1e30dd816eed595dc3409c466;hpb=4df45e479ddbc8e2247be8aab7f2bab5ddaa1b74;p=nageru diff --git a/nageru/main.cpp b/nageru/main.cpp index 212c069..f8b5395 100644 --- a/nageru/main.cpp +++ b/nageru/main.cpp @@ -1,5 +1,6 @@ extern "C" { -#include +#include +#include } #include #include @@ -15,9 +16,6 @@ extern "C" { #ifdef HAVE_CEF #include -#include -#include -#include #endif #ifdef HAVE_SRT @@ -30,7 +28,6 @@ extern "C" { #endif #include "shared/context.h" #include "flags.h" -#include "image_input.h" #include "mainwindow.h" #include "mixer.h" #include "quicksync_encoder.h" @@ -67,6 +64,9 @@ int main(int argc, char *argv[]) global_flags.va_display = QuickSyncEncoder::get_usable_va_display(); } + // The OpenGL widgets do not work well with the native Wayland integration. + setenv("QT_QPA_PLATFORM", "xcb", 0); + if ((global_flags.va_display.empty() || global_flags.va_display[0] != '/') && !global_flags.x264_video_to_disk) { // We normally use EGL for zerocopy, but if we use VA against DRM @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) #endif #ifdef HAVE_SRT - if (global_flags.srt_port >= 0) { + if (global_flags.srt_port >= 0 || !global_flags.srt_destination_host.empty()) { srt_startup(); } #endif