X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmain.cpp;h=410a6c42d7fcaa7e78b3b31d58b98b0c935d4beb;hb=a000a60dff370ed7e5e8ed9f959cec6ec10d158f;hp=c1a52c0489a6d7b4e9054da338635290846cf1cb;hpb=392f9d1ccb835c05a3874c4bea163788b2c37024;p=nageru diff --git a/nageru/main.cpp b/nageru/main.cpp index c1a52c0..410a6c4 100644 --- a/nageru/main.cpp +++ b/nageru/main.cpp @@ -24,7 +24,7 @@ extern "C" { #ifdef HAVE_CEF #include "nageru_cef_app.h" #endif -#include "context.h" +#include "shared/context.h" #include "flags.h" #include "image_input.h" #include "mainwindow.h" @@ -68,7 +68,6 @@ int main(int argc, char *argv[]) // We normally use EGL for zerocopy, but if we use VA against DRM // instead of against X11, we turn it off, and then don't need EGL. setenv("QT_XCB_GL_INTEGRATION", "xcb_egl", 0); - using_egl = true; } setlinebuf(stdout); #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100) @@ -120,8 +119,6 @@ int main(int argc, char *argv[]) } int rc = app.exec(); - global_mixer->quit(); - mainWindow.mixer_shutting_down(); delete global_mixer; ImageInput::shutdown_updaters(); return rc;