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

Ignore Mpodiy's "incorrect arguments" error code for crossfade and replaygain mode. The commands are not supported by Mopidy.

Browse Source
This commit is contained in:
craig.p.drummond
2014-01-21 20:20:46 +00:00
parent 4853b27f33
commit 014afe7d94
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
mpd/mpdconnection.cpp
View File

@@ -524,28 +524,37 @@ MPDConnection::Response MPDConnection::sendCommand(const QByteArray &command, bo
return sendCommand(command, emitErrors, false);
}
if (emitErrors) {
if ((command.startsWith("add ") || command.startsWith("command_list_begin\nadd ")) && -1!=command.indexOf("\"file:///")) {
if (details.isLocal() && -1!=response.data.indexOf("Permission denied")) {
emit error(i18n("Failed to load. Please check user \"mpd\" has read permission."));
} else if (!details.isLocal() && -1!=response.data.indexOf("Access denied")) {
emit error(i18n("Failed to load. MPD can only play local files if connected via a local socket."));
bool emitError=true;
// Mopidy returns "incorrect arguments" for commands it does not support. The docs state that crossfade and replaygain mode
// setting commands are not supported. So, if we get this error then just ignore it.
if ((command.startsWith("crossfade ") || command.startsWith("replay_gain_mode ")) &&
"incorrect arguments"==response.getError(command)) {
emitError=false;
}
if (emitError) {
if ((command.startsWith("add ") || command.startsWith("command_list_begin\nadd ")) && -1!=command.indexOf("\"file:///")) {
if (details.isLocal() && -1!=response.data.indexOf("Permission denied")) {
emit error(i18n("Failed to load. Please check user \"mpd\" has read permission."));
} else if (!details.isLocal() && -1!=response.data.indexOf("Access denied")) {
emit error(i18n("Failed to load. MPD can only play local files if connected via a local socket."));
} else if (!response.getError(command).isEmpty()) {
emit error(i18n("MPD reported the following error: %1", response.getError(command)));
} else {
disconnectFromMPD();
emit stateChanged(false);
emit error(i18n("Failed to send command. Disconnected from %1", details.description()), true);
}
} else if (!response.getError(command).isEmpty()) {
emit error(i18n("MPD reported the following error: %1", response.getError(command)));
} else {
} /*else if ("listallinfo"==command && ver>=MPD_MAKE_VERSION(0,18,0)) {
disconnectFromMPD();
emit stateChanged(false);
emit error(i18n("Failed to load library. Please increase \"max_output_buffer_size\" in MPD's config file."));
} */ else {
disconnectFromMPD();
emit stateChanged(false);
emit error(i18n("Failed to send command. Disconnected from %1", details.description()), true);
}
} else if (!response.getError(command).isEmpty()) {
emit error(i18n("MPD reported the following error: %1", response.getError(command)));
} /*else if ("listallinfo"==command && ver>=MPD_MAKE_VERSION(0,18,0)) {
disconnectFromMPD();
emit stateChanged(false);
emit error(i18n("Failed to load library. Please increase \"max_output_buffer_size\" in MPD's config file."));
} */ else {
disconnectFromMPD();
emit stateChanged(false);
emit error(i18n("Failed to send command. Disconnected from %1", details.description()), true);
}
}
}