Make it possible to load/save input mappings.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index 82d702fa1947c85f2ff9f742dbfa50216dc624a4..ec4335359e72557df0d0b9e434781fac35c227d5 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -53,6 +53,7 @@ void GLWidget::initializeGL()
        static once_flag flag;
        call_once(flag, [this]{
                global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()), global_flags.num_cards);
+               global_audio_mixer = global_mixer->get_audio_mixer();
                global_mainwindow->mixer_created(global_mixer);
                global_mixer->start();
        });
@@ -190,7 +191,7 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos)
        // The same for resolution.
        QMenu mode_submenu;
        QActionGroup mode_group(&mode_submenu);
-       std::map<uint32_t, VideoMode> video_modes = global_mixer->get_available_video_modes(current_card);
+       std::map<uint32_t, bmusb::VideoMode> video_modes = global_mixer->get_available_video_modes(current_card);
        uint32_t current_video_mode = global_mixer->get_current_video_mode(current_card);
        bool has_auto_mode = false;
        for (const auto &mode : video_modes) {