added feature to select output bit depth

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6014 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 32 insertions, 24 deletions

diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp
index f84123621..4e3bb9cb2 100644
--- a/src/qmmpui/configdialog.cpp
+++ b/src/qmmpui/configdialog.cpp
@@ -69,6 +69,9 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent)
     m_ui->replayGainModeComboBox->addItem (tr("Track"), QmmpSettings::REPLAYGAIN_TRACK);
     m_ui->replayGainModeComboBox->addItem (tr("Album"), QmmpSettings::REPLAYGAIN_ALBUM);
     m_ui->replayGainModeComboBox->addItem (tr("Disabled"), QmmpSettings::REPLAYGAIN_DISABLED);
+    m_ui->bitDepthComboBox->addItem("16", Qmmp::PCM_S16LE);
+    m_ui->bitDepthComboBox->addItem("24", Qmmp::PCM_S24LE);
+    m_ui->bitDepthComboBox->addItem("32", Qmmp::PCM_S32LE);
     readSettings();
     loadPluginsInfo();
     loadLanguages();
@@ -150,7 +153,7 @@ void ConfigDialog::readSettings()
     m_ui->defaultGainDoubleSpinBox->setValue(gs->replayGainDefaultGain());
     //audio
     m_ui->softVolumeCheckBox->setChecked(gs->useSoftVolume());
-    m_ui->use16BitCheckBox->setChecked(gs->use16BitOutput());
+    m_ui->bitDepthComboBox->setCurrentIndex(m_ui->bitDepthComboBox->findData(gs->outputFormat()));
     m_ui->ditheringCheckBox->setChecked(gs->useDithering());
     m_ui->bufferSizeSpinBox->setValue(gs->bufferSize());
     //geometry
@@ -409,7 +412,9 @@ void ConfigDialog::saveSettings()
                               m_ui->preampDoubleSpinBox->value(),
                               m_ui->defaultGainDoubleSpinBox->value(),
                               m_ui->clippingCheckBox->isChecked());
-    gs->setAudioSettings(m_ui->softVolumeCheckBox->isChecked(), m_ui->use16BitCheckBox->isChecked(),
+    i = m_ui->bitDepthComboBox->currentIndex();
+    gs->setAudioSettings(m_ui->softVolumeCheckBox->isChecked(),
+                         (Qmmp::AudioFormat)m_ui->bitDepthComboBox->itemData(i).toInt(),
                          m_ui->ditheringCheckBox->isChecked());
     gs->setBufferSize(m_ui->bufferSizeSpinBox->value());
     gs->setDetermineFileTypeByContent(m_ui->byContentCheckBox->isChecked());
diff --git a/src/qmmpui/forms/configdialog.ui b/src/qmmpui/forms/configdialog.ui
index 1cf7a46ff..55321fcff 100644
--- a/src/qmmpui/forms/configdialog.ui
+++ b/src/qmmpui/forms/configdialog.ui
@@ -758,6 +758,13 @@
            <string>Audio</string>
           </property>
           <layout class="QGridLayout" name="gridLayout3">
+           <item row="3" column="0" colspan="3">
+            <widget class="QCheckBox" name="ditheringCheckBox">
+             <property name="text">
+              <string>Use dithering</string>
+             </property>
+            </widget>
+           </item>
            <item row="0" column="0">
             <widget class="QLabel" name="label_20">
              <property name="text">
@@ -793,39 +800,35 @@
              </property>
             </widget>
            </item>
-           <item row="0" column="2">
-            <spacer name="horizontalSpacer_6">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>266</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="1" column="0" colspan="3">
+           <item row="2" column="0" colspan="3">
             <widget class="QCheckBox" name="softVolumeCheckBox">
              <property name="text">
               <string>Use software volume control</string>
              </property>
             </widget>
            </item>
-           <item row="2" column="0" colspan="3">
-            <widget class="QCheckBox" name="use16BitCheckBox">
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_4">
              <property name="text">
-              <string>16-bit output</string>
+              <string>Output bit depth:</string>
              </property>
             </widget>
            </item>
-           <item row="3" column="0" colspan="3">
-            <widget class="QCheckBox" name="ditheringCheckBox">
-             <property name="text">
-              <string>Use dithering</string>
+           <item row="1" column="1">
+            <widget class="QComboBox" name="bitDepthComboBox"/>
+           </item>
+           <item row="0" column="2" rowspan="2">
+            <spacer name="horizontalSpacer_6">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
              </property>
-            </widget>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>266</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
            </item>
           </layout>
          </widget>