Date: Fri, 1 Mar 2019 09:40:24 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494248 - in head/audio/portaudio: . files Message-ID: <201903010940.x219eO30091455@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Mar 1 09:40:24 2019 New Revision: 494248 URL: https://svnweb.freebsd.org/changeset/ports/494248 Log: audio/portaudio: Amend r419598 and always add OSS default device first r419598 tried to solve a problem where when hw.snd.default_unit is set to anything except zero /dev/dsp0 is not available to programs using portaudio since it assumes that /dev/dsp and /dev/dsp0 are the same device. However with that fix, when hw.snd.default_unit=1 and hw.snd.basename_clone=0, portaudio will hide /dev/dsp1 from the device list since it will use /dev/dsp for it instead of /dev/dsp1. However since /dev/dsp is not available, QueryDevice() will fail and /dev/dsp1 will never be added to the device list. Instead of looking up hw.snd.default_unit we can solve this by always trying to add /dev/dsp to the device list first. PR: 236118 Submitted by: Tatsuki Makino <tatsuki_makino@hotmail.com> Modified: head/audio/portaudio/Makefile head/audio/portaudio/files/patch-src_hostapi_oss_pa__unix__oss.c Modified: head/audio/portaudio/Makefile ============================================================================== --- head/audio/portaudio/Makefile Fri Mar 1 09:36:43 2019 (r494247) +++ head/audio/portaudio/Makefile Fri Mar 1 09:40:24 2019 (r494248) @@ -3,7 +3,7 @@ PORTNAME= portaudio PORTVERSION= 19.6.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= http://www.portaudio.com/archives/ Modified: head/audio/portaudio/files/patch-src_hostapi_oss_pa__unix__oss.c ============================================================================== --- head/audio/portaudio/files/patch-src_hostapi_oss_pa__unix__oss.c Fri Mar 1 09:36:43 2019 (r494247) +++ head/audio/portaudio/files/patch-src_hostapi_oss_pa__unix__oss.c Fri Mar 1 09:40:24 2019 (r494248) @@ -1,40 +1,22 @@ ---- src/hostapi/oss/pa_unix_oss.c.orig 2018-07-17 07:24:21 UTC +--- src/hostapi/oss/pa_unix_oss.c.orig 2019-03-01 03:09:23 UTC +++ src/hostapi/oss/pa_unix_oss.c -@@ -62,6 +62,9 @@ - #include <sys/poll.h> - #include <limits.h> - #include <semaphore.h> -+#ifdef __FreeBSD__ -+#include <sys/sysctl.h> -+#endif +@@ -535,13 +535,13 @@ static PaError BuildDeviceList( PaOSSHostApiRepresenta + * add it to a linked list. + * A: Set an arbitrary of 100 devices, should probably be a smarter way. */ - #ifdef HAVE_SYS_SOUNDCARD_H - # include <sys/soundcard.h> -@@ -525,7 +528,14 @@ static PaError BuildDeviceList( PaOSSHostApiRepresenta - int i; - int numDevices = 0, maxDeviceInfos = 1; - PaDeviceInfo **deviceInfos = NULL; -+ int defaultDevice = 0; - -+#ifdef __FreeBSD__ -+ size_t len = sizeof(defaultDevice); -+ if (sysctlbyname("hw.snd.default_unit", &defaultDevice, &len, NULL, 0) == -1 || len != 4) -+ defaultDevice = 0; -+#endif -+ - /* These two will be set to the first working input and output device, respectively */ - commonApi->info.defaultInputDevice = paNoDevice; - commonApi->info.defaultOutputDevice = paNoDevice; -@@ -541,7 +551,7 @@ static PaError BuildDeviceList( PaOSSHostApiRepresenta +- for( i = 0; i < 100; i++ ) ++ for( i = -1; i < 100; i++ ) + { + char deviceName[32]; PaDeviceInfo *deviceInfo; int testResult; - if( i == 0 ) -+ if( i == defaultDevice ) ++ if( i == -1 ) snprintf(deviceName, sizeof (deviceName), "%s", DEVICE_NAME_BASE); else snprintf(deviceName, sizeof (deviceName), "%s%d", DEVICE_NAME_BASE, i); -@@ -2041,5 +2051,29 @@ static signed long GetStreamWriteAvailable( PaStream* +@@ -2041,5 +2041,29 @@ static signed long GetStreamWriteAvailable( PaStream* error: return result; #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903010940.x219eO30091455>