aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/jack
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-04-13 16:49:54 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-04-13 16:49:54 +0000
commit4ff60141044da7a901c20ceb5edbd22d382ff990 (patch)
treea063bd729a20bfb1ebed6e340d34e6498397beb2 /src/plugins/Output/jack
parent0239302ef0122b54d4a820eb8c5a752523925779 (diff)
downloadqmmp-4ff60141044da7a901c20ceb5edbd22d382ff990.tar.gz
qmmp-4ff60141044da7a901c20ceb5edbd22d382ff990.tar.bz2
qmmp-4ff60141044da7a901c20ceb5edbd22d382ff990.zip
fixed volume control regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2710 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Output/jack')
-rw-r--r--src/plugins/Output/jack/jack.pro2
-rw-r--r--src/plugins/Output/jack/outputjack.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/Output/jack/jack.pro b/src/plugins/Output/jack/jack.pro
index 75c05fd01..9f9cf889a 100644
--- a/src/plugins/Output/jack/jack.pro
+++ b/src/plugins/Output/jack/jack.pro
@@ -12,7 +12,7 @@ TARGET=$$PLUGINS_PREFIX/Output/jack
QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libjack.so
-#DEFINES += JACK_NEW_API
+DEFINES += JACK_NEW_API
INCLUDEPATH += ../../../
diff --git a/src/plugins/Output/jack/outputjack.cpp b/src/plugins/Output/jack/outputjack.cpp
index feeccf9d3..c05e93785 100644
--- a/src/plugins/Output/jack/outputjack.cpp
+++ b/src/plugins/Output/jack/outputjack.cpp
@@ -37,6 +37,7 @@ OutputJACK::OutputJACK(QObject *parent) : Output(parent), m_inited(false)
{
JACK_Init();
m_wait_time = 0;
+ jack_device = 0;
}
OutputJACK::~OutputJACK()
@@ -91,4 +92,5 @@ void OutputJACK::uninitialize()
if (!m_inited)
return;
JACK_Close(jack_device);
+ m_inited = false;
}