diff options
author | Chris Robinson <[email protected]> | 2015-08-28 22:09:07 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2015-08-28 22:09:07 -0700 |
commit | 7b4f1cfb4a2cdbc203299b0b89710545f2d2d287 (patch) | |
tree | 06d0c60779b92575f5258a48d8e3038ba5f4206d | |
parent | 2cb974df40526bec50092edf1cfe9551c93e2f50 (diff) |
Handle the stereo-mode config option with alsoft-config
-rw-r--r-- | utils/alsoft-config/mainwindow.cpp | 41 | ||||
-rw-r--r-- | utils/alsoft-config/mainwindow.ui | 65 |
2 files changed, 89 insertions, 17 deletions
diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp index 05afc918..60e5f999 100644 --- a/utils/alsoft-config/mainwindow.cpp +++ b/utils/alsoft-config/mainwindow.cpp @@ -66,6 +66,12 @@ static const struct { { "Cubic Spline (good quality)", "cubic" }, { "", "" } +}, stereoModeList[] = { + { "Autodetect", "" }, + { "Speakers", "speakers" }, + { "Headphones", "headphones" }, + + { "", "" } }; static QString getDefaultConfigName() @@ -153,6 +159,9 @@ MainWindow::MainWindow(QWidget *parent) : for(int i = 0;resamplerList[i].name[0];i++) ui->resamplerComboBox->addItem(resamplerList[i].name); ui->resamplerComboBox->adjustSize(); + for(int i = 0;stereoModeList[i].name[0];i++) + ui->stereoModeCombo->addItem(stereoModeList[i].name); + ui->stereoModeCombo->adjustSize(); mPeriodSizeValidator = new QIntValidator(64, 8192, this); ui->periodSizeEdit->setValidator(mPeriodSizeValidator); @@ -302,6 +311,28 @@ void MainWindow::loadConfig(const QString &fname) } } + QString stereomode = settings.value("stereo-mode").toString().trimmed(); + ui->stereoModeCombo->setCurrentIndex(0); + if(stereomode.isEmpty() == false) + { + for(int i = 0;stereoModeList[i].name[i];i++) + { + if(stereomode == stereoModeList[i].value) + { + for(int j = 1;j < ui->stereoModeCombo->count();j++) + { + QString item = ui->stereoModeCombo->itemText(j); + if(item == stereoModeList[i].name) + { + ui->stereoModeCombo->setCurrentIndex(j); + break; + } + } + break; + } + } + } + int periodsize = settings.value("period_size").toInt(); ui->periodSizeEdit->clear(); if(periodsize >= 64) @@ -475,6 +506,16 @@ void MainWindow::saveConfig(const QString &fname) const } } + str = ui->stereoModeCombo->currentText(); + for(int i = 0;stereoModeList[i].name[0];i++) + { + if(str == stereoModeList[i].name) + { + settings.setValue("stereo-mode", stereoModeList[i].value); + break; + } + } + QStringList strlist; if(!ui->enableSSECheckBox->isChecked()) strlist.append("sse"); diff --git a/utils/alsoft-config/mainwindow.ui b/utils/alsoft-config/mainwindow.ui index 6a2fed14..3dbc7e1c 100644 --- a/utils/alsoft-config/mainwindow.ui +++ b/utils/alsoft-config/mainwindow.ui @@ -123,8 +123,8 @@ to stereo output.</string> <widget class="QComboBox" name="sampleRateCombo"> <property name="geometry"> <rect> - <x>120</x> - <y>80</y> + <x>370</x> + <y>20</y> <width>96</width> <height>22</height> </rect> @@ -148,51 +148,51 @@ to stereo output.</string> </item> <item> <property name="text"> - <string>96000</string> + <string>8000</string> </property> </item> <item> <property name="text"> - <string>48000</string> + <string>11025</string> </property> </item> <item> <property name="text"> - <string>44100</string> + <string>16000</string> </property> </item> <item> <property name="text"> - <string>32000</string> + <string>22050</string> </property> </item> <item> <property name="text"> - <string>22050</string> + <string>32000</string> </property> </item> <item> <property name="text"> - <string>16000</string> + <string>44100</string> </property> </item> <item> <property name="text"> - <string>11025</string> + <string>48000</string> </property> </item> <item> <property name="text"> - <string>8000</string> + <string>96000</string> </property> </item> </widget> <widget class="QLabel" name="label_7"> <property name="geometry"> <rect> - <x>10</x> - <y>80</y> - <width>101</width> + <x>280</x> + <y>20</y> + <width>81</width> <height>21</height> </rect> </property> @@ -207,9 +207,9 @@ to stereo output.</string> <property name="geometry"> <rect> <x>10</x> - <y>200</y> + <y>180</y> <width>511</width> - <height>161</height> + <height>181</height> </rect> </property> <property name="title"> @@ -274,7 +274,7 @@ sample rate.</string> <x>110</x> <y>30</y> <width>301</width> - <height>121</height> + <height>141</height> </rect> </property> <property name="toolTip"> @@ -344,7 +344,7 @@ contain these markers, which will be replaced as needed: <property name="geometry"> <rect> <x>10</x> - <y>110</y> + <y>90</y> <width>511</width> <height>91</height> </rect> @@ -515,6 +515,37 @@ frames needed for each mixing update.</string> </widget> </widget> </widget> + <widget class="QLabel" name="label_14"> + <property name="geometry"> + <rect> + <x>280</x> + <y>50</y> + <width>81</width> + <height>21</height> + </rect> + </property> + <property name="text"> + <string>Stereo Mode:</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + <widget class="QComboBox" name="stereoModeCombo"> + <property name="geometry"> + <rect> + <x>370</x> + <y>50</y> + <width>78</width> + <height>22</height> + </rect> + </property> + <property name="toolTip"> + <string>How to treat stereo output. As headphones, HRTF or crossfeed +filters may be used to improve binaural quality, which may not +otherwise be suitable for speakers.</string> + </property> + </widget> </widget> <widget class="QWidget" name="tab_2"> <attribute name="title"> |