slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable both PulseAudio and Alsa plugins on Linux.

Browse Source 
It was previously only one or the other, and all Qt packages for linux
were only including the PulseAudio backend.
Now, both will be included; if PulseAudio is available it will be used
by default, otherwise it will fall back to Alsa.

Change-Id: I393c7728ec9741b1b58681608c184cd1b92126b1
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
This commit is contained in:
Yoann Lopes
2014-06-13 16:55:06 +02:00
parent d691f5ca2b
commit eb75bf8e3b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/plugins.pro
View File

@@ -36,11 +36,8 @@ unix:!mac:!android {
SUBDIRS += audiocapture SUBDIRS += audiocapture
} }
config_pulseaudio { config_pulseaudio: SUBDIRS += pulseaudio
SUBDIRS += pulseaudio config_alsa: SUBDIRS += alsa
} else:config_alsa {
SUBDIRS += alsa
}
# v4l is turned off because it is not supported in Qt 5 # v4l is turned off because it is not supported in Qt 5
# !maemo*:SUBDIRS += v4l # !maemo*:SUBDIRS += v4l