iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When waiting for replies from MPD, use Qt's standard timeout value of 30s. While the socket is still connected, Cantata will wait up to 4 times the timeout value. Therefore, the actual timeout has increased to 2minutes!

Browse Source 
BUG: 422
This commit is contained in:
craig.p.drummond
2014-02-25 19:23:30 +00:00
parent 71dc83553a
commit feafcbb19a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -20,6 +20,9 @@
2. Apply some Fedora patches.
3. Fix MPD HTTP stream playback.
4. Fix painting of Gtk thin scrollbar style on comboboxes.
5. When waiting for replies from MPD, use Qt's standard timeout value of 30s.
While the socket is still connected, Cantata will wait up to 4 times the
timeout value. Therefore, the actual timeout has increased to 2minutes!
1.3.0.1
-------

10
mpd/mpdconnection.cpp
View File

@@ -98,14 +98,14 @@ QByteArray MPDConnection::encodeName(const QString &name)
return '\"'+name.toUtf8().replace("\\", "\\\\").replace("\"", "\\\"")+'\"';
}
static QByteArray readFromSocket(MpdSocket &socket, int timeout=-1)
static QByteArray readFromSocket(MpdSocket &socket)
{
QByteArray data;
while (QAbstractSocket::ConnectedState==socket.state()) {
int attempt=0;
while (0==socket.bytesAvailable() && QAbstractSocket::ConnectedState==socket.state()) {
DBUG << (void *)(&socket) << "Waiting for read data." << attempt;
if (socket.waitForReadyRead(timeout<constSocketCommsTimeout ? constSocketCommsTimeout : timeout)) {
if (socket.waitForReadyRead()) {
break;
}
if (++attempt>=constMaxReadAttempts) {
@@ -126,9 +126,9 @@ static QByteArray readFromSocket(MpdSocket &socket, int timeout=-1)
return data;
}
static MPDConnection::Response readReply(MpdSocket &socket, int timeout=-1)
static MPDConnection::Response readReply(MpdSocket &socket)
{
QByteArray data = readFromSocket(socket, timeout);
QByteArray data = readFromSocket(socket);
return MPDConnection::Response(data.endsWith("OK\n"), data);
}
@@ -514,7 +514,7 @@ MPDConnection::Response MPDConnection::sendCommand(const QByteArray &command, bo
DBUG << "Timeout (ms):" << timeout;
sock.waitForBytesWritten(timeout);
DBUG << "Socket state after write:" << (int)sock.state();
response=readReply(sock, timeout);
response=readReply(sock);
}
if (!response.ok) {