Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/clementine-player/Clementine

Browse Source 
Updated from upstream
This commit is contained in:
GitAnt 2013-12-17 16:04:35 +01:00
commit a6dc82af18
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/internet/cloudfileservice.cpp
View File

@ -188,7 +188,7 @@ QString CloudFileService::GuessMimeTypeForFile(const QString& filename) const {
return "audio/mpeg"; return "audio/mpeg";
} else if (filename.endsWith(".m4a")) { } else if (filename.endsWith(".m4a")) {
return "audio/mpeg"; return "audio/mpeg";
} else if (filename.endsWith(".ogg")) { } else if (filename.endsWith(".ogg") || filename.endsWith(".opus")) {
return "application/ogg"; return "application/ogg";
} else if (filename.endsWith(".flac")) { } else if (filename.endsWith(".flac")) {
return "application/x-flac"; return "application/x-flac";

6
src/internet/dropboxservice.cpp
View File

@ -136,6 +136,12 @@ void DropboxService::RequestFileListFinished(QNetworkReply* reply) {
continue; continue;
} }
// Workaround: Since Dropbox doesn't recognize Opus files and thus treats them
// as application/octet-stream, we overwrite the mime type here
if (metadata["mime_type"].toString() == "application/octet-stream" &&
url.toString().endsWith(".opus"))
metadata["mime_type"] = GuessMimeTypeForFile(url.toString());
if (ShouldIndexFile(url, metadata["mime_type"].toString())) { if (ShouldIndexFile(url, metadata["mime_type"].toString())) {
QNetworkReply* reply = FetchContentUrl(url); QNetworkReply* reply = FetchContentUrl(url);
NewClosure(reply, SIGNAL(finished()), NewClosure(reply, SIGNAL(finished()),