From 066a48c5fb8cee4b32bd7145dd78147ba709f067 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 5 Aug 2014 02:43:04 -0700
Subject: Update alsoft-config

Adds Compressor effect and SSE 4.1 for exclusion, and alters the HRTF tables
tooltip to refer the the default data sets instead of the built-in set.
---
 utils/alsoft-config/mainwindow.cpp |  6 ++++
 utils/alsoft-config/mainwindow.ui  | 72 ++++++++++++++++++++++++++------------
 2 files changed, 55 insertions(+), 23 deletions(-)

(limited to 'utils/alsoft-config')

diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp
index 0047233f..f009208a 100644
--- a/utils/alsoft-config/mainwindow.cpp
+++ b/utils/alsoft-config/mainwindow.cpp
@@ -220,6 +220,7 @@ void MainWindow::loadConfig(const QString &fname)
                    disabledCpuExts.begin(), std::mem_fun_ref(&QString::trimmed));
     ui->disableSSECheckBox->setChecked(disabledCpuExts.contains("sse", Qt::CaseInsensitive));
     ui->disableSSE2CheckBox->setChecked(disabledCpuExts.contains("sse2", Qt::CaseInsensitive));
+    ui->disableSSE41CheckBox->setChecked(disabledCpuExts.contains("sse4.1", Qt::CaseInsensitive));
     ui->disableNeonCheckBox->setChecked(disabledCpuExts.contains("neon", Qt::CaseInsensitive));
 
     if(settings.value("hrtf").toString() == QString())
@@ -291,6 +292,7 @@ void MainWindow::loadConfig(const QString &fname)
     ui->disableEaxReverbCheck->setChecked(excludefx.contains("eaxreverb", Qt::CaseInsensitive));
     ui->disableStdReverbCheck->setChecked(excludefx.contains("reverb", Qt::CaseInsensitive));
     ui->disableChorusCheck->setChecked(excludefx.contains("chorus", Qt::CaseInsensitive));
+    ui->disableCompressorCheck->setChecked(excludefx.contains("compressor", Qt::CaseInsensitive));
     ui->disableDistortionCheck->setChecked(excludefx.contains("distortion", Qt::CaseInsensitive));
     ui->disableEchoCheck->setChecked(excludefx.contains("echo", Qt::CaseInsensitive));
     ui->disableEqualizerCheck->setChecked(excludefx.contains("equalizer", Qt::CaseInsensitive));
@@ -359,6 +361,8 @@ void MainWindow::saveConfig(const QString &fname) const
         strlist.append("sse");
     if(ui->disableSSE2CheckBox->isChecked())
         strlist.append("sse2");
+    if(ui->disableSSE41CheckBox->isChecked())
+        strlist.append("sse4.1");
     if(ui->disableNeonCheckBox->isChecked())
         strlist.append("neon");
     settings.setValue("disable-cpu-exts", strlist.join(QChar(',')));
@@ -418,6 +422,8 @@ void MainWindow::saveConfig(const QString &fname) const
         strlist.append("chorus");
     if(ui->disableDistortionCheck->isChecked())
         strlist.append("distortion");
+    if(ui->disableCompressorCheck->isChecked())
+        strlist.append("compressor");
     if(ui->disableEchoCheck->isChecked())
         strlist.append("echo");
     if(ui->disableEqualizerCheck->isChecked())
diff --git a/utils/alsoft-config/mainwindow.ui b/utils/alsoft-config/mainwindow.ui
index 4c7d0c69..7a0276d8 100644
--- a/utils/alsoft-config/mainwindow.ui
+++ b/utils/alsoft-config/mainwindow.ui
@@ -58,8 +58,8 @@
        <rect>
         <x>120</x>
         <y>20</y>
-        <width>206</width>
-        <height>23</height>
+        <width>188</width>
+        <height>22</height>
        </rect>
       </property>
       <property name="toolTip">
@@ -147,8 +147,8 @@ float and converted to the output sample type as needed.</string>
        <rect>
         <x>120</x>
         <y>50</y>
-        <width>247</width>
-        <height>23</height>
+        <width>227</width>
+        <height>22</height>
        </rect>
       </property>
       <property name="toolTip">
@@ -200,7 +200,7 @@ to stereo output.</string>
        <rect>
         <x>120</x>
         <y>80</y>
-        <width>123</width>
+        <width>111</width>
         <height>22</height>
        </rect>
       </property>
@@ -354,7 +354,7 @@ sample rate.</string>
        </property>
        <property name="toolTip">
         <string>A list of files containing HRTF data sets. The listed data sets
