diff options
author | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-09-15 13:52:04 -0700 |
---|---|---|
committer | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-09-15 16:50:08 -0700 |
commit | 2688c7dce8ba69b792ceffe822c30c70ec2d02c5 (patch) | |
tree | 86ddfdbbd408ae2f69f0ce7f8f7b2a51ed8be785 /src/sources/soundsourceproviderregistry.cpp | |
parent | 8eb2539abb1c9da1e4d02bcf188b54ab23e87b71 (diff) |
Migrate SoundSourceMediaFoundation from a plugin to a core SoundSource.
Now that Mixxx's minimum required version is Windows 7, we no longer need to make this an optional plugin for Windows Vista+.
Diffstat (limited to 'src/sources/soundsourceproviderregistry.cpp')
-rw-r--r-- | src/sources/soundsourceproviderregistry.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/sources/soundsourceproviderregistry.cpp b/src/sources/soundsourceproviderregistry.cpp index d66606e376..35ee8cf2d2 100644 --- a/src/sources/soundsourceproviderregistry.cpp +++ b/src/sources/soundsourceproviderregistry.cpp @@ -1,4 +1,4 @@ -#include "soundsourceproviderregistry.h" +#include "sources/soundsourceproviderregistry.h" #include "util/logger.h" @@ -35,6 +35,16 @@ void SoundSourceProviderRegistry::registerPluginLibrary( SoundSourceProviderPointer pProvider( pPluginLibrary->getSoundSourceProvider()); DEBUG_ASSERT(pProvider); + +#ifdef __MEDIAFOUNDATION__ + // SoundSourceMediaFoundation is built-in now. This is the name of the + // plugin in Mixxx 2.2 and below. + if (pProvider->getName() == "Microsoft Media Foundation") { + kLogger.warning() << "Skipping MediaFoundation SoundSource plugin."; + return; // abort registration + } +#endif + const QStringList supportedFileExtensions( pProvider->getSupportedFileExtensions()); if (supportedFileExtensions.isEmpty()) { |