added possibility to disable snd_pcm_pause function

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

13 files changed, 63 insertions, 4 deletions

diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp
index 8d2f6b95f..829641638 100644
--- a/src/plugins/Output/alsa/outputalsa.cpp
+++ b/src/plugins/Output/alsa/outputalsa.cpp
@@ -69,6 +69,7 @@ void OutputALSA::configure(quint32 freq, int chan, int prec)
     settings.beginGroup("ALSA");
     uint buffer_time = settings.value("buffer_time",500).toUInt()*1000;
     uint period_time = settings.value("period_time",100).toUInt()*1000;
+    bool use_pause =  settings.value("use_snd_pcm_pause", FALSE).toBool();
     settings.endGroup();
 
     snd_pcm_hw_params_t *hwparams = 0;
@@ -182,7 +183,7 @@ void OutputALSA::configure(quint32 freq, int chan, int prec)
     //setup needed values
     m_bits_per_frame = snd_pcm_format_physical_width(format) * chan;
     m_chunk_size = period_size;
-    m_can_pause = snd_pcm_hw_params_can_pause(hwparams);
+    m_can_pause = snd_pcm_hw_params_can_pause(hwparams) && use_pause;
     qDebug("OutputALSA: can pause: %d", m_can_pause);
     Output::configure(freq, chan, prec); //apply configuration
     //create alsa prebuffer;
diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp
index 137bcdaac..5790cf6ed 100644
--- a/src/plugins/Output/alsa/settingsdialog.cpp
+++ b/src/plugins/Output/alsa/settingsdialog.cpp
@@ -55,7 +55,7 @@ SettingsDialog::SettingsDialog ( QWidget *parent )
         ui.mixerDeviceComboBox->setCurrentIndex(d);
 
     ui.mmapCheckBox->setChecked(settings.value("use_mmap", FALSE).toBool());
-
+    ui.pauseCheckBox->setChecked(settings.value("use_snd_pcm_pause", FALSE).toBool());
     settings.endGroup();
 }
 
@@ -194,6 +194,7 @@ void SettingsDialog::accept()
     }
     settings.setValue("mixer_device", ui.mixerDeviceComboBox->currentText ());
     settings.setValue("use_mmap", ui.mmapCheckBox->isChecked());
+    settings.setValue("use_snd_pcm_pause", ui.pauseCheckBox->isChecked());
     settings.endGroup();
     QDialog::accept();
 }
diff --git a/src/plugins/Output/alsa/settingsdialog.ui b/src/plugins/Output/alsa/settingsdialog.ui
index 0f09b942e..4bc9a4006 100644
--- a/src/plugins/Output/alsa/settingsdialog.ui
+++ b/src/plugins/Output/alsa/settingsdialog.ui
@@ -17,7 +17,7 @@
    <item row="0" column="0" colspan="2">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -181,7 +181,7 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
+          <item row="4" column="1">
            <spacer>
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -194,6 +194,13 @@
             </property>
            </spacer>
           </item>
+          <item row="3" column="0" colspan="3">
+           <widget class="QCheckBox" name="pauseCheckBox">
+            <property name="text">
+             <string>Use snd_pcm_pause function</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts b/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts
index d1668743d..a00c1a805 100644
--- a/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts
+++ b/src/plugins/Output/alsa/translations/alsa_plugin_cs.ts
@@ -81,5 +81,10 @@
         <source>Use mmap access</source>
         <translation>Použít mmap</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="200"/>
+        <source>Use snd_pcm_pause function</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_de.ts b/src/plugins/Output/alsa/translations/alsa_plugin_de.ts
index c61c7d994..41edf90c4 100644
--- a/src/plugins/Output/alsa/translations/alsa_plugin_de.ts
+++ b/src/plugins/Output/alsa/translations/alsa_plugin_de.ts
@@ -81,5 +81,10 @@
         <source>Use mmap access</source>
         <translation>Mmap-Unterstützung aktivieren</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="200"/>
+        <source>Use snd_pcm_pause function</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_it.ts b/src/plugins/Output/alsa/translations/alsa_plugin_it.ts
index 8503c1172..6e471d5f9 100644
--- a/src/plugins/Output/alsa/translations/alsa_plugin_it.ts
+++ b/src/plugins/Output/alsa/translations/alsa_plugin_it.ts
@@ -81,5 +81,10 @@
         <source>Use mmap access</source>
         <translation>Usa accesso Mmap</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="200"/>
+        <source>Use snd_pcm_pause function</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_lt.ts b/src/plugins/Output/alsa/translations/alsa_plugin_lt.ts
index f0050b640..fff64a7cd 100644
--- a/src/plugins/Output/alsa/translations/alsa_plugin_lt.ts
+++ b/src/plugins/Output/alsa/translations/alsa_plugin_lt.ts
@@ -72,6 +72,11 @@
         <translation>Periodo laikas (ms):</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="200"/>
+        <source>Use snd_pcm_pause function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../settingsdialog.ui" line="14"/>
         <source>ALSA Plugin Settings</source>
         <translation>ALSA įskiepio nustatymai</translation>
diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_pl.ts b/src/plugins/Output/alsa/translations/alsa_plugin_pl.ts
index 3283c56bb..4f10bdfa7 100644
--- a/src/plugins/Output/alsa/translations/alsa_plugin_pl.ts
+++ b/src/plugins/Output/alsa/translations/alsa_plugin_pl.ts
@@ -81,5 +81,10 @@
         <source>Use mmap access</source>
         <translation>Użyj dostępu mmap</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="200"/>
+        <source>Use snd_pcm_pause function</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_ru.ts b/src/plugins/Output/alsa/translations/alsa_plugin_ru.ts
index 60edc4659..244715907 100644
--- a/src/plugins/Output/alsa/translations/alsa_plugin_ru.ts
+++ b/src/plugins/Output/alsa/translations/alsa_plugin_ru.ts
@@ -72,6 +72,11 @@
         <translation>Время периода (мс):</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="200"/>
+        <source>Use snd_pcm_pause function</source>
+        <translation>Использовать функцию snd_pcm_pause</translation>
+    </message>
+    <message>
         <location filename="../settingsdialog.ui" line="14"/>
         <source>ALSA Plugin Settings</source>
         <translation>Настройки модуля ALSA</translation>
diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_tr.ts b/src/plugins/Output/alsa/translations/alsa_plugin_tr.ts
index 663f67015..898446c40 100644
--- a/src/plugins/Output/alsa/translations/alsa_plugin_tr.ts
+++ b/src/plugins/Output/alsa/translations/alsa_plugin_tr.ts
@@ -81,5 +81,10 @@
         <source>Use mmap access</source>
         <translation>mmap erişimi kullan</translation>
     </message>
+    <message>
+        <location filename="../settingsdialog.ui" line="200"/>
+        <source>Use snd_pcm_pause function</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_uk_UA.ts b/src/plugins/Output/alsa/translations/alsa_plugin_uk_UA.ts
index c6fd99cb3..21333e82c 100644
--- a/src/plugins/Output/alsa/translations/alsa_plugin_uk_UA.ts
+++ b/src/plugins/Output/alsa/translations/alsa_plugin_uk_UA.ts
@@ -72,6 +72,11 @@
         <translation>Час періоду (мс):</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="200"/>
+        <source>Use snd_pcm_pause function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../settingsdialog.ui" line="14"/>
         <source>ALSA Plugin Settings</source>
         <translation>Налаштування модуля ALSA</translation>
diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_zh_CN.ts b/src/plugins/Output/alsa/translations/alsa_plugin_zh_CN.ts
index 791a3e1f3..196cb3e87 100644
--- a/src/plugins/Output/alsa/translations/alsa_plugin_zh_CN.ts
+++ b/src/plugins/Output/alsa/translations/alsa_plugin_zh_CN.ts
@@ -72,6 +72,11 @@
         <translation>周期时间(ms)：</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="200"/>
+        <source>Use snd_pcm_pause function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../settingsdialog.ui" line="14"/>
         <source>ALSA Plugin Settings</source>
         <translation>ALSA 插件设置</translation>
diff --git a/src/plugins/Output/alsa/translations/alsa_plugin_zh_TW.ts b/src/plugins/Output/alsa/translations/alsa_plugin_zh_TW.ts
index d3631e58e..409330b4a 100644
--- a/src/plugins/Output/alsa/translations/alsa_plugin_zh_TW.ts
+++ b/src/plugins/Output/alsa/translations/alsa_plugin_zh_TW.ts
@@ -72,6 +72,11 @@
         <translation>周期時間(ms)：</translation>
     </message>
     <message>
+        <location filename="../settingsdialog.ui" line="200"/>
+        <source>Use snd_pcm_pause function</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../settingsdialog.ui" line="14"/>
         <source>ALSA Plugin Settings</source>
         <translation>ALSA 插件設定</translation>