aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2015-08-25 20:56:11 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2015-08-25 20:56:11 +0000
commit3df9d7e8e4a24bdc7ff12c1eb79d36981803913e (patch)
tree748a5acc88e2ac16971eb0cc253533acb42db725
parent2dec653cbed35d008509e3cd119d5acc06fa0ab7 (diff)
downloadqmmp-3df9d7e8e4a24bdc7ff12c1eb79d36981803913e.tar.gz
qmmp-3df9d7e8e4a24bdc7ff12c1eb79d36981803913e.tar.bz2
qmmp-3df9d7e8e4a24bdc7ff12c1eb79d36981803913e.zip
jack: added more debug output
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5494 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/plugins/Output/jack/outputjack.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/plugins/Output/jack/outputjack.cpp b/src/plugins/Output/jack/outputjack.cpp
index 192d42d61..9672c7e72 100644
--- a/src/plugins/Output/jack/outputjack.cpp
+++ b/src/plugins/Output/jack/outputjack.cpp
@@ -85,13 +85,22 @@ qint64 OutputJACK::writeAudio(unsigned char *data, qint64 maxSize)
return -1;
m = JACK_Write(jack_device, (unsigned char*)data, maxSize);
- if (!m)
+ if(JACK_GetState(jack_device) != PLAYING && JACK_GetState(jack_device) != RESET)
+ {
+ qWarning("OutputJACK: jack is not in PLAYING or RESET states");
+ return -1;
+ }
+
+ if (m == 0)
{
usleep(2000);
- if(JACK_GetState(jack_device) != PLAYING)
- m_wait_time += 2000;
+ m_wait_time += 2000;
+
if(m_wait_time > JACK_TIMEOUT)
+ {
+ qWarning("OutputJACK: jack timeout error");
return -1;
+ }
}
else
m_wait_time = 0;