diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-04-16 17:17:12 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-04-16 17:17:12 +0000 |
| commit | c031e35484ead1765b3711975a1efed690bd174a (patch) | |
| tree | 1c25ff1811c895d5ea8b36d2cd276421e7a9a807 /multimedia/qt5-multimedia | |
| parent | 40d5590e76113686a9478266cc7bb2e9134a61be (diff) | |
| download | ports-c031e35484ead1765b3711975a1efed690bd174a.tar.gz ports-c031e35484ead1765b3711975a1efed690bd174a.zip | |
Notes
Diffstat (limited to 'multimedia/qt5-multimedia')
| -rw-r--r-- | multimedia/qt5-multimedia/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/qt5-multimedia/files/patch-git_9047d9b | 36 |
2 files changed, 37 insertions, 0 deletions
diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile index 6d4a85ec23f3..26e10def6e03 100644 --- a/multimedia/qt5-multimedia/Makefile +++ b/multimedia/qt5-multimedia/Makefile @@ -2,6 +2,7 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- diff --git a/multimedia/qt5-multimedia/files/patch-git_9047d9b b/multimedia/qt5-multimedia/files/patch-git_9047d9b new file mode 100644 index 000000000000..f8c406cfb6d4 --- /dev/null +++ b/multimedia/qt5-multimedia/files/patch-git_9047d9b @@ -0,0 +1,36 @@ +commit 9047d9b84e9d94d193e77abd81f5980eff77d73a +Author: Stephen Hurd <shurd@freebsd.org> +Date: Thu Apr 14 19:11:01 2016 -0700 + + ALSA: Call snd_pcm_drain() on suspend + + The ALSA plugin previously didn't suspend the ALSA device when the + ::suspend() method is called. This results in underrun errors when + it's resumed. + + In ALSA, stopping a pcm doesn't close it, so the ALSA stop/start + functions map to the QAudioInput suspend/resume functions. + + Change-Id: I2507065a1b7472af29eef70c531b9f6e8e5b3072 + Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com> + +--- src/plugins/alsa/qalsaaudioinput.cpp ++++ src/plugins/alsa/qalsaaudioinput.cpp +@@ -701,6 +701,7 @@ qint64 QAlsaAudioInput::processedUSecs() const + void QAlsaAudioInput::suspend() + { + if(deviceState == QAudio::ActiveState||resuming) { ++ snd_pcm_drain(handle); + timer->stop(); + deviceState = QAudio::SuspendedState; + emit stateChanged(deviceState); +--- src/plugins/alsa/qalsaaudiooutput.cpp ++++ src/plugins/alsa/qalsaaudiooutput.cpp +@@ -673,6 +673,7 @@ QAudioFormat QAlsaAudioOutput::format() const + void QAlsaAudioOutput::suspend() + { + if(deviceState == QAudio::ActiveState || deviceState == QAudio::IdleState || resuming) { ++ snd_pcm_drain(handle); + timer->stop(); + deviceState = QAudio::SuspendedState; + errorState = QAudio::NoError; |