Skip to content

Commit 880122e

Browse files
committed
Make Mixxx aware of mime types
1 parent 2025b84 commit 880122e

28 files changed

Lines changed: 124 additions & 4 deletions

plugins/soundsourcem4a/soundsourcem4a.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,12 @@ QStringList SoundSourceProviderM4A::getSupportedFileExtensions() const {
442442
return supportedFileExtensions;
443443
}
444444

445+
QStringList SoundSourceProviderM4A::getSupportedMimeTypes() const {
446+
QStringList list;
447+
list.push_back("audio/mp4");
448+
return list;
449+
}
450+
445451
SoundSourcePointer SoundSourceProviderM4A::newSoundSource(const QUrl& url) {
446452
return exportSoundSourcePlugin(new SoundSourceM4A(url));
447453
}

plugins/soundsourcem4a/soundsourcem4a.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class SoundSourceProviderM4A: public SoundSourceProvider {
6060
QString getName() const override;
6161

6262
QStringList getSupportedFileExtensions() const override;
63+
QStringList getSupportedMimeTypes() const override;
6364

6465
SoundSourcePointer newSoundSource(const QUrl& url) override;
6566
};

plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,12 @@ QStringList SoundSourceProviderMediaFoundation::getSupportedFileExtensions() con
596596
return supportedFileExtensions;
597597
}
598598

599+
QStringList SoundSourceProviderMediaFoundation::getSupportedMimeType() const {
600+
QStringList list;
601+
list.push_back("audio/mp4");
602+
return list;
603+
}
604+
599605
Mixxx::SoundSourcePointer SoundSourceProviderMediaFoundation::newSoundSource(const QUrl& url) {
600606
return exportSoundSourcePlugin(new SoundSourceMediaFoundation(url));
601607
}

plugins/soundsourcemediafoundation/soundsourcemediafoundation.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ class SoundSourceProviderMediaFoundation: public Mixxx::SoundSourceProvider {
6868
QString getName() const override;
6969

7070
QStringList getSupportedFileExtensions() const override;
71+
QStringList getSupportedMimeTypes() const override;
7172

7273
Mixxx::SoundSourcePointer newSoundSource(const QUrl& url) override;
7374
};

plugins/soundsourcewv/soundsourcewv.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ QStringList SoundSourceProviderWV::getSupportedFileExtensions() const {
8787
return supportedFileExtensions;
8888
}
8989

90+
QStringList SoundSourceProviderWV::getSupportedMimeType() const {
91+
QStringList list;
92+
list.push_back("audio/x-wavpack");
93+
return list;
94+
}
95+
9096
SoundSourcePointer SoundSourceProviderWV::newSoundSource(const QUrl& url) {
9197
return exportSoundSourcePlugin(new SoundSourceWV(url));
9298
}

plugins/soundsourcewv/soundsourcewv.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ class SoundSourceProviderWV: public SoundSourceProvider {
3232
QString getName() const override;
3333

3434
QStringList getSupportedFileExtensions() const override;
35+
QStringList getSupportedMineType() const override;
3536

3637
SoundSourcePointer newSoundSource(const QUrl& url) override;
3738
};
3839

3940
} // namespace Mixxx
4041

41-
extern "C" MIXXX_SOUNDSOURCEPLUGINAPI_EXPORT
42-
Mixxx::SoundSourceProviderPointer Mixxx_SoundSourcePluginAPI_getSoundSourceProvider();
4342

4443
#endif // MIXXX_SOUNDSOURCEWV_H

src/mpris/mediaplayer2.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include "mediaplayer2.h"
66
#include "mixxx.h"
7+
#include "soundsourceproxy.h"
78

89
MediaPlayer2::MediaPlayer2(MixxxMainWindow* pMixxx, QObject* parent)
910
: QDBusAbstractAdaptor(parent),
@@ -47,12 +48,12 @@ QString MediaPlayer2::desktopEntry() const {
4748

4849
QStringList MediaPlayer2::supportedUriSchemes() const {
4950
QStringList protocols;
51+
protocols.append("file");
5052
return protocols;
5153
}
5254

5355
QStringList MediaPlayer2::supportedMimeTypes() const {
54-
QStringList mimeTypes;
55-
return mimeTypes;
56+
return SoundSourceProxy::getSupportedMimeTypes();
5657
}
5758

5859
void MediaPlayer2::Raise() {

src/soundsourceproxy.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,11 @@ QStringList SoundSourceProxy::getSupportedFileExtensions() {
273273
return s_soundSourceProviders.getSupportedFileExtensions();
274274
}
275275

276+
// static
277+
QStringList SoundSourceProxy::getSupportedMimeTypes() {
278+
return s_soundSourceProviders.getSupportedMimeTypes();
279+
}
280+
276281
// static
277282
QStringList SoundSourceProxy::getSupportedFileExtensionsByPlugins() {
278283
const QStringList supportedFileExtensions(getSupportedFileExtensions());

src/soundsourceproxy.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class SoundSourceProxy: public Mixxx::MetadataSource {
1313
static void loadPlugins(); // not thread-safe
1414

1515
static QStringList getSupportedFileExtensions();
16+
static QStringList getSupportedMimeTypes();
1617
static QStringList getSupportedFileExtensionsByPlugins();
1718
static QStringList getSupportedFileNamePatterns();
1819
static QRegExp getSupportedFileNameRegex();

src/sources/soundsourcecoreaudio.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,11 @@ QStringList SoundSourceProviderCoreAudio::getSupportedFileExtensions() const {
210210
return supportedFileExtensions;
211211
}
212212

213+
QStringList SoundSourceProviderCoreAudio::getSupportedMimeType() const {
214+
QStringList list;
215+
list.push_back("audio/mp4");
216+
list.push_back("audio/mpeg");
217+
return list;
218+
}
219+
213220
} // namespace Mixxx

0 commit comments

Comments
 (0)