diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-04-13 16:49:54 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-04-13 16:49:54 +0000 |
| commit | 4ff60141044da7a901c20ceb5edbd22d382ff990 (patch) | |
| tree | a063bd729a20bfb1ebed6e340d34e6498397beb2 | |
| parent | 0239302ef0122b54d4a820eb8c5a752523925779 (diff) | |
| download | qmmp-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
| -rw-r--r-- | src/plugins/Output/jack/jack.pro | 2 | ||||
| -rw-r--r-- | src/plugins/Output/jack/outputjack.cpp | 2 | ||||
| -rw-r--r-- | src/qmmp/volumecontrol.cpp | 4 |
3 files changed, 5 insertions, 3 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; } diff --git a/src/qmmp/volumecontrol.cpp b/src/qmmp/volumecontrol.cpp index 3a2d20770..626af8f1d 100644 --- a/src/qmmp/volumecontrol.cpp +++ b/src/qmmp/volumecontrol.cpp @@ -90,8 +90,8 @@ void VolumeControl::reload() } if(!QmmpSettings::instance()->useSoftVolume()) { - m_volume = Output::currentFactory()->createVolume(); - m_timer->start(150); + if((m_volume = Output::currentFactory()->createVolume())) + m_timer->start(150); } if(!m_volume) { |