From 5362be8c3ca2ad114e6d4f1322d6e3de2672d697 Mon Sep 17 00:00:00 2001
From: Miller Puckette <msp@ucsd.edu>
Date: Fri, 15 Feb 2008 17:37:22 -0800
Subject: [PATCH] more bugfixes; release 0.41-2
---
doc/1.manual/x5.htm | 5 +++++
src/m_pd.h | 2 +-
src/s_audio_mmio.c | 2 +-
src/s_inter.c | 8 +++++---
src/u_main.tk | 2 +-
src/u_pdsend.c | 2 +-
src/x_net.c | 2 +-
7 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/doc/1.manual/x5.htm b/doc/1.manual/x5.htm
index 3b43cbccc..72b04af8e 100644
--- a/doc/1.manual/x5.htm
+++ b/doc/1.manual/x5.htm
@@ -20,6 +20,11 @@
<H3> <A name="s2"> 5.1. release notes </A> </H3>
+<P> ------------------ 0.41-2 ----------------------------
+
+More bug fixes: large netsends dropping messages, and crash bug when turning
+DSP on and off repeatedly in MS windows
+
<P> ------------------ 0.41-1 ----------------------------
Fixed a startup problem for Mac OSX 10.5.1 (other platforms should not be affected)
diff --git a/src/m_pd.h b/src/m_pd.h
index 558bd4d2b..2428c705c 100644
--- a/src/m_pd.h
+++ b/src/m_pd.h
@@ -10,7 +10,7 @@ extern "C" {
#define PD_MAJOR_VERSION 0
#define PD_MINOR_VERSION 41
-#define PD_BUGFIX_VERSION 1
+#define PD_BUGFIX_VERSION 2
#define PD_TEST_VERSION ""
/* old name for "MSW" flag -- we have to take it for the sake of many old
diff --git a/src/s_audio_mmio.c b/src/s_audio_mmio.c
index cf79f1351..fd17a1ce0 100644
--- a/src/s_audio_mmio.c
+++ b/src/s_audio_mmio.c
@@ -709,7 +709,7 @@ int mmio_open_audio(int naudioindev, int *audioindev,
nbuf = MAXBUFFER;
}
else if (nbuf < 4) nbuf = 4;
- fprintf(stderr, "%d audio buffers\n", nbuf);
+ /* fprintf(stderr, "%d audio buffers\n", nbuf); */
nt_naudiobuffer = nbuf;
if (nt_adcjitterbufsallowed > nbuf - 2)
nt_adcjitterbufsallowed = nbuf - 2;
diff --git a/src/s_inter.c b/src/s_inter.c
index 605981c64..8ed6f3739 100644
--- a/src/s_inter.c
+++ b/src/s_inter.c
@@ -418,12 +418,12 @@ void socketreceiver_free(t_socketreceiver *x)
static int socketreceiver_doread(t_socketreceiver *x)
{
char messbuf[INBUFSIZE], *bp = messbuf;
- int indx;
+ int indx, first = 1;
int inhead = x->sr_inhead;
int intail = x->sr_intail;
char *inbuf = x->sr_inbuf;
- if (intail == inhead) return (0);
- for (indx = intail; indx != inhead; indx = (indx+1)&(INBUFSIZE-1))
+ for (indx = intail; first || (indx != inhead);
+ first = 0, (indx = (indx+1)&(INBUFSIZE-1)))
{
/* if we hit a semi that isn't preceeded by a \, it's a message
boundary. LATER we should deal with the possibility that the
@@ -544,6 +544,8 @@ void socketreceiver_read(t_socketreceiver *x, int fd)
if (x->sr_socketreceivefn)
(*x->sr_socketreceivefn)(x->sr_owner, inbinbuf);
else binbuf_eval(inbinbuf, 0, 0, 0);
+ if (x->sr_inhead == x->sr_intail)
+ break;
}
}
}
diff --git a/src/u_main.tk b/src/u_main.tk
index 5b9d4e74b..1ad84f080 100644
--- a/src/u_main.tk
+++ b/src/u_main.tk
@@ -3517,7 +3517,7 @@ proc pdtk_pd_texteditor {stuff} {
proc pdtk_pastetext {} {
global pdtk_pastebuffer
set pdtk_pastebuffer ""
- catch {global pdtk_pastebuffer; set pdtk_pastebuffer [selection get]}
+ catch {global pdtk_pastebuffer; set pdtk_pastebuffer [clipboard get]}
# puts stderr [concat paste $pdtk_pastebuffer]
for {set i 0} {$i < [string length $pdtk_pastebuffer]} {incr i 1} {
set cha [string index $pdtk_pastebuffer $i]
diff --git a/src/u_pdsend.c b/src/u_pdsend.c
index 663889cca..e36ad94a2 100644
--- a/src/u_pdsend.c
+++ b/src/u_pdsend.c
@@ -112,7 +112,7 @@ connected: ;
nsend = strlen(buf);
for (bp = buf, nsent = 0; nsent < nsend;)
{
- int res = send(sockfd, buf, nsend-nsent, 0);
+ int res = send(sockfd, bp, nsend-nsent, 0);
if (res < 0)
{
sockerror("send");
diff --git a/src/x_net.c b/src/x_net.c
index d4985dfaf..9d1aee0b1 100644
--- a/src/x_net.c
+++ b/src/x_net.c
@@ -129,7 +129,7 @@ static void netsend_send(t_netsend *x, t_symbol *s, int argc, t_atom *argv)
static double lastwarntime;
static double pleasewarn;
double timebefore = sys_getrealtime();
- int res = send(x->x_fd, buf, length-sent, 0);
+ int res = send(x->x_fd, bp, length-sent, 0);
double timeafter = sys_getrealtime();
int late = (timeafter - timebefore > 0.005);
if (late || pleasewarn)
--
GitLab