diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
| commit | 9fa9eb9ac7bf1d3de825ee25a8f0ae81b7b77896 (patch) | |
| tree | 9b071a8105704e992946dcd6b801e9fcb7635142 /audio/mumble/files/patch-src__mumble__OSS.cpp | |
| parent | MooseFS is a Fault tolerant, High Available, Highly Performing, Scale-Out, (diff) | |
Cleanup patches, a* categories.
Rename them to follow the make makepatch naming, and regenerate them.
With hat: portmgr
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=419133
Diffstat (limited to 'audio/mumble/files/patch-src__mumble__OSS.cpp')
| -rw-r--r-- | audio/mumble/files/patch-src__mumble__OSS.cpp | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/audio/mumble/files/patch-src__mumble__OSS.cpp b/audio/mumble/files/patch-src__mumble__OSS.cpp index 123d3c38dd82..10ee5d91d003 100644 --- a/audio/mumble/files/patch-src__mumble__OSS.cpp +++ b/audio/mumble/files/patch-src__mumble__OSS.cpp @@ -1,6 +1,33 @@ ---- ./src/mumble/OSS.cpp.orig 2013-06-01 21:16:31.000000000 +0000 -+++ ./src/mumble/OSS.cpp 2013-10-12 02:38:45.443221514 +0000 -@@ -221,20 +221,23 @@ +--- src/mumble/OSS.cpp.orig 2014-08-08 15:51:59 UTC ++++ src/mumble/OSS.cpp +@@ -153,7 +153,6 @@ OSSEnumerator::OSSEnumerator() { + qhOutput.insert(QString(), QLatin1String("Default OSS Device")); + qhDevices.insert(QString(), QLatin1String("/dev/dsp")); + +-#if (SOUND_VERSION >= 0x040002) + int mixerfd = open("/dev/mixer", O_RDWR, 0); + if (mixerfd == -1) { + qWarning("OSSEnumerator: Failed to open /dev/mixer"); +@@ -182,15 +181,14 @@ OSSEnumerator::OSSEnumerator() { + if (ainfo.caps & PCM_CAP_HIDDEN) + continue; + +- qhDevices.insert(handle, device); ++ qhDevices.insert(name, device); + + if (ainfo.caps & PCM_CAP_INPUT) +- qhInput.insert(handle, name); ++ qhInput.insert(name, name); + if (ainfo.caps & PCM_CAP_OUTPUT) +- qhOutput.insert(handle, name); ++ qhOutput.insert(name, name); + } + close(mixerfd); +-#endif + } + + OSSInput::OSSInput() { +@@ -221,20 +219,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"); @@ -27,7 +54,7 @@ } iMicFreq = ival; -@@ -258,8 +261,6 @@ +@@ -258,8 +259,6 @@ void OSSInput::run() { qWarning("OSSInput: Releasing."); ioctl(fd, SNDCTL_DSP_RESET, NULL); |