diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 12:40:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 12:40:46 +0100 |
| commit | 7ab948c7259d9a856a0b0c52897cb430731494c3 (patch) | |
| tree | d22604c0877097e66c1efd9a0fdc328094d9844c /src/multimedia | |
| parent | c1164f874a21959d03893f62db8f8e2def44122d (diff) | |
| parent | 544a8a4251ff9694780e563ddb6e4af1325e0115 (diff) | |
| download | qtmultimedia-7ab948c7259d9a856a0b0c52897cb430731494c3.tar.gz | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
src/multimedia/configure.json
Change-Id: Ide124447e1667f0b6557b6ab1ba7188ae76772c5
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/configure.json | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/src/multimedia/configure.json b/src/multimedia/configure.json index 8fb2eb868..d26f6f45e 100644 --- a/src/multimedia/configure.json +++ b/src/multimedia/configure.json @@ -10,7 +10,8 @@ "alsa": "boolean", "gstreamer": { "type": "optionalString", "values": [ "no", "yes", "0.10", "1.0" ] }, "pulseaudio": "boolean", - "wmf-backend": "boolean" + "mediaplayer-backend": { "type": "string", "values": [ "directshow", "wmf" ] }, + "wmf-backend": { "type": "void", "name": "mediaplayer-backend", "value": "wmf" } } }, @@ -192,6 +193,13 @@ "condition": "config.win32 && libs.directshow", "output": [ "feature", "privateFeature" ] }, + "directshow-player": { + "label": "DirectShow", + "enable": "input.mediaplayer-backend == 'directshow'", + "disable": "input.mediaplayer-backend == 'wmf'", + "condition": "features.directshow && !features.wmf-player", + "output": [ "privateFeature" ] + }, "evr": { "label": "evr.h", "condition": "config.win32 && tests.evr", @@ -281,11 +289,16 @@ "condition": "config.win32 && features.directshow && tests.wshellitem", "output": [ "feature", "privateFeature" ] }, - "wmf-backend": { + "wmf": { + "label": "Windows Media Foundation", + "condition": "config.win32 && libs.wmf", + "output": [ "privateFeature" ] + }, + "wmf-player": { "label": "Windows Media Foundation", - "emitIf": "config.win32", - "autoDetect": false, - "condition": "libraries.wmf", + "enable": "input.mediaplayer-backend == 'wmf'", + "disable": "input.mediaplayer-backend != 'wmf'", + "condition": "features.wmf", "output": [ "privateFeature" ] } }, @@ -307,7 +320,14 @@ "mmrenderer", "avfoundation", "directshow", - "wmf-backend" + "wmf", + { + "message": "Media player backend", + "type": "firstAvailableFeature", + "args": "directshow-player wmf-player", + "condition": "config.win32" + } + ] } ] |