head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.156 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.154 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.152 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.150 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.148 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.146 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.144 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.142 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.140 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.138 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.136 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.134 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.132 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.130 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.128 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.126 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.124 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.122 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.120 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.118 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.116 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.114 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.112 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.108 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.88 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.110 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.106 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.104 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.102 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.100 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.98 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.96 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.94 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.92 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.90 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.86 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.84 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.82 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.80 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.78 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.76 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.74 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.72 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.70 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.68 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.66 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.64 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.62 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.60 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.58 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.56 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.52 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.50 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.48 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.46 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.44 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.42 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.40 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.38 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.36 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.34 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.32 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.30 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.28 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.26 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.24 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.22 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.20 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.18 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.16 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.14 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.12 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.10 pkgsrc-2008Q1:1.3.0.8 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.6 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.4 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.2 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.2.0.30 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.28 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.26 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.24 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.22 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.20 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.18 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.16 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.14 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.12 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.10 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.8 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.6 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2007.05.23.12.00.04; author rillig; state Exp; branches; next 1.2; 1.2 date 2002.10.27.06.47.45; author rh; state Exp; branches; next 1.1; 1.1 date 2001.05.23.20.17.22; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.05.23.20.17.22; author rh; state Exp; branches; next ; desc @@ 1.3 log @Fixed gcc4 error messages. @ text @$NetBSD: patch-ac,v 1.2 2002/10/27 06:47:45 rh Exp $ --- oss.c.orig 2001-05-14 23:35:52.000000000 +0200 +++ oss.c 2007-05-23 13:57:16.000000000 +0200 @@@@ -42,9 +42,10 @@@@ # include #elif defined(HAVE_MACHINE_SOUNDCARD_H) # include +#elif defined(HAVE_SOUNDCARD_H) +# include #endif - /* output plugin callback prototypes */ static void oss_get_volume (int *l, int *r); static void oss_set_volume (int l, int r); @@@@ -91,6 +92,8 @@@@ static gint dsp_buffer_size = 0; static gint dsp_fragment_size = 0; static gboolean dsp_select_works = FALSE; +/* let's assume that this is really meant to be a local variable. */ +#define buffer_mutex oss_c_local_variable_buffer_mutex static pthread_mutex_t buffer_mutex; static pthread_t buffer_thread; @@@@ -305,9 +308,9 @@@@ oss_open_audio(AFormat fmt, int rate, in if(config->oss_use_alt_audio_device && (config->oss_alt_audio_device != NULL)) device_name = g_strdup(config->oss_alt_audio_device); else if(config->oss_audio_device > 0) - device_name = g_strdup_printf("/dev/dsp%d", config->oss_audio_device); + device_name = g_strdup_printf(DEFAULT_OSS_ALT_AUDIO_DEVICE "%d", config->oss_audio_device); else - device_name = g_strdup("/dev/dsp"); + device_name = g_strdup(DEFAULT_OSS_ALT_AUDIO_DEVICE); /* HACK: Test if the device is not locked by another process. This is * just a crude workaround to avoid complete lockup of XMMS. It is @@@@ -499,13 +502,26 @@@@ buffer_thread_f(void *arg) while(dsp_fd != -1) { /* wait for device */ if(dsp_select_works) { - tv.tv_sec = 0; + pthread_mutex_unlock(&buffer_mutex); +#ifdef _PTH_PTHREAD_H_ + { int i; + + for (i=0; i<16; i++) { + tv.tv_usec = OSS_FRAGMENT_UTIME/16; +#else tv.tv_usec = OSS_FRAGMENT_UTIME; +#endif + tv.tv_sec = 0; FD_ZERO(&set); FD_SET(dsp_fd, &set); - pthread_mutex_unlock(&buffer_mutex); sel = select(dsp_fd+1, NULL, &set, NULL, &tv); +#ifdef _PTH_PTHREAD_H_ + if (sel) break; + + sched_yield(); + }} +#endif pthread_mutex_lock(&buffer_mutex); if(sel == -1) { @ 1.2 log @Test for pth, not __NetBSD__ to make this compile with native threads. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- oss.c.orig Tue May 15 07:35:52 2001 +++ oss.c d17 10 a26 1 @@@@ -305,9 +306,9 @@@@ oss_open_audio(AFormat fmt, int rate, in d38 1 a38 1 @@@@ -499,13 +500,26 @@@@ buffer_thread_f(void *arg) @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- oss.c.orig Thu Apr 19 13:02:35 2001 d5 1 a5 1 @@@@ -42,9 +43,10 @@@@ d17 1 a17 1 @@@@ -305,9 +307,9 @@@@ d29 1 a29 1 @@@@ -499,13 +507,26 @@@@ d35 1 a35 1 +#ifdef __NetBSD__ d49 2 a50 2 +#ifdef __NetBSD__ + pthread_yield_np(); d52 1 a52 1 + if (sel) break; @ 1.1.1.1 log @Initial import of xmms-crossfade-0.2.7, a cross-fading plugin for xmms. @ text @@