aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/jack
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-01-16 15:33:17 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-01-16 15:33:17 +0000
commit435f1da1de18bafe57e43e47fd8a6fc69fd8bab7 (patch)
treee332293971b3b3883685b79c62bcd50bf2f49c12 /src/plugins/Output/jack
parent2fa169a585994ceb40db55405f46783d06820947 (diff)
downloadqmmp-435f1da1de18bafe57e43e47fd8a6fc69fd8bab7.tar.gz
qmmp-435f1da1de18bafe57e43e47fd8a6fc69fd8bab7.tar.bz2
qmmp-435f1da1de18bafe57e43e47fd8a6fc69fd8bab7.zip
updated audio engine
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1503 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Output/jack')
-rw-r--r--src/plugins/Output/jack/outputjack.cpp10
-rw-r--r--src/plugins/Output/jack/outputjack.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/Output/jack/outputjack.cpp b/src/plugins/Output/jack/outputjack.cpp
index b064590f4..c60087711 100644
--- a/src/plugins/Output/jack/outputjack.cpp
+++ b/src/plugins/Output/jack/outputjack.cpp
@@ -23,8 +23,8 @@
#include <QtGlobal>
#include <QDir>
#include <QSettings>
-
#include "outputjack.h"
+#include <qmmp/audioparameters.h>
#include <qmmp/buffer.h>
#include <qmmp/visual.h>
@@ -42,10 +42,10 @@ OutputJACK::~OutputJACK()
uninitialize();
}
-void OutputJACK::configure(quint32 freq, int chan, int prec)
+void OutputJACK::configure(quint32 freq, int chan, Qmmp::AudioFormat format)
{
qDebug("OutputJACK: configure");
- if(JACK_Open(&jack_device, prec, (unsigned long *)&freq, chan))
+ if(JACK_Open(&jack_device, AudioParameters::sampleSize(format)*8, (unsigned long *)&freq, chan))
{
m_configure = FALSE;
m_inited = FALSE;
@@ -54,7 +54,7 @@ void OutputJACK::configure(quint32 freq, int chan, int prec)
else
m_configure = TRUE;
m_inited = TRUE;
- Output::configure(freq, chan, prec);
+ Output::configure(freq, chan, format);
qDebug("OutputJACK: configure end");
}
@@ -72,7 +72,7 @@ bool OutputJACK::initialize()
{
qDebug("Unable to connect to JACK server.");
}
- return FALSE;
+ return FALSE;
}
jack_client_close (client);
m_inited = TRUE;
diff --git a/src/plugins/Output/jack/outputjack.h b/src/plugins/Output/jack/outputjack.h
index 8a340002d..f2d6357b6 100644
--- a/src/plugins/Output/jack/outputjack.h
+++ b/src/plugins/Output/jack/outputjack.h
@@ -40,7 +40,7 @@ public:
~OutputJACK();
bool initialize();
- void configure(quint32, int, int);
+ void configure(quint32, int, Qmmp::AudioFormat format);
qint64 latency();
private: