From dc751e374cfd11998c2cc9b2305912b422f56cb7 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Fri, 26 Jun 2009 12:41:27 +0000
Subject: fixed pulse audio support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@978 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Output/pulseaudio/outputpulseaudio.cpp        | 5 +++--
 src/plugins/Output/pulseaudio/outputpulseaudio.h          | 1 -
 src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/plugins/Output/pulseaudio')

diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
index 7243c7c04..7a2949922 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
@@ -111,7 +111,8 @@ qint64 OutputPulseAudio::writeAudio(unsigned char *data, qint64 maxSize)
     int error;
     if (!m_connection)
         return -1;
-    if (pa_simple_write(m_connection, data, maxSize, &error) < 0)
+    int i = 0;
+    if ((i = pa_simple_write(m_connection, data, maxSize, &error)) < 0)
     {
         mutex()->unlock();
         qWarning("OutputPulseAudio: pa_simple_write() failed: %s", pa_strerror(error));
@@ -124,7 +125,7 @@ void OutputPulseAudio::flush()
 {
     int error;
     if (m_connection)
-        pa_simple_flush(m_connection, &error);
+        pa_simple_drain(m_connection, &error);
 }
 
 void OutputPulseAudio::uninitialize()
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.h b/src/plugins/Output/pulseaudio/outputpulseaudio.h
index 4a2712998..5cc0bd93f 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.h
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.h
@@ -49,7 +49,6 @@ private:
     void flush();
 
     // helper functions
-    void status();
     void uninitialize();
 
     pa_simple *m_connection;
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
index 491a98a94..5618e7ba7 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
@@ -30,6 +30,7 @@ const OutputProperties OutputPulseAudioFactory::properties() const
     properties.name = tr("PulseAudio Plugin");
     properties.hasAbout = TRUE;
     properties.hasSettings = FALSE;
+    properties.shortName = "pulse";
     return properties;
 }
 
@@ -58,7 +59,7 @@ void OutputPulseAudioFactory::showAbout(QWidget *parent)
 QTranslator *OutputPulseAudioFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = Qmmp::systemLanguageID();
+    QString locale = QLocale::system().name();
     translator->load(QString(":/pulseaudio_plugin_") + locale);
     return translator;
 }
-- 
cgit v1.2.3-13-gbd6f