 @@ -1,24 +1,24 @@
-$NetBSD: distinfo,v 1.24 2021/09/09 21:10:18 nia Exp $
+$NetBSD: distinfo,v 1.25 2021/09/09 22:41:43 nia Exp $
 SHA1 (jack2-1.9.19.tar.gz) = 3182304c0a3ecd911775fb46088f0df79ee9015f
 RMD160 (jack2-1.9.19.tar.gz) = da6ed4db02dfc856c477d76a73fe22157b6f7df8
 SHA512 (jack2-1.9.19.tar.gz) = d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d
 Size (jack2-1.9.19.tar.gz) = 988780 bytes
 SHA1 (patch-common_JackAudioAdapterFactory.cpp) = 8292a8c88c673136f52a007133278f9b4403839c
 SHA1 (patch-common_memops.c) = 468476c6067595524f492d37f3b761af48e78585
 SHA1 (patch-common_wscript) = f68886b688d623a87178eed22e3900109409be69
 SHA1 (patch-example-clients_wscript) = 9db0899e797acbc416bfd9e6aba50c70bd5ff0ab
 SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d
 SHA1 (patch-netbsd_JackNetBSDTime.c) = 7cc2504bbd452b703dd062ac5d35f68ffe7e3b0a
 SHA1 (patch-netbsd_JackPlatformPlug__os.h) = f17b0daf4d8a4ef1001b35e6ea1411cfb1b981c2
-SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = e6c02653840ad02fdee9168796d129504ca29f92
+SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = 03c8fc59afb5a1ecf090eb9e47b3b2d43720da91
 SHA1 (patch-netbsd_sun_JackSunAdapter.h) = 740b36c69d02742eceeb724ba18796664fb1bc2d
-SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = 43a7126b68076f45292df67f59239c9febf014ff
+SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = 78d5bc56a0cbea4bb7f15f0d3c775c69a3ac2a3a
 SHA1 (patch-netbsd_sun_JackSunDriver.h) = 9da5fbec2216081876174057f831da4c54e3029e
 SHA1 (patch-posix_JackNetUnixSocket.cpp) = 562242daf7c0f296bfcd03f468518aaf18d995d9
 SHA1 (patch-posix_JackNetUnixSocket.h) = ce9a9255dc0dd423562b94b0fcc1012c8ba3a37e
 SHA1 (patch-posix_JackPosixSemaphore.cpp) = 59425ada11a5cab83159691ae10a23c0d36750ef
 SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314
 SHA1 (patch-tests_wscript) = e0bf616175a116df489808cda8cb8c70890d4da0
 SHA1 (patch-tools_wscript) = c990639f5c1a998dd02d12eb345e78b0a91a1c6f
 SHA1 (patch-wscript) = 6514e2e7d10f096deb99effa35974e9253599f74

 @@ -1,20 +1,20 @@
-$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.2 2021/09/09 22:41:43 nia Exp $
 Add NetBSD support.
---- netbsd/sun/JackSunAdapter.cpp.orig	2021-09-08 13:51:19.685213690 +0000
+--- netbsd/sun/JackSunAdapter.cpp.orig	2021-09-09 21:08:54.598607823 +0000
 +++ netbsd/sun/JackSunAdapter.cpp