-are used in place of or in addiiton to the the built-in set. The
+are used in place of or in addition to the the default sets. The
 filenames may contain these markers, which will be replaced
 as needed:
 %r - Device sampling rate
@@ -738,8 +738,8 @@ value currently possible is 4.</string>
        <rect>
         <x>110</x>
         <y>120</y>
-        <width>203</width>
-        <height>23</height>
+        <width>185</width>
+        <height>22</height>
        </rect>
       </property>
       <property name="toolTip">
@@ -775,7 +775,7 @@ value currently possible is 4.</string>
         <x>10</x>
         <y>150</y>
         <width>511</width>
-        <height>61</height>
+        <height>91</height>
        </rect>
       </property>
       <property name="toolTip">
@@ -815,8 +815,8 @@ preventing those extensions from being used.</string>
       <widget class="QCheckBox" name="disableNeonCheckBox">
        <property name="geometry">
         <rect>
-         <x>380</x>
-         <y>20</y>
+         <x>200</x>
+         <y>50</y>
          <width>111</width>
          <height>31</height>
         </rect>
@@ -825,6 +825,19 @@ preventing those extensions from being used.</string>
         <string>Disable Neon</string>
        </property>
       </widget>
+      <widget class="QCheckBox" name="disableSSE41CheckBox">
+       <property name="geometry">
+        <rect>
+         <x>370</x>
+         <y>20</y>
+         <width>121</width>
+         <height>31</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Disable SSE4.1</string>
+       </property>
+      </widget>
      </widget>
     </widget>
     <widget class="QWidget" name="tab">
@@ -1011,10 +1024,10 @@ value of 0 means no change.</string>
      <widget class="QGroupBox" name="groupBox_5">
       <property name="geometry">
        <rect>
-        <x>9</x>
+        <x>10</x>
         <y>170</y>
         <width>511</width>
-        <height>181</height>
+        <height>191</height>
        </rect>
       </property>
       <property name="toolTip">
@@ -1068,7 +1081,7 @@ intensive for the system to handle.</string>
        <property name="geometry">
         <rect>
          <x>70</x>
-         <y>120</y>
+         <y>150</y>
          <width>131</width>
          <height>21</height>
         </rect>
@@ -1080,8 +1093,8 @@ intensive for the system to handle.</string>
       <widget class="QCheckBox" name="disableEchoCheck">
        <property name="geometry">
         <rect>
-         <x>70</x>
-         <y>150</y>
+         <x>320</x>
+         <y>30</y>
          <width>131</width>
          <height>21</height>
         </rect>
@@ -1094,7 +1107,7 @@ intensive for the system to handle.</string>
        <property name="geometry">
         <rect>
          <x>320</x>
-         <y>30</y>
+         <y>60</y>
          <width>131</width>
          <height>21</height>
         </rect>
@@ -1107,7 +1120,7 @@ intensive for the system to handle.</string>
        <property name="geometry">
         <rect>
          <x>320</x>
-         <y>60</y>
+         <y>90</y>
          <width>131</width>
          <height>21</height>
         </rect>
@@ -1120,7 +1133,7 @@ intensive for the system to handle.</string>
        <property name="geometry">
         <rect>
          <x>320</x>
-         <y>90</y>
+         <y>120</y>
          <width>131</width>
          <height>21</height>
         </rect>
@@ -1133,7 +1146,7 @@ intensive for the system to handle.</string>
        <property name="geometry">
         <rect>
          <x>320</x>
-         <y>120</y>
+         <y>150</y>
          <width>131</width>
          <height>21</height>
         </rect>
@@ -1146,6 +1159,19 @@ added by the ALC_EXT_DEDICATED extension.</string>
         <string>Dedicated ...</string>
        </property>
       </widget>
+      <widget class="QCheckBox" name="disableCompressorCheck">
+       <property name="geometry">
+        <rect>
+         <x>70</x>
+         <y>120</y>
+         <width>111</width>
+         <height>21</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Compressor</string>
+       </property>
+      </widget>
      </widget>
      <widget class="QLabel" name="label_13">
       <property name="geometry">
@@ -1168,8 +1194,8 @@ added by the ALC_EXT_DEDICATED extension.</string>
        <rect>
         <x>160</x>
         <y>20</y>
-        <width>142</width>
-        <height>23</height>
+        <width>131</width>
+        <height>22</height>
        </rect>
       </property>
       <property name="sizeAdjustPolicy">
@@ -1320,7 +1346,7 @@ added by the ALC_EXT_DEDICATED extension.</string>
      <x>0</x>
      <y>0</y>
      <width>564</width>
-     <height>20</height>
+     <height>19</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
-- 
cgit v1.2.3