Include the raw audio in the MJPEG output.

[nageru] / nageru / main.cpp

diff --git a/nageru/main.cpp b/nageru/main.cpp
index d5654a5a07c4ef26bb8924b7fa8cd7f1362cc827..b5463754a463bdc60f0be758a18be3add0e8ee71 100644 (file)
--- a/nageru/main.cpp
+++ b/nageru/main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
        global_share_widget = new QGLWidget();
        if (!global_share_widget->isValid()) {
                fprintf(stderr, "Failed to initialize OpenGL. Nageru needs at least OpenGL 3.1 to function properly.\n");
-               exit(1);
+               abort();
        }
 
        MainWindow mainWindow;
@@ -119,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;