aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiller Puckette <millerpuckette@users.sourceforge.net>2006-08-15 16:09:57 +0000
committerMiller Puckette <millerpuckette@users.sourceforge.net>2006-08-15 16:09:57 +0000
commit702ebcc975ddbe560107633676689213f5795f98 (patch)
tree392b30c593e49178a37346c34c7d64a21505f755
parent5a4b87e33f6e6cab50db2b47f2b6b054730919a5 (diff)
Bug fix in audio blocking
svn path=/trunk/; revision=5609
-rw-r--r--pd/doc/1.manual/1.introduction.txt2
-rw-r--r--pd/portaudio/pa_win_wdmks/pa_win_wdmks.c2
-rw-r--r--pd/portaudio/pablio/ringbuffer.c2
-rw-r--r--pd/portaudio/pablio/ringbuffer.h2
-rw-r--r--pd/portmidi/pm_mac/pmmacosxcm.c2
-rw-r--r--pd/src/d_ugen.c1
-rw-r--r--pd/src/s_audio_pablio.h2
-rw-r--r--pd/src/s_audio_paring.c2
-rw-r--r--pd/src/s_audio_paring.h2
-rw-r--r--pd/src/s_inter.c4
-rw-r--r--pd/src/s_loader.c5
-rw-r--r--pd/src/u_main.tk14
12 files changed, 22 insertions, 18 deletions
diff --git a/pd/doc/1.manual/1.introduction.txt b/pd/doc/1.manual/1.introduction.txt
index b81bf5bb..f9209702 100644
--- a/pd/doc/1.manual/1.introduction.txt
+++ b/pd/doc/1.manual/1.introduction.txt
@@ -1,4 +1,4 @@
-Pd version 0.40-0 test 01
+PD_VERSION
A real-time graphical programming environment for live interactive
computer music, Pd works on SGI machines, Microsoft Windows,
diff --git a/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c b/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c
index 00e54e6f..f8be09aa 100644
--- a/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c
+++ b/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c
@@ -1,5 +1,5 @@
/*
- * $Id: pa_win_wdmks.c,v 1.6 2006-08-15 04:54:15 millerpuckette Exp $
+ * $Id: pa_win_wdmks.c,v 1.7 2006-08-15 16:09:57 millerpuckette Exp $
* PortAudio Windows WDM-KS interface
*
* Author: Andrew Baldwin
diff --git a/pd/portaudio/pablio/ringbuffer.c b/pd/portaudio/pablio/ringbuffer.c
index b37762bd..3a68e243 100644
--- a/pd/portaudio/pablio/ringbuffer.c
+++ b/pd/portaudio/pablio/ringbuffer.c
@@ -1,5 +1,5 @@
/*
- * $Id: ringbuffer.c,v 1.5 2006-08-15 04:54:15 millerpuckette Exp $
+ * $Id: ringbuffer.c,v 1.6 2006-08-15 16:09:57 millerpuckette Exp $
* ringbuffer.c
* Ring Buffer utility..
*
diff --git a/pd/portaudio/pablio/ringbuffer.h b/pd/portaudio/pablio/ringbuffer.h
index a8492ae9..9395416e 100644
--- a/pd/portaudio/pablio/ringbuffer.h
+++ b/pd/portaudio/pablio/ringbuffer.h
@@ -6,7 +6,7 @@ extern "C"
#endif /* __cplusplus */
/*
- * $Id: ringbuffer.h,v 1.6 2006-08-15 04:54:15 millerpuckette Exp $
+ * $Id: ringbuffer.h,v 1.7 2006-08-15 16:09:57 millerpuckette Exp $
* ringbuffer.h
* Ring Buffer utility..
*
diff --git a/pd/portmidi/pm_mac/pmmacosxcm.c b/pd/portmidi/pm_mac/pmmacosxcm.c
index 0386503a..19ee5d89 100644
--- a/pd/portmidi/pm_mac/pmmacosxcm.c
+++ b/pd/portmidi/pm_mac/pmmacosxcm.c
@@ -5,7 +5,7 @@
* and subsequent work by Andrew Zeldis and Zico Kolter
* and Roger B. Dannenberg
*
- * $Id: pmmacosxcm.c,v 1.6 2006-08-15 04:54:15 millerpuckette Exp $
+ * $Id: pmmacosxcm.c,v 1.7 2006-08-15 16:09:57 millerpuckette Exp $
*/
/* Notes:
diff --git a/pd/src/d_ugen.c b/pd/src/d_ugen.c
index d7cfd543..1edf5ccb 100644
--- a/pd/src/d_ugen.c
+++ b/pd/src/d_ugen.c
@@ -953,6 +953,7 @@ void ugen_done_graph(t_dspcontext *dc)
{
srate = parent_srate;
vecsize = parent_vecsize;
+ calcsize = (parent_context ? parent_context->dc_calcsize : vecsize);
downsample = upsample = 1;
period = frequency = 1;
phase = 0;
diff --git a/pd/src/s_audio_pablio.h b/pd/src/s_audio_pablio.h
index fe8cba83..e47934f0 100644
--- a/pd/src/s_audio_pablio.h
+++ b/pd/src/s_audio_pablio.h
@@ -7,7 +7,7 @@ extern "C"
#endif /* __cplusplus */
/*
- * $Id: s_audio_pablio.h,v 1.4 2006-08-15 04:54:15 millerpuckette Exp $
+ * $Id: s_audio_pablio.h,v 1.5 2006-08-15 16:09:57 millerpuckette Exp $
* PABLIO.h
* Portable Audio Blocking read/write utility.
*
diff --git a/pd/src/s_audio_paring.c b/pd/src/s_audio_paring.c
index b2dfd95e..c824700d 100644
--- a/pd/src/s_audio_paring.c
+++ b/pd/src/s_audio_paring.c
@@ -1,5 +1,5 @@
/*
- * $Id: s_audio_paring.c,v 1.4 2006-08-15 04:54:15 millerpuckette Exp $
+ * $Id: s_audio_paring.c,v 1.5 2006-08-15 16:09:57 millerpuckette Exp $
* ringbuffer.c
* Ring Buffer utility..
*
diff --git a/pd/src/s_audio_paring.h b/pd/src/s_audio_paring.h
index ba720515..dcd218b5 100644
--- a/pd/src/s_audio_paring.h
+++ b/pd/src/s_audio_paring.h
@@ -6,7 +6,7 @@ extern "C"
#endif /* __cplusplus */
/*
- * $Id: s_audio_paring.h,v 1.4 2006-08-15 04:54:15 millerpuckette Exp $
+ * $Id: s_audio_paring.h,v 1.5 2006-08-15 16:09:57 millerpuckette Exp $
* ringbuffer.h
* Ring Buffer utility..
*
diff --git a/pd/src/s_inter.c b/pd/src/s_inter.c
index 102b0474..4b73e8d1 100644
--- a/pd/src/s_inter.c
+++ b/pd/src/s_inter.c
@@ -85,6 +85,7 @@ struct _socketreceiver
t_socketreceivefn sr_socketreceivefn;
};
+extern char *pd_version;
extern int sys_guisetportnumber;
extern char sys_font[]; /* tb: typeface */
@@ -1247,7 +1248,8 @@ int sys_startgui(const char *guidir)
#endif
sys_get_audio_apis(buf);
sys_get_midi_apis(buf2);
- sys_vgui("pdtk_pd_startup %s %s {%s}\n", buf, buf2, sys_font);
+ sys_vgui("pdtk_pd_startup {%s} %s %s {%s}\n", pd_version, buf, buf2,
+ sys_font);
}
return (0);
diff --git a/pd/src/s_loader.c b/pd/src/s_loader.c
index 19d6d530..159be4bf 100644
--- a/pd/src/s_loader.c
+++ b/pd/src/s_loader.c
@@ -76,7 +76,7 @@ void sys_putonloadlist(char *classname) /* add to list of loaded modules */
ll->ll_name = gensym(classname);
ll->ll_next = sys_loaded;
sys_loaded = ll;
- post("put on list %s", classname);
+ /* post("put on list %s", classname); */
}
void class_set_extern_dir(t_symbol *s);
@@ -94,7 +94,6 @@ static int sys_do_load_lib(t_canvas *canvas, char *objectname)
if (classname = strrchr(objectname, '/'))
classname++;
else classname = objectname;
- post("classname %s", classname);
if (sys_onloadlist(classname))
{
post("%s: already loaded", classname);
@@ -130,7 +129,7 @@ static int sys_do_load_lib(t_canvas *canvas, char *objectname)
}
else strcat(symname, "_setup");
-#if 1
+#if 0
fprintf(stderr, "lib: %s\n", classname);
#endif
/* try looking in the path for (objectname).(sys_dllextent) ... */
diff --git a/pd/src/u_main.tk b/pd/src/u_main.tk
index 3ee5505c..2dacec81 100644
--- a/pd/src/u_main.tk
+++ b/pd/src/u_main.tk
@@ -35,8 +35,8 @@ if {$pd_nt == 1} {
global pd_guidir
global pd_tearoff
set pd_gui2 [string range $argv0 0 [expr [string last \\ $argv0 ] - 1]]
- regsub -all \\\\ $pd_gui2 / pd_guidir
- set pd_guidir [string range $pd_guidir 0 [expr [string last / $pd_guidir] - 1]]
+ regsub -all \\\\ $pd_gui2 / pd_gui3
+ set pd_guidir $pd_gui3/..
load $pd_guidir/bin/pdtcl.dll
set pd_tearoff 1
}
@@ -371,7 +371,8 @@ proc menu_opentext {filename} {
while {![eof $f]} {
set bigstring [read $f 1000]
regsub -all PD_BASEDIR $bigstring $pd_guidir bigstring2
- $name.text insert end $bigstring2
+ regsub -all PD_VERSION $bigstring2 $pd_myversion bigstring3
+ $name.text insert end $bigstring3
}
close $f
set doc_number [expr $doc_number + 1]
@@ -3243,9 +3244,10 @@ proc pdtk_pd_ctrlkey {name key shift} {
# seven "useful" font sizes.
# tb: user defined typefaces
-proc pdtk_pd_startup {apilist midiapilist fontname} {
-# puts stderr [concat $apilist $midiapilist $fontname]
- global pd_apilist pd_midiapilist
+proc pdtk_pd_startup {version apilist midiapilist fontname} {
+# puts stderr [concat $version $apilist $fontname]
+ global pd_myversion pd_apilist pd_midiapilist
+ set pd_myversion $version
set pd_apilist $apilist
set pd_midiapilist $midiapilist
global pd_fontlist