head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.54 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.52 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.50 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.48 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.46 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.44 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.42 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.40 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.38 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 buildlink2-base:1.3 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1; locks; strict; comment @# @; 1.3 date 2000.12.17.01.37.41; author wiz; state dead; branches; next 1.2; 1.2 date 98.08.07.10.36.16; author agc; state Exp; branches; next 1.1; 1.1 date 98.03.07.18.49.40; author mycroft; state Exp; branches; next ; desc @@ 1.3 log @Update timidity to 2.10.2, based on a package provided by Adam Ciarcinski in connection with pkg/8648. @ text @$NetBSD: patch-bb,v 1.2 1998/08/07 10:36:16 agc Exp $ --- motif_c.c.orig Mon May 20 09:14:09 1996 +++ motif_c.c Sat Mar 7 13:19:57 1998 @@@@ -370,15 +370,10 @@@@ */ static int ctl_read(int32 *valp) { - int num; - - /* We don't wan't to lock on reading */ - num=pipe_read_ready(); - - if (num==0) - return RC_NONE; - - return(ctl_blocking_read(valp)); + if (pipe_read_ready()) + return(ctl_blocking_read(valp)); + else + return RC_NONE; } static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]) --- motif_p.c.orig Mon May 20 09:09:46 1996 +++ motif_p.c Sat Mar 7 13:22:05 1998 @@@@ -29,7 +29,11 @@@@ #include #include #ifdef SOLARIS -#include +#include +#endif +#ifdef sgi +#include +#include #endif #include "config.h" @@@@ -39,6 +43,9 @@@@ int pipeAppli[2],pipeMotif[2]; /* Pipe for communication with MOTIF process */ int fpip_in, fpip_out; /* in and out depends in which process we are */ int pid; /* Pid for child process */ +#ifdef sgi +static fd_set selector; +#endif /* DATA VALIDITY CHECK */ #define INT_CODE 214 @@@@ -146,7 +153,20 @@@@ { int num; +#ifdef sgi + static struct timeval zero = {0, 0}; + FD_SET(fpip_in, &selector); + num = select(fpip_in + 1, &selector, (fd_set *)0, (fd_set *)0, &zero); + if (num < 0) + pipe_error("pipe_read_ready"); + num = FD_ISSET(fpip_in, &selector); +#else +#ifdef SOLARIS + ioctl(fpip_in,I_NREAD,&num); /* see how many chars in buffer. */ +#else ioctl(fpip_in,FIONREAD,&num); /* see how many chars in buffer. */ +#endif +#endif return num; } --- output.c.orig Mon May 20 10:04:54 1996 +++ output.c Sat Mar 7 13:31:24 1998 @@@@ -48,6 +48,11 @@@@ #define DEFAULT_PLAY_MODE &sun_play_mode #endif +#ifdef AU_SGI +extern PlayMode sgi_play_mode; +#define DEFAULT_PLAY_MODE &sgi_play_mode +#endif + #ifdef AU_WIN32 extern PlayMode win32_play_mode; #define DEFAULT_PLAY_MODE &win32_play_mode --- tk_c.c.orig Mon May 20 09:14:24 1996 +++ tk_c.c Sat Mar 7 13:27:08 1998 @@@@ -17,6 +17,13 @@@@ #include #include #include +#ifdef SOLARIS +#include +#endif +#ifdef sgi +#include +#include +#endif #include "config.h" #include "common.h" @@@@ -362,15 +369,10 @@@@ */ static int ctl_read(int32 *valp) { - int num; - - /* We don't wan't to lock on reading */ - num=pipe_read_ready(); - - if (num==0) - return RC_NONE; - + if (pipe_read_ready()) return(ctl_blocking_read(valp)); + else + return RC_NONE; } static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]) @@@@ -439,6 +441,9 @@@@ static int pipeAppli[2],pipePanel[2]; /* Pipe for communication with Tcl/Tk process */ static int fpip_in, fpip_out; /* in and out depends in which process we are */ static int pid; /* Pid for child process */ +#ifdef sgi +static fd_set selector; +#endif static void pipe_open() { @@@@ -477,7 +482,21 @@@@ static int pipe_read_ready() { int num; + +#ifdef sgi + static struct timeval zero = {0, 0}; + FD_SET(fpip_in, &selector); + num = select(fpip_in + 1, &selector, (fd_set *)0, (fd_set *)0, &zero); + if (num < 0) + pipe_error("pipe_read_ready"); + num = FD_ISSET(fpip_in, &selector); +#else +#ifdef SOLARIS + ioctl(fpip_in,I_NREAD,&num); /* see how many chars in buffer. */ +#else ioctl(fpip_in,FIONREAD,&num); /* see how many chars in buffer. */ +#endif +#endif return num; } @ 1.2 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Use the native audio interface. Fix (and enable) the Tk interface; it just runs wish externally. Fix the Motif interface as well, but don't enable it by default (yet?). Throw in my SGI port `because it's there'. @ text @d1 2 @