summaryrefslogtreecommitdiff
path: root/audio/mumble/files/patch-src__mumble__OSS.cpp
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-10-21 21:18:39 +0000
committerMark Felder <feld@FreeBSD.org>2019-10-21 21:18:39 +0000
commit3516496ddc9912d243d073ff413990510ae40cf8 (patch)
tree13d0556e842d1d2e7d621ece39ecd0de8e33920c /audio/mumble/files/patch-src__mumble__OSS.cpp
parentmail/thunderbird: update to 68.2.0 (diff)
audio/mumble: Update to 1.3.0
PR: 240402 MFH: 2019Q4
Notes
Notes: svn path=/head/; revision=515129
Diffstat (limited to 'audio/mumble/files/patch-src__mumble__OSS.cpp')
-rw-r--r--audio/mumble/files/patch-src__mumble__OSS.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/audio/mumble/files/patch-src__mumble__OSS.cpp b/audio/mumble/files/patch-src__mumble__OSS.cpp
index 10ee5d91d003..ac8e05ab5bff 100644
--- a/audio/mumble/files/patch-src__mumble__OSS.cpp
+++ b/audio/mumble/files/patch-src__mumble__OSS.cpp
@@ -1,6 +1,6 @@
---- src/mumble/OSS.cpp.orig 2014-08-08 15:51:59 UTC
+--- src/mumble/OSS.cpp.orig 2019-08-30 01:01:56 UTC
+++ src/mumble/OSS.cpp
-@@ -153,7 +153,6 @@ OSSEnumerator::OSSEnumerator() {
+@@ -130,7 +130,6 @@ OSSEnumerator::OSSEnumerator() {
qhOutput.insert(QString(), QLatin1String("Default OSS Device"));
qhDevices.insert(QString(), QLatin1String("/dev/dsp"));
@@ -8,7 +8,7 @@
int mixerfd = open("/dev/mixer", O_RDWR, 0);
if (mixerfd == -1) {
qWarning("OSSEnumerator: Failed to open /dev/mixer");
-@@ -182,15 +181,14 @@ OSSEnumerator::OSSEnumerator() {
+@@ -159,15 +158,14 @@ OSSEnumerator::OSSEnumerator() {
if (ainfo.caps & PCM_CAP_HIDDEN)
continue;
@@ -27,7 +27,7 @@
}
OSSInput::OSSInput() {
-@@ -221,20 +219,23 @@ void OSSInput::run() {
+@@ -198,20 +196,23 @@ void OSSInput::run() {
ival = AFMT_S16_NE;
if ((ioctl(fd, SNDCTL_DSP_SETFMT, &ival) == -1) || (ival != AFMT_S16_NE)) {
qWarning("OSSInput: Failed to set sound format");
@@ -54,7 +54,7 @@
}
iMicFreq = ival;
-@@ -258,8 +259,6 @@ void OSSInput::run() {
+@@ -235,8 +236,6 @@ void OSSInput::run() {
qWarning("OSSInput: Releasing.");
ioctl(fd, SNDCTL_DSP_RESET, NULL);