Always build support for Dynamic, Online, and Streams

This commit is contained in:
Craig Drummond
2015-06-26 21:18:25 +01:00
committed by Craig Drummond
parent ac4cd39139
commit 67507362d5
26 changed files with 55 additions and 256 deletions

View File

@@ -185,11 +185,9 @@ QByteArray HttpServer::encodeUrl(const Song &s)
if (s.track) {
query.addQueryItem("track", QString::number(s.track));
}
#ifdef ENABLE_ONLINE_SERVICES
if (s.isFromOnlineService()) {
query.addQueryItem("onlineservice", s.onlineService());
}
#endif
query.addQueryItem("id", QString::number(s.id));
query.addQueryItem("cantata", "song");
#if QT_VERSION >= 0x050000
@@ -281,11 +279,9 @@ Song HttpServer::decodeUrl(const QUrl &url) const
if (q.hasQueryItem("id")) {
s.id=q.queryItemValue("id").toInt();
}
#ifdef ENABLE_ONLINE_SERVICES
if (q.hasQueryItem("onlineservice")) {
s.setIsFromOnlineService(q.queryItemValue("onlineservice"));
}
#endif
s.file=url.path();
s.type=Song::CantataStream;
#ifdef Q_OS_WIN