diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-10-09 22:11:11 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2016-10-09 22:11:11 +0200 |
| commit | 392e79606ccba0695027b63ed872c4b0a491cd8b (patch) | |
| tree | eb7466234f0b0ee059ff39270739c928a2bceae2 /src/prefgeneral.cpp | |
| parent | 029acf6821f034583700c26b013ffc67ad7690f7 (diff) | |
New upstream version 16.9.0~ds0
Diffstat (limited to 'src/prefgeneral.cpp')
| -rw-r--r-- | src/prefgeneral.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/prefgeneral.cpp b/src/prefgeneral.cpp index 83516fa..bb4839f 100644 --- a/src/prefgeneral.cpp +++ b/src/prefgeneral.cpp @@ -26,7 +26,7 @@ #include "vdpauproperties.h" #include "playerid.h" -#if USE_ALSA_DEVICES || USE_DSOUND_DEVICES +#if USE_ALSA_DEVICES || USE_PULSEAUDIO_DEVICES || USE_XV_ADAPTORS || USE_DSOUND_DEVICES #include "deviceinfo.h" #endif @@ -65,6 +65,9 @@ PrefGeneral::PrefGeneral(QWidget * parent, Qt::WindowFlags f) #if USE_ALSA_DEVICES alsa_devices = DeviceInfo::alsaDevices(); #endif +#if USE_PULSEAUDIO_DEVICES + pa_devices = DeviceInfo::paDevices(); +#endif #if USE_XV_ADAPTORS xv_adaptors = DeviceInfo::xvAdaptors(); #endif @@ -459,6 +462,14 @@ void PrefGeneral::updateDriverCombos() { } } #endif + #if USE_PULSEAUDIO_DEVICES + if ((ao == "pulse") && (!pa_devices.isEmpty())) { + for (int n=0; n < pa_devices.count(); n++) { + ao_combo->addItem( "pulse (" + pa_devices[n].ID().toString() + " - " + pa_devices[n].desc() + ")", + "pulse::" + pa_devices[n].ID().toString() ); + } + } + #endif #if USE_DSOUND_DEVICES if ((ao == "dsound") && (!dsound_devices.isEmpty())) { for (int n=0; n < dsound_devices.count(); n++) { @@ -518,7 +529,7 @@ void PrefGeneral::setScreenshotDir( QString path ) { } QString PrefGeneral::screenshotDir() { - return screenshot_edit->text(); + return screenshot_edit->text().trimmed(); } #ifdef MPV_SUPPORT |