diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2018-04-10 13:48:33 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-04-12 13:06:44 +0000 |
| commit | f684ebaf609bdfad05ae5719e09496542224dc24 (patch) | |
| tree | 9f6b73a6d2c84f3759fdec957b901483ef8faee2 | |
| parent | f4bb4e78b694ba6d8e3fa7131cc4939e1cc4c8f7 (diff) | |
| download | qtivi-f684ebaf609bdfad05ae5719e09496542224dc24.tar.gz | |
Disable the ivimedia-simulator backend when no QtMultimedia is available
Change-Id: If00b2da0313e4a9f0352bcf50fcf1a609a2eea48
Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
| -rw-r--r-- | src/ivimedia/configure.json | 7 | ||||
| -rw-r--r-- | src/plugins/ivimedia/media_simulator_mpris/mediaplayerbackend.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ivimedia/configure.json b/src/ivimedia/configure.json index b189d60..1b2230c 100644 --- a/src/ivimedia/configure.json +++ b/src/ivimedia/configure.json @@ -48,6 +48,7 @@ }, "media_simulation_backend": { "label": "Mediaplayer Simulation Backend", + "condition": "module.multimedia", "output": [ "privateFeature" ] }, "tuner_simulation_backend": { @@ -82,6 +83,12 @@ or disable taglib by passing --taglib=no" "condition": "input.taglib == 'no'", "message": "Building taglib was disabled! The Mediaplayer Simulation Backend will only provide a stub and can't scan media files" + }, + { + "type": "warning", + "condition": "!features.media_simulation_backend && !module.multimedia", + "message": "Building Mediaplayer Simulation Backend was disabled! +Please make sure the QtMultimedia module is available." } ], diff --git a/src/plugins/ivimedia/media_simulator_mpris/mediaplayerbackend.h b/src/plugins/ivimedia/media_simulator_mpris/mediaplayerbackend.h index d6a3d8d..d546efa 100644 --- a/src/plugins/ivimedia/media_simulator_mpris/mediaplayerbackend.h +++ b/src/plugins/ivimedia/media_simulator_mpris/mediaplayerbackend.h @@ -43,7 +43,6 @@ #define MEDIAPLAYERBACKEND_H #include <QtConcurrent/QtConcurrent> -#include <QtMultimedia/QMediaPlayer> #include <QtIviMedia/QIviMediaPlayerBackendInterface> #include "mediaplayer2_interface.h" |