mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* OSS build fix on linux

Browse Source
This commit is contained in:
ivan-83 2015-03-11 02:17:45 +03:00
parent f5dbe2c9a5
commit 0f3b639058
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
channels/rdpsnd/client/oss/rdpsnd_oss.c
View File

@ -37,6 +37,7 @@
#include <limits.h> #include <limits.h>
#include <unistd.h> #include <unistd.h>
#include <sys/soundcard.h> #include <sys/soundcard.h>
#include <sys/ioctl.h>
#include <freerdp/types.h> #include <freerdp/types.h>
#include <freerdp/codec/dsp.h> #include <freerdp/codec/dsp.h>
@ -119,8 +120,6 @@ static BOOL rdpsnd_oss_format_supported(rdpsndDevicePlugin *device, AUDIO_FORMAT
if (oss->pcm_handle != -1) { /* Check really supported formats by dev. */ if (oss->pcm_handle != -1) { /* Check really supported formats by dev. */
if ((req_fmt & oss->supported_formats) == 0) if ((req_fmt & oss->supported_formats) == 0)
return FALSE; return FALSE;
if ((AFMT_STEREO & oss->supported_formats) == 0 && format->nChannels == 2)
return FALSE;
} else { } else {
if (req_fmt == 0) if (req_fmt == 0)
return FALSE; return FALSE;
@ -176,7 +175,6 @@ static void rdpsnd_oss_open_mixer(rdpsndOssPlugin *oss) {
} }
static void rdpsnd_oss_open(rdpsndDevicePlugin *device, AUDIO_FORMAT *format, int latency) { static void rdpsnd_oss_open(rdpsndDevicePlugin *device, AUDIO_FORMAT *format, int latency) {
int mask = 0;
char dev_name[PATH_MAX] = "/dev/dsp"; char dev_name[PATH_MAX] = "/dev/dsp";
rdpsndOssPlugin *oss = (rdpsndOssPlugin*)device; rdpsndOssPlugin *oss = (rdpsndOssPlugin*)device;
@ -191,6 +189,8 @@ static void rdpsnd_oss_open(rdpsndDevicePlugin *device, AUDIO_FORMAT *format, in
return; return;
} }
#if 0 /* FreeBSD OSS implementation at this moment (2015.03) does not set PCM_CAP_OUTPUT flag. */ #if 0 /* FreeBSD OSS implementation at this moment (2015.03) does not set PCM_CAP_OUTPUT flag. */
int mask = 0;
if (ioctl(oss->pcm_handle, SNDCTL_DSP_GETCAPS, &mask) == -1) { if (ioctl(oss->pcm_handle, SNDCTL_DSP_GETCAPS, &mask) == -1) {
OSS_LOG_ERR("SNDCTL_DSP_GETCAPS failed, try ignory.", errno); OSS_LOG_ERR("SNDCTL_DSP_GETCAPS failed, try ignory.", errno);
} else if ((mask & PCM_CAP_OUTPUT) == 0) { } else if ((mask & PCM_CAP_OUTPUT) == 0) {