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

Always use external helper for tags

Browse Source
This commit is contained in:
Craig Drummond
2017-04-09 00:31:44 +01:00
committed by Craig Drummond
parent 6d82da1907
commit f4c48915d4
11 changed files with 6 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
http/httpsocket.cpp
View File

@@ -37,9 +37,6 @@
#include <QNetworkProxy>
#include <QUrlQuery>
#include <QFileInfo>
#if defined TAGLIB_FOUND && !defined ENABLE_EXTERNAL_TAGS
#include "tags/tags.h"
#endif
#include <QDebug>
#define DBUG if (HttpServer::debugEnabled()) qWarning() << "HttpSocket" << __FUNCTION__
@@ -49,15 +46,9 @@ static QString detectMimeType(const QString &file)
if (suffix == QLatin1String("mp3")) {
return QLatin1String("audio/mpeg");
}
#if defined TAGLIB_FOUND && !defined ENABLE_EXTERNAL_TAGS
if (suffix == QLatin1String("ogg")) {
return Tags::oggMimeType(file);
}
#else
if (suffix == QLatin1String("ogg")) {
return QLatin1String("audio/ogg");
}
#endif
if (suffix == QLatin1String("flac")) {
return QLatin1String("audio/x-flac");
}