-@@ -0,0 +1,478 @@
+@@ -0,0 +1,490 @@
 +/*
 +Copyright (C) 2008 Grame & RTL 2008
++
 +This program is free software; you can redistribute it and/or modify
 +it under the terms of the GNU General Public License as published by
 +the Free Software Foundation; either version 2 of the License, or
 +(at your option) any later version.
++
 +This program is distributed in the hope that it will be useful,
 +but WITHOUT ANY WARRANTY; without even the implied warranty of
 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +GNU General Public License for more details.
++
 @@ -176,31 +176,37 @@ Add NetBSD support.
 +void JackSunAdapter::DisplayDeviceInfo()
 +{
 +}
++
 +int JackSunAdapter::OpenInput()
 +{
 +    struct audio_info info;
++
 +    if ((fInFD = open(fCaptureDriverName, O_RDONLY)) < 0) {
 +        jack_error("JackSunAdapter::OpenInput failed to open device : %s@%i, errno = %d", __FILE__, __LINE__, errno);
 +        return -1;
 +    }
++
 +#ifdef AUDIO_GETFORMAT
 +    if (fCaptureChannels == 0) {
 +        if (ioctl(fInFD, AUDIO_GETFORMAT, &info) != -1) {
 +            fCaptureChannels = info.record.channels;
 +        }
 +    }
 +#else
 +    if (fCaptureChannels == 0) {
 +        fCaptureChannels = 2;
 +    }
 +#endif
++
 +    jack_log("JackSunAdapter::OpenInput input fInFD = %d", fInFD);
++
 +    AUDIO_INITINFO(&info);
 +    info.record.encoding = AUDIO_ENCODING_SLINEAR;
 +    info.record.precision = fPrecision;
 +    info.record.channels = fCaptureChannels;
 +    info.record.sample_rate = fAdaptedSampleRate;
++
 +    if (ioctl(fInFD, AUDIO_SETINFO, &info) == -1) {
 +        jack_error("JackSunAdapter::OpenInput failed to set device parameters : %s@%i, errno = %d", __FILE__, __LINE__, errno);
 +        goto error;
 +    }
 @@ -236,31 +242,37 @@ Add NetBSD support.
 +    ::close(fInFD);
 +    return -1;
 +}
++
 +int JackSunAdapter::OpenOutput()
 +{
 +    struct audio_info info;
++
 +    if ((fOutFD = open(fPlaybackDriverName, O_WRONLY)) < 0) {
 +        jack_error("JackSunAdapter::OpenOutput failed to open device : %s@%i, errno = %d", __FILE__, __LINE__, errno);
 +        return -1;
 +    }
++
 +#ifdef AUDIO_GETFORMAT
 +    if (fPlaybackChannels == 0) {
 +        if (ioctl(fOutFD, AUDIO_GETFORMAT, &info) == 0) {
 +            fPlaybackChannels = info.play.channels;
 +        }
 +    }
 +#else
 +    if (fPlaybackChannels == 0) {
 +        fPlaybackChannels = 2;
 +    }
 +#endif
++
 +    jack_log("JackSunAdapter::OpenOutput input fOutFD = %d", fOutFD);
++
 +    AUDIO_INITINFO(&info);
 +    info.hiwat = 2;
 +    info.play.encoding = AUDIO_ENCODING_SLINEAR;
 +    info.play.precision = fPrecision;
 +    info.play.channels = fPlaybackChannels;
 +    info.play.sample_rate = fAdaptedSampleRate;
++
 +    if (ioctl(fOutFD, AUDIO_SETINFO, &info) == -1) {
 +        jack_error("JackSunAdapter::OpenOutput failed to set device parameters : %s@%i, errno = %d", __FILE__, __LINE__, errno);
 +        goto error;

 @@ -1,20 +1,20 @@
-$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.1 2021/09/08 19:19:20 nia Exp $
+$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.2 2021/09/09 22:41:43 nia Exp $
 Add NetBSD support.
---- netbsd/sun/JackSunDriver.cpp.orig	2021-09-08 13:51:19.686819398 +0000
+--- netbsd/sun/JackSunDriver.cpp.orig	2021-09-09 21:08:54.658178887 +0000
 +++ netbsd/sun/JackSunDriver.cpp
-@@ -0,0 +1,557 @@
+@@ -0,0 +1,569 @@
 +/*
 +Copyright (C) 2003-2007 Jussi Laako <jussi@sonarnerd.net>
 +Copyright (C) 2008 Grame & RTL 2008
++
 +This program is free software; you can redistribute it and/or modify
 +it under the terms of the GNU General Public License as published by
 +the Free Software Foundation; either version 2 of the License, or
 +(at your option) any later version.
++
 +This program is distributed in the hope that it will be useful,
 +but WITHOUT ANY WARRANTY; without even the implied warranty of
 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +GNU General Public License for more details.
 @@ -104,31 +104,37 @@ Add NetBSD support.
 +	}
 +}
++
 +int JackSunDriver::OpenInput()
 +{
 +    struct audio_info info;
 +    int new_buffer_size;
++
 +    if ((fInFD = open(fCaptureDriverName, O_RDONLY)) < 0) {
 +        jack_error("JackSunDriver::OpenInput failed to open device : %s@%i, errno = %d", __FILE__, __LINE__, errno);
 +        return -1;
 +    }
++
 +#ifdef AUDIO_GETFORMAT
 +    if (fCaptureChannels == 0) {
 +        if (ioctl(fInFD, AUDIO_GETFORMAT, &info) == 0) {
 +            fCaptureChannels = info.record.channels;
 +        }
 +    }
 +#else
 +    if (fCaptureChannels == 0) {
 +        fCaptureChannels = 2;
 +    }
 +#endif
++
 +    jack_log("JackSunDriver::OpenInput input fInFD = %d", fInFD);
++
 +    AUDIO_INITINFO(&info);
 +    info.record.encoding = AUDIO_ENCODING_SLINEAR;
 +    info.record.precision = fPrecision;
 +    info.record.channels = fCaptureChannels;
 +    info.record.sample_rate = fEngineControl->fSampleRate;
++
 +    if (ioctl(fInFD, AUDIO_SETINFO, &info) == -1) {
 +        jack_error("JackSunDriver::OpenInput failed to set device parameters : %s@%i, errno = %d", __FILE__, __LINE__, errno);
 +        goto error;
 +    }
 @@ -162,31 +168,37 @@ Add NetBSD support.
 +    return -1;
 +}
++
 +int JackSunDriver::OpenOutput()
 +{
 +    struct audio_info info;
 +    int new_buffer_size;
++
 +    if ((fOutFD = open(fPlaybackDriverName, O_WRONLY)) < 0) {
 +        jack_error("JackSunDriver::OpenOutput failed to open device : %s@%i, errno = %d", __FILE__, __LINE__, errno);
 +        return -1;
 +    }
++
 +#ifdef AUDIO_GETFORMAT
 +    if (fPlaybackChannels == 0) {
 +        if (ioctl(fOutFD, AUDIO_GETFORMAT, &info) == 0) {
 +            fPlaybackChannels = info.play.channels;
 +        }
 +    }
 +#else
 +    if (fPlaybackChannels == 0) {
 +        fPlaybackChannels = 2;
 +    }
 +#endif
++
 +    jack_log("JackSunDriver::OpenOutput input fOutFD = %d", fOutFD);
++
 +    AUDIO_INITINFO(&info);
 +    info.hiwat = 2;
 +    info.play.encoding = AUDIO_ENCODING_SLINEAR;
 +    info.play.precision = fPrecision;
 +    info.play.channels = fPlaybackChannels;
 +    info.play.sample_rate = fEngineControl->fSampleRate;
++
 +    if (ioctl(fOutFD, AUDIO_SETINFO, &info) == -1) {
 +        jack_error("JackSunDriver::OpenOutput failed to set device parameters : %s@%i, errno = %d", __FILE__, __LINE__, errno);
 +        goto error;