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

Fix playing of more filetypes via http

Browse Source
This commit is contained in:
craig.p.drummond
2013-01-03 20:02:26 +00:00
committed by craig.p.drummond
parent 4f05632df1
commit 964a7e6138
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
http/httpsocket.cpp
View File

@@ -35,6 +35,7 @@
#include <QtCore/QFileInfo>
#ifdef TAGLIB_FOUND
#include <taglib/oggflacfile.h>
#include <taglib/trueaudiofile.h>
#include <taglib/vorbisfile.h>
#include <taglib/audioproperties.h>
#endif
@@ -73,19 +74,36 @@ static QString detectMimeType(const QString &file)
}
delete result;
}
return mime;
if (mime.isEmpty()) {
result = new TagLib::TrueAudio::File(encodedName, false, TagLib::AudioProperties::Fast);
if (result->isValid()) {
mime="audio/x-speex+ogg";
}
delete result;
}
return "audio/ogg";
}
#endif
else if (suffix == QLatin1String("flac")) {
return "audio/x-flac";
} else if (suffix == QLatin1String("wma")) {
return "audio/x-ms-wma";
}
else if (suffix == QLatin1String("m4a") || suffix == QLatin1String("m4b") || suffix == QLatin1String("m4p") || suffix == QLatin1String("mp4")) {
return "audio/mp4";
}
else if (suffix == QLatin1String("wav")) {
} else if (suffix == QLatin1String("m4a") || suffix == QLatin1String("m4b") || suffix == QLatin1String("m4p") || suffix == QLatin1String("mp4")) {
return "audio/mp4";
} else if (suffix == QLatin1String("wav")) {
return "audio/x-wav";
} else if (suffix == QLatin1String("wv") || suffix == QLatin1String("wvp")) {
return "audio/x-wavpack";
} else if (suffix == QLatin1String("ape")) {
return "audio/x-ape";
} else if (suffix == QLatin1String("spx")) {
return "audio/x-speex";
} else if (suffix == QLatin1String("tta")) {
return "audio/x-tta";
} else if (suffix == QLatin1String("aiff") || suffix == QLatin1String("aif") || suffix == QLatin1String("aifc")) {
return "audio/x-aiff";
} else if (suffix == QLatin1String("mpc") || suffix == QLatin1String("mpp") || suffix == QLatin1String("mp+")) {
return "audio/x-musepack";
}
#endif
return QString();