Update OpenAL-soft to 1.21.1

This commit is contained in:
Miku AuahDark
2021-02-11 18:04:50 +08:00
parent 08f227997e
commit 904cc75ba8
358 changed files with 61122 additions and 60973 deletions
@@ -1,58 +1,31 @@
project(alsoft-config)
option(ALSOFT_NO_QT5 "Use Qt4 instead of Qt5 for alsoft-config" FALSE)
if(Qt5Widgets_FOUND)
qt5_wrap_ui(UIS mainwindow.ui)
include_directories("${alsoft-config_BINARY_DIR}")
qt5_wrap_cpp(MOCS mainwindow.h)
set(alsoft-config_SRCS
main.cpp
mainwindow.cpp
mainwindow.h
)
set(alsoft-config_UIS mainwindow.ui)
set(alsoft-config_MOCS mainwindow.h)
find_package(Qt5Widgets)
if(Qt5Widgets_FOUND AND NOT ALSOFT_NO_QT5)
qt5_wrap_ui(UIS ${alsoft-config_UIS})
qt5_wrap_cpp(MOCS ${alsoft-config_MOCS})
add_executable(alsoft-config ${alsoft-config_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS})
add_executable(alsoft-config
main.cpp
mainwindow.cpp
mainwindow.h
verstr.cpp
verstr.h
${UIS} ${RSCS} ${TRS} ${MOCS})
target_link_libraries(alsoft-config Qt5::Widgets)
set_property(TARGET alsoft-config APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
target_include_directories(alsoft-config PRIVATE "${alsoft-config_BINARY_DIR}"
"${OpenAL_BINARY_DIR}")
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
message(STATUS "Building configuration program")
if(ALSOFT_INSTALL_UTILS)
install(TARGETS alsoft-config
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}
)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
endif()
File diff suppressed because it is too large Load Diff
@@ -43,6 +43,7 @@ private slots:
void updateJackBufferSizeEdit(int size);
void updateJackBufferSizeSlider();
void updateHrtfModeLabel(int num);
void addHrtfFile();
void removeHrtfFile();
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>564</width>
<height>460</height>
<height>469</height>
</rect>
</property>
<property name="minimumSize">
@@ -21,8 +21,7 @@
</property>
<property name="windowIcon">
<iconset theme="preferences-desktop-sound">
<normaloff/>
</iconset>
<normaloff>.</normaloff>.</iconset>
</property>
<widget class="QWidget" name="centralWidget">
<widget class="QPushButton" name="applyButton">
@@ -31,7 +30,7 @@
<x>470</x>
<y>405</y>
<width>81</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="text">
@@ -39,8 +38,7 @@
</property>
<property name="icon">
<iconset theme="dialog-ok-apply">
<normaloff/>
</iconset>
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
<widget class="QTabWidget" name="tabWidget">
@@ -53,7 +51,7 @@
</rect>
</property>
<property name="currentIndex">
<number>5</number>
<number>0</number>
</property>
<widget class="QWidget" name="tab_3">
<attribute name="title">
@@ -64,8 +62,8 @@
<rect>
<x>110</x>
<y>50</y>
<width>78</width>
<height>21</height>
<width>76</width>
<height>31</height>
</rect>
</property>
<property name="toolTip">
@@ -82,7 +80,7 @@ float and converted to the output sample type as needed.</string>
<x>0</x>
<y>50</y>
<width>101</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="text">
@@ -98,7 +96,7 @@ float and converted to the output sample type as needed.</string>
<x>0</x>
<y>20</y>
<width>101</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="text">
@@ -113,8 +111,8 @@ float and converted to the output sample type as needed.</string>
<rect>
<x>110</x>
<y>20</y>
<width>78</width>
<height>21</height>
<width>76</width>
<height>31</height>
</rect>
</property>
<property name="toolTip">
@@ -131,8 +129,8 @@ to stereo output.</string>
<rect>
<x>380</x>
<y>20</y>
<width>80</width>
<height>20</height>
<width>96</width>
<height>31</height>
</rect>
</property>
<property name="toolTip">
@@ -194,7 +192,7 @@ to stereo output.</string>
<x>290</x>
<y>20</y>
<width>81</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="text">
@@ -210,7 +208,7 @@ to stereo output.</string>
<x>290</x>
<y>50</y>
<width>81</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="text">
@@ -225,8 +223,8 @@ to stereo output.</string>
<rect>
<x>380</x>
<y>50</y>
<width>78</width>
<height>21</height>
<width>101</width>
<height>31</height>
</rect>
</property>
<property name="toolTip">
@@ -256,7 +254,7 @@ otherwise be suitable for speakers.</string>
<x>20</x>
<y>30</y>
<width>511</width>
<height>91</height>
<height>81</height>
</rect>
</property>
<property name="title">
@@ -283,9 +281,9 @@ mixed and being heard.</string>
<widget class="QLabel" name="label_11">
<property name="geometry">
<rect>
<x>20</x>
<x>60</x>
<y>0</y>
<width>201</width>
<width>161</width>
<height>21</height>
</rect>
</property>
@@ -299,9 +297,9 @@ mixed and being heard.</string>
<widget class="QSlider" name="periodCountSlider">
<property name="geometry">
<rect>
<x>80</x>
<x>99</x>
<y>20</y>
<width>160</width>
<width>141</width>
<height>21</height>
</rect>
</property>
@@ -336,7 +334,7 @@ mixed and being heard.</string>
<widget class="QLineEdit" name="periodCountEdit">
<property name="geometry">
<rect>
<x>20</x>
<x>40</x>
<y>20</y>
<width>51</width>
<height>21</height>
@@ -365,24 +363,24 @@ frames needed for each mixing update.</string>
<rect>
<x>60</x>
<y>20</y>
<width>160</width>
<width>191</width>
<height>21</height>
</rect>
</property>
<property name="minimum">
<number>0</number>
<number>63</number>
</property>
<property name="maximum">
<number>8192</number>
</property>
<property name="singleStep">
<number>64</number>
<number>1</number>
</property>
<property name="pageStep">
<number>1024</number>
</property>
<property name="value">
<number>0</number>
<number>63</number>
</property>
<property name="tracking">
<bool>true</bool>
@@ -423,7 +421,7 @@ frames needed for each mixing update.</string>
</rect>
</property>
<property name="placeholderText">
<string>1024</string>
<string>20ms</string>
</property>
</widget>
</widget>
@@ -432,9 +430,9 @@ frames needed for each mixing update.</string>
<property name="geometry">
<rect>
<x>130</x>
<y>130</y>
<width>131</width>
<height>21</height>
<y>120</y>
<width>111</width>
<height>31</height>
</rect>
</property>
<property name="toolTip">
@@ -451,9 +449,9 @@ receiver.</string>
<property name="geometry">
<rect>
<x>20</x>
<y>130</y>
<y>120</y>
<width>101</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="text">
@@ -466,23 +464,26 @@ receiver.</string>
<widget class="QLabel" name="label_30">
<property name="geometry">
<rect>
<x>270</x>
<y>130</y>
<width>111</width>
<height>21</height>
<x>260</x>
<y>120</y>
<width>121</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Ambisonic Format:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QComboBox" name="ambiFormatComboBox">
<property name="geometry">
<rect>
<x>390</x>
<y>130</y>
<y>120</y>
<width>131</width>
<height>21</height>
<height>31</height>
</rect>
</property>
</widget>
@@ -533,7 +534,7 @@ quantization with low-level whitenoise.</string>
<property name="geometry">
<rect>
<x>60</x>
<y>80</y>
<y>90</y>
<width>421</width>
<height>81</height>
</rect>
@@ -611,7 +612,7 @@ quantization with low-level whitenoise.</string>
<widget class="QCheckBox" name="decoderHQModeCheckBox">
<property name="geometry">
<rect>
<x>10</x>
<x>30</x>
<y>20</y>
<width>181</width>
<height>21</height>
@@ -635,7 +636,7 @@ appropriate speaker configuration you intend to use.</string>
<widget class="QCheckBox" name="decoderDistCompCheckBox">
<property name="geometry">
<rect>
<x>10</x>
<x>30</x>
<y>50</y>
<width>181</width>
<height>21</height>
@@ -655,7 +656,7 @@ configuration file.</string>
<property name="text">
<string>Distance Compensation:</string>
</property>
<property name="checked">
<property name="tristate">
<bool>true</bool>
</property>
</widget>
@@ -834,7 +835,7 @@ configuration file.</string>
<widget class="QCheckBox" name="decoderNFEffectsCheckBox">
<property name="geometry">
<rect>
<x>10</x>
<x>30</x>
<y>80</y>
<width>181</width>
<height>21</height>
@@ -847,8 +848,7 @@ creates a more realistic perception of sound distance.
Note that the effect may be stronger or weaker than
intended if the application doesn't use or specify an
appropriate unit scale, or if incorrect speaker distances
are set in the decoder configuration file. Requires High
Quality Mode to be enabled.</string>
are set in the decoder configuration file.</string>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
@@ -856,7 +856,7 @@ Quality Mode to be enabled.</string>
<property name="text">
<string>Near-Field Effects:</string>
</property>
<property name="checked">
<property name="tristate">
<bool>true</bool>
</property>
</widget>
@@ -885,7 +885,7 @@ normal output is created with no near-field simulation.</string>
<rect>
<x>20</x>
<y>0</y>
<width>151</width>
<width>171</width>
<height>21</height>
</rect>
</property>
@@ -899,9 +899,9 @@ normal output is created with no near-field simulation.</string>
<widget class="QDoubleSpinBox" name="decoderNFRefDelaySpinBox">
<property name="geometry">
<rect>
<x>180</x>
<x>200</x>
<y>0</y>
<width>91</width>
<width>81</width>
<height>21</height>
</rect>
</property>
@@ -999,8 +999,7 @@ normal output is created with no near-field simulation.</string>
</property>
<property name="icon">
<iconset theme="list-add">
<normaloff/>
</iconset>
<normaloff>.</normaloff>.</iconset>
</property>
<property name="flat">
<bool>false</bool>
@@ -1040,8 +1039,7 @@ listed above.</string>
</property>
<property name="icon">
<iconset theme="list-remove">
<normaloff/>
</iconset>
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
</widget>
@@ -1049,10 +1047,10 @@ listed above.</string>
<widget class="QLabel" name="label_16">
<property name="geometry">
<rect>
<x>40</x>
<y>50</y>
<x>50</x>
<y>60</y>
<width>71</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="text">
@@ -1066,9 +1064,9 @@ listed above.</string>
<property name="geometry">
<rect>
<x>130</x>
<y>50</y>
<y>60</y>
<width>161</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="toolTip">
@@ -1097,10 +1095,10 @@ application or system to determine if it should be used.</string>
<widget class="QLabel" name="label_12">
<property name="geometry">
<rect>
<x>20</x>
<x>30</x>
<y>20</y>
<width>91</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="text">
@@ -1116,13 +1114,84 @@ application or system to determine if it should be used.</string>
<x>130</x>
<y>20</y>
<width>161</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="toolTip">
<string>The default HRTF to use if the application doesn't request one.</string>
</property>
</widget>
<widget class="QGroupBox" name="groupBox_9">
<property name="geometry">
<rect>
<x>50</x>
<y>100</y>
<width>441</width>
<height>81</height>
</rect>
</property>
<property name="title">
<string>HRTF Render Method</string>
</property>
<widget class="QLabel" name="label_31">
<property name="geometry">
<rect>
<x>20</x>
<y>30</y>
<width>51</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Speed</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="label_32">
<property name="geometry">
<rect>
<x>340</x>
<y>30</y>
<width>51</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Quality</string>
</property>
</widget>
<widget class="QSlider" name="hrtfmodeSlider">
<property name="geometry">
<rect>
<x>80</x>
<y>30</y>
<width>251</width>
<height>21</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
<widget class="QLabel" name="hrtfmodeLabel">
<property name="geometry">
<rect>
<x>50</x>
<y>50</y>
<width>321</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Default</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget>
</widget>
<widget class="QWidget" name="tab">
<attribute name="title">
@@ -1185,6 +1254,9 @@ application or system to determine if it should be used.</string>
<height>361</height>
</rect>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="page">
<widget class="QCheckBox" name="backendCheckBox">
<property name="geometry">
@@ -1279,7 +1351,7 @@ is not already running.</string>
<property name="text">
<string>AutoSpawn Server</string>
</property>
<property name="checked">
<property name="tristate">
<bool>true</bool>
</property>
</widget>
@@ -1301,6 +1373,9 @@ to match the new device.</string>
<property name="text">
<string>Allow Moving Streams</string>
</property>
<property name="tristate">
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="pulseFixRateCheckBox">
<property name="geometry">
@@ -1318,6 +1393,32 @@ rate to match the PulseAudio device.</string>
<property name="text">
<string>Fix Sample Rate</string>
</property>
<property name="tristate">
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="pulseAdjLatencyCheckBox">
<property name="geometry">
<rect>
<x>20</x>
<y>100</y>
<width>111</width>
<height>21</height>
</rect>
</property>
<property name="toolTip">
<string>Attempts to adjust the overall latency of device
playback. Note that this may have adverse effects
on the resulting internal buffer sizes and mixing
updates, leading to performance problems and
drop-outs.</string>
</property>
<property name="text">
<string>Adjust Latency</string>
</property>
<property name="tristate">
<bool>true</bool>
</property>
</widget>
</widget>
<widget class="QWidget" name="page_7">
@@ -1333,12 +1434,15 @@ rate to match the PulseAudio device.</string>
<property name="text">
<string>AutoSpawn Server</string>
</property>
<property name="tristate">
<bool>true</bool>
</property>
</widget>
<widget class="QGroupBox" name="groupBox_7">
<property name="geometry">
<rect>
<x>10</x>
<y>40</y>
<y>70</y>
<width>401</width>
<height>80</height>
</rect>
@@ -1396,6 +1500,22 @@ processing requests. Must be a power of 2.</string>
</property>
</widget>
</widget>
<widget class="QCheckBox" name="jackConnectPortsCheckBox">
<property name="geometry">
<rect>
<x>20</x>
<y>40</y>
<width>141</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>AutoConnect Ports</string>
</property>
<property name="tristate">
<bool>true</bool>
</property>
</widget>
</widget>
<widget class="QWidget" name="page_3">
<widget class="QLabel" name="label_17">
@@ -1474,6 +1594,9 @@ resample pass on top of OpenAL's resampler.</string>
<property name="text">
<string>Allow Resampler</string>
</property>
<property name="tristate">
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="alsaMmapCheckBox">
<property name="geometry">
@@ -1492,7 +1615,7 @@ during updates.</string>
<property name="text">
<string>MMap Buffer</string>
</property>
<property name="checked">
<property name="tristate">
<bool>true</bool>
</property>
</widget>
@@ -2156,6 +2279,22 @@ added by the ALC_EXT_DEDICATED extension.</string>
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="enableVocalMorpherCheck">
<property name="geometry">
<rect>
<x>320</x>
<y>210</y>
<width>131</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Vocal morpher</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</widget>
<widget class="QLabel" name="label_13">
<property name="geometry">
@@ -2163,7 +2302,7 @@ added by the ALC_EXT_DEDICATED extension.</string>
<x>10</x>
<y>20</y>
<width>141</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="text">
@@ -2178,8 +2317,8 @@ added by the ALC_EXT_DEDICATED extension.</string>
<rect>
<x>160</x>
<y>20</y>
<width>108</width>
<height>20</height>
<width>131</width>
<height>31</height>
</rect>
</property>
<property name="sizeAdjustPolicy">
@@ -2329,7 +2468,7 @@ added by the ALC_EXT_DEDICATED extension.</string>
<x>370</x>
<y>405</y>
<width>91</width>
<height>21</height>
<height>31</height>
</rect>
</property>
<property name="text">
@@ -2337,8 +2476,7 @@ added by the ALC_EXT_DEDICATED extension.</string>
</property>
<property name="icon">
<iconset theme="window-close">
<normaloff/>
</iconset>
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
</widget>
@@ -2348,7 +2486,7 @@ added by the ALC_EXT_DEDICATED extension.</string>
<x>0</x>
<y>0</y>
<width>564</width>
<height>21</height>
<height>29</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -2372,8 +2510,7 @@ added by the ALC_EXT_DEDICATED extension.</string>
<action name="actionQuit">
<property name="icon">
<iconset theme="application-exit">
<normaloff/>
</iconset>
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>&amp;Quit</string>
@@ -2382,8 +2519,7 @@ added by the ALC_EXT_DEDICATED extension.</string>
<action name="actionSave_As">
<property name="icon">
<iconset theme="document-save-as">
<normaloff/>
</iconset>
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Save &amp;As...</string>
@@ -2395,8 +2531,7 @@ added by the ALC_EXT_DEDICATED extension.</string>
<action name="actionLoad">
<property name="icon">
<iconset theme="document-open">
<normaloff/>
</iconset>
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>&amp;Load...</string>
@@ -2414,22 +2549,6 @@ added by the ALC_EXT_DEDICATED extension.</string>
<layoutdefault spacing="6" margin="11"/>
<resources/>
<connections>
<connection>
<sender>actionQuit</sender>
<signal>activated()</signal>
<receiver>MainWindow</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>267</x>
<y>181</y>
</hint>
</hints>
</connection>
<connection>
<sender>backendListWidget</sender>
<signal>currentRowChanged(int)</signal>
@@ -0,0 +1,10 @@
#include "verstr.h"
#include "version.h"
QString GetVersionString()
{
return QStringLiteral(ALSOFT_VERSION "-" ALSOFT_GIT_COMMIT_HASH " (" ALSOFT_GIT_BRANCH " branch).");
}
@@ -0,0 +1,8 @@
#ifndef VERSTR_H
#define VERSTR_H
#include <QString>
QString GetVersionString();
#endif /* VERSTR_H */