Update OpenAL Soft to 1.18.2

libs/openal-soft/utils/alsoft-config/CMakeLists.txt

@@ -1,29 +1,56 @@
 project(alsoft-config)
 
+option(ALSOFT_NO_QT5 "Use Qt4 instead of Qt5 for alsoft-config" FALSE)
+
 include_directories("${alsoft-config_BINARY_DIR}")
 
-# Need Qt 4.8.0 or newer for the iconset theme attribute to work
-find_package(Qt4 4.8.0 COMPONENTS QtCore QtGui)
-if(QT4_FOUND)
-    include(${QT_USE_FILE})
+set(alsoft-config_SRCS  main.cpp
+                        mainwindow.cpp
+)
+set(alsoft-config_UIS  mainwindow.ui)
+set(alsoft-config_MOCS  mainwindow.h)
 
-    set(alsoft-config_SRCS  main.cpp
-                            mainwindow.cpp
-        )
+find_package(Qt5Widgets)
+if(Qt5Widgets_FOUND AND NOT ALSOFT_NO_QT5)
+    qt5_wrap_ui(UIS ${alsoft-config_UIS})
 
-    set(alsoft-config_UIS  mainwindow.ui)
-    QT4_WRAP_UI(UIS ${alsoft-config_UIS})
-
-    set(alsoft-config_MOCS  mainwindow.h)
-    QT4_WRAP_CPP(MOCS ${alsoft-config_MOCS})
+    qt5_wrap_cpp(MOCS ${alsoft-config_MOCS})
 
     add_executable(alsoft-config ${alsoft-config_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS})
-    target_link_libraries(alsoft-config ${QT_LIBRARIES})
+    target_link_libraries(alsoft-config Qt5::Widgets)
+    set_property(TARGET alsoft-config APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
     set_target_properties(alsoft-config PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${OpenAL_BINARY_DIR})
+    if(TARGET build_version)
+        add_dependencies(alsoft-config build_version)
+    endif()
 
     install(TARGETS alsoft-config
-            RUNTIME DESTINATION bin
-            LIBRARY DESTINATION "lib${LIB_SUFFIX}"
-            ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     )
+else()
+    # Need Qt 4.8.0 or newer for the iconset theme attribute to work
+    find_package(Qt4 4.8.0 COMPONENTS QtCore QtGui)
+    if(QT4_FOUND)
+        include(${QT_USE_FILE})
+
+        qt4_wrap_ui(UIS ${alsoft-config_UIS})
+
+        qt4_wrap_cpp(MOCS ${alsoft-config_MOCS})
+
+        add_executable(alsoft-config ${alsoft-config_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS})
+        target_link_libraries(alsoft-config ${QT_LIBRARIES})
+        set_property(TARGET alsoft-config APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
+        set_target_properties(alsoft-config PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${OpenAL_BINARY_DIR})
+        if(TARGET build_version)
+            add_dependencies(alsoft-config build_version)
+        endif()
+
+        install(TARGETS alsoft-config
+                RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        )
+    endif()
 endif()

libs/openal-soft/utils/alsoft-config/mainwindow.h

@@ -17,16 +17,32 @@ public:
     ~MainWindow();
 
 private slots:
+    void cancelCloseAction();
+
     void saveCurrentConfig();
 
     void saveConfigAsFile();
     void loadConfigFromFile();
 
+    void showAboutPage();
+
+    void enableApplyButton();
+
+    void updateResamplerLabel(int num);
+
     void updatePeriodSizeEdit(int size);
     void updatePeriodSizeSlider();
     void updatePeriodCountEdit(int size);
     void updatePeriodCountSlider();
 
+    void selectQuadDecoderFile();
+    void select51DecoderFile();
+    void select61DecoderFile();
+    void select71DecoderFile();
+
+    void updateJackBufferSizeEdit(int size);
+    void updateJackBufferSizeSlider();
+
     void addHrtfFile();
     void removeHrtfFile();
 
@@ -35,6 +51,13 @@ private slots:
     void showEnabledBackendMenu(QPoint pt);
     void showDisabledBackendMenu(QPoint pt);
 
+    void selectOSSPlayback();
+    void selectOSSCapture();
+
+    void selectSolarisPlayback();
+
+    void selectWaveOutput();
+
 private:
     Ui::MainWindow *ui;
 
@@ -44,6 +67,15 @@ private:
     QValidator *mEffectSlotValidator;
     QValidator *mSourceSendValidator;
     QValidator *mSampleRateValidator;
+    QValidator *mJackBufferValidator;
+
+    bool mNeedsSave;
+
+    void closeEvent(QCloseEvent *event);
+
+    void selectDecoderFile(QLineEdit *line, const char *name);
+
+    QStringList collectHrtfs();
 
     void loadConfig(const QString &fname);
     void saveConfig(const QString &fname) const;