Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23766
Modified Files: Tag: desiredata builtins.c d_soundfile.c s_audio_jack.c m_sched.c Log Message: remove blank lines in console
Index: builtins.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/builtins.c,v retrieving revision 1.1.2.52 retrieving revision 1.1.2.53 diff -C2 -d -r1.1.2.52 -r1.1.2.53 *** builtins.c 30 Jul 2007 16:20:33 -0000 1.1.2.52 --- builtins.c 3 Aug 2007 00:17:16 -0000 1.1.2.53 *************** *** 230,238 **** server.sin_family = AF_INET; struct hostent *hp = gethostbyname(hostname->name); ! if (!hp) {error("bad host?\n"); return;} #if 0 int intarg = 0; if (setsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, &intarg, sizeof(intarg)) < 0) ! error("setsockopt (SO_RCVBUF) failed\n"); #endif /* for stream (TCP) sockets, specify "nodelay" */ --- 230,238 ---- server.sin_family = AF_INET; struct hostent *hp = gethostbyname(hostname->name); ! if (!hp) {error("bad host?"); return;} #if 0 int intarg = 0; if (setsockopt(sockfd, SOL_SOCKET, SO_SNDBUF, &intarg, sizeof(intarg)) < 0) ! error("setsockopt (SO_RCVBUF) failed"); #endif /* for stream (TCP) sockets, specify "nodelay" */ *************** *** 240,244 **** int intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &intarg, sizeof(intarg)) < 0) ! error("setsockopt (TCP_NODELAY) failed\n"); } memcpy((char *)&server.sin_addr, (char *)hp->h_addr, hp->h_length); --- 240,244 ---- int intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &intarg, sizeof(intarg)) < 0) ! error("setsockopt (TCP_NODELAY) failed"); } memcpy((char *)&server.sin_addr, (char *)hp->h_addr, hp->h_length); *************** *** 367,376 **** intarg = 1; if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &intarg, sizeof(intarg)) < 0) ! post("setsockopt (SO_REUSEADDR) failed\n"); #endif #if 0 intarg = 0; if (setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, &intarg, sizeof(intarg)) < 0) ! post("setsockopt (SO_RCVBUF) failed\n"); #endif /* Stream (TCP) sockets are set NODELAY */ --- 367,376 ---- intarg = 1; if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &intarg, sizeof(intarg)) < 0) ! post("setsockopt (SO_REUSEADDR) failed"); #endif #if 0 intarg = 0; if (setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, &intarg, sizeof(intarg)) < 0) ! post("setsockopt (SO_RCVBUF) failed"); #endif /* Stream (TCP) sockets are set NODELAY */ *************** *** 378,382 **** intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &intarg, sizeof(intarg)) < 0) ! post("setsockopt (TCP_NODELAY) failed\n"); } /* assign server port number */ --- 378,382 ---- intarg = 1; if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &intarg, sizeof(intarg)) < 0) ! post("setsockopt (TCP_NODELAY) failed"); } /* assign server port number */
Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.21.2.14 retrieving revision 1.5.4.35.2.21.2.15 diff -C2 -d -r1.5.4.35.2.21.2.14 -r1.5.4.35.2.21.2.15 *** m_sched.c 19 Jul 2007 21:08:45 -0000 1.5.4.35.2.21.2.14 --- m_sched.c 3 Aug 2007 00:17:16 -0000 1.5.4.35.2.21.2.15 *************** *** 363,367 **** if (idlecount == 32) idletime = sys_getrealtime(); else if (sys_getrealtime() - idletime > 1.) { ! post("audio I/O stuck... closing audio\n"); sys_close_audio(); sched_set_using_dacs(0); --- 363,367 ---- if (idlecount == 32) idletime = sys_getrealtime(); else if (sys_getrealtime() - idletime > 1.) { ! post("audio I/O stuck... closing audio"); sys_close_audio(); sched_set_using_dacs(0);
Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.4.4.11.2.10.2.28 retrieving revision 1.4.4.11.2.10.2.29 diff -C2 -d -r1.4.4.11.2.10.2.28 -r1.4.4.11.2.10.2.29 *** d_soundfile.c 20 Jul 2007 05:46:05 -0000 1.4.4.11.2.10.2.28 --- d_soundfile.c 3 Aug 2007 00:17:16 -0000 1.4.4.11.2.10.2.29 *************** *** 985,989 **** } if ((fd = create_soundfile(canvas, filesym->name, filetype, nframes, bytespersample, bigendian, nchannels, swap, samplerate)) < 0) { ! post("%s: %s\n", filesym->name, strerror(errno)); goto fail; } --- 985,989 ---- } if ((fd = create_soundfile(canvas, filesym->name, filetype, nframes, bytespersample, bigendian, nchannels, swap, samplerate)) < 0) { ! post("%s: %s", filesym->name, strerror(errno)); goto fail; } *************** *** 1314,1318 **** } if ((fd = create_soundfile(canvas, filesym->name, filetype, nframes, bytespersample, bigendian, nchannels, swap, samplerate)) < 0) { ! post("%s: %s\n", filesym->name, strerror(errno)); goto fail; } --- 1314,1318 ---- } if ((fd = create_soundfile(canvas, filesym->name, filetype, nframes, bytespersample, bigendian, nchannels, swap, samplerate)) < 0) { ! post("%s: %s", filesym->name, strerror(errno)); goto fail; }
Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.5.4.8.2.7.2.13 retrieving revision 1.5.4.8.2.7.2.14 diff -C2 -d -r1.5.4.8.2.7.2.13 -r1.5.4.8.2.7.2.14 *** s_audio_jack.c 30 Jul 2007 23:53:37 -0000 1.5.4.8.2.7.2.13 --- s_audio_jack.c 3 Aug 2007 00:17:16 -0000 1.5.4.8.2.7.2.14 *************** *** 330,334 **** }
! void jack_listdevs () {error("device listing not implemented for jack yet\n");}
static const char ** jack_in_connections[NUM_JACK_PORTS]; /* ports connected to the inputs */ --- 330,334 ---- }
! void jack_listdevs () {error("device listing not implemented for jack yet");}
static const char ** jack_in_connections[NUM_JACK_PORTS]; /* ports connected to the inputs */