re-synced with my own source tree...

svn path=/trunk/; revision=4321

8 files changed, 39 insertions, 33 deletions

diff --git a/pd/doc/1.manual/1.introduction.txt b/pd/doc/1.manual/1.introduction.txt
index 97967523..f9209702 100644
--- a/pd/doc/1.manual/1.introduction.txt
+++ b/pd/doc/1.manual/1.introduction.txt
@@ -2,7 +2,7 @@ PD_VERSION
 
 A real-time graphical programming environment for live interactive
 computer music, Pd works on SGI machines, Microsoft Windows,
-Linux, and Mac OSX.
+Linux, and Max OSX.
 
 Pd is copyrighted, but is free for you to use for any reasonable purpose.
 See the file:
diff --git a/pd/doc/5.reference/acoustics-help.pd b/pd/doc/5.reference/acoustics-help.pd
index 2a46f589..de3e6f22 100644
--- a/pd/doc/5.reference/acoustics-help.pd
+++ b/pd/doc/5.reference/acoustics-help.pd
@@ -1,40 +1,47 @@
-#N canvas 163 25 582 408 12;
-#X obj 15 269 ftom;
+#N canvas 0 466 571 483 12;
+#X obj 32 393 ftom;
 #X obj 8 10 mtof;
-#X obj 15 217 mtof;
-#X floatatom 15 189 0 0 0;
-#X floatatom 15 244 0 0 0;
+#X obj 32 341 mtof;
+#X floatatom 32 313 0 0 0 0 - - -;
+#X floatatom 32 368 0 0 0 0 - - -;
 #X obj 64 10 ftom;
-#X floatatom 15 293 0 0 0;
+#X floatatom 32 417 0 0 0 0 - - -;
 #X obj 120 11 dbtorms;
 #X obj 196 11 rmstodb;
 #X obj 275 11 dbtopow;
 #X obj 352 11 powtodb;
+#X floatatom 164 309 0 0 0 0 - - -;
+#X floatatom 164 364 0 0 0 0 - - -;
+#X floatatom 164 413 0 0 0 0 - - -;
+#X obj 164 337 dbtorms;
+#X obj 164 389 rmstodb;
+#X floatatom 278 310 0 0 0 0 - - -;
+#X floatatom 278 365 0 0 0 0 - - -;
+#X floatatom 278 414 0 0 0 0 - - -;
+#X obj 278 338 dbtopow;
+#X obj 278 390 powtodb;
+#X text 23 245 Finally \, dbtopow and powtodb convert decibels to and
+from power units \, equal to the square of the "RMS" amplitude.;
+#X text 304 448 updated for pd version 0.40.;
 #X text 21 53 The mtof object transposes a midi value into a frequency
 in Hertz \, so that "69" goes to "440". You can specify microtonal
 pitches as in "69.5" (a quarter tone higher than 69). Ftom does the
-reverse.;
-#X floatatom 147 185 0 0 0;
-#X floatatom 147 240 0 0 0;
-#X floatatom 147 289 0 0 0;
-#X obj 147 213 dbtorms;
-#X obj 147 265 rmstodb;
-#X floatatom 261 186 0 0 0;
-#X floatatom 261 241 0 0 0;
-#X floatatom 261 290 0 0 0;
-#X obj 261 214 dbtopow;
-#X obj 261 266 powtodb;
-#X text 27 336 Overflows and underflows are clipped.;
-#X text 300 376 updated for pd version 0.33;
+reverse. A frequency of zero Hertz is given a MIDI value of -1500 (strictly
+speaking \, it is negative infinity.);
+#X text 22 149 The dbtorms and rmstodb objects convert from decibels
+to linear ("RMS") amplitude \, so that 100 dB corresponds to an "RMS"
+of 1 Zero amplitude (strictly speaking \, minus infinity dB) is clipped
+to zero dB \, and zero dB \, which should correspond to 1e-04 in "RMS"
+\, is instead rounded down to zero.;
 #X connect 0 0 6 0;
 #X connect 2 0 4 0;
 #X connect 3 0 2 0;
 #X connect 4 0 0 0;
+#X connect 11 0 14 0;
 #X connect 12 0 15 0;
-#X connect 13 0 16 0;
+#X connect 14 0 12 0;
 #X connect 15 0 13 0;
-#X connect 16 0 14 0;
+#X connect 16 0 19 0;
 #X connect 17 0 20 0;
-#X connect 18 0 21 0;
+#X connect 19 0 17 0;
 #X connect 20 0 18 0;
-#X connect 21 0 19 0;
diff --git a/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c b/pd/portaudio/pa_win_wdmks/pa_win_wdmks.c
index 97d1c1f6..736cba99 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.1 2005-12-31 01:46:24 millerpuckette Exp $
+ * $Id: pa_win_wdmks.c,v 1.2 2005-12-31 02:56:03 millerpuckette Exp $
  * PortAudio Windows WDM-KS interface
  *
  * Author: Andrew Baldwin
diff --git a/pd/portmidi/pm_mac/pmmacosxcm.c b/pd/portmidi/pm_mac/pmmacosxcm.c
index 55b9b084..d62391f0 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.1 2005-12-15 00:56:57 eighthave Exp $

+ * $Id: pmmacosxcm.c,v 1.2 2005-12-31 02:56:03 millerpuckette Exp $

  */

  

 /* Notes:

diff --git a/pd/portmidi/porttime/porttime.h b/pd/portmidi/porttime/porttime.h
index 029ea777..762a71af 100644
--- a/pd/portmidi/porttime/porttime.h
+++ b/pd/portmidi/porttime/porttime.h
@@ -27,9 +27,9 @@ typedef void (PtCallback)( PtTimestamp timestamp, void *userData );
 

 

 PtError Pt_Start(int resolution, PtCallback *callback, void *userData);

-PtError Pt_Stop();

-int Pt_Started();

-PtTimestamp Pt_Time();

+PtError Pt_Stop( void);

+int Pt_Started( void);

+PtTimestamp Pt_Time( void);

 

 #ifdef __cplusplus

 }

diff --git a/pd/portmidi/porttime/ptmacosx_cf.c b/pd/portmidi/porttime/ptmacosx_cf.c
index c0c22a32..1837246b 100644
--- a/pd/portmidi/porttime/ptmacosx_cf.c
+++ b/pd/portmidi/porttime/ptmacosx_cf.c
@@ -91,8 +91,6 @@ PtError Pt_Start(int resolution, PtCallback *callback, void *userData)
     PtThreadParams *params = (PtThreadParams*)malloc(sizeof(PtThreadParams));

     pthread_t pthread_id;

 

-    printf("Pt_Start() called\n");

-

     // /* make sure we're not already playing */

     if (time_started_flag) return ptAlreadyStarted;

     startTime = CFAbsoluteTimeGetCurrent();

@@ -113,7 +111,6 @@ PtError Pt_Start(int resolution, PtCallback *callback, void *userData)
 

 PtError Pt_Stop()

 {

-    printf("Pt_Stop called\n");

 

     CFRunLoopStop(timerRunLoop);

     time_started_flag = FALSE;

diff --git a/pd/src/notes.txt b/pd/src/notes.txt
index 4afe9542..3e02b0bf 100644
--- a/pd/src/notes.txt
+++ b/pd/src/notes.txt
@@ -17,6 +17,7 @@ document tabwrite~_start
 "list" to signal inlet (e.g., "*~") or float inlet (f) complains.
 
 problems:
+"save as" with spaces in filename still messes up
 don't filter locked click() through getrect
 better scalar hit detection (getrect is too greedy)
 when retyping abstractions, offer to save dirty one
@@ -42,6 +43,7 @@ check if _vsnprintf with zero argument in windows works any better...
 detect adc~ and dac~ reblocking
 
 features:
+hook for table mousing
 integrate video into tilde objects
 flag to suppress printing array name above graph
 flag to suppress scrollbars in canvases
diff --git a/pd/src/s_main.c b/pd/src/s_main.c
index b722d960..76e69046 100644
--- a/pd/src/s_main.c
+++ b/pd/src/s_main.c
@@ -2,7 +2,7 @@
 * For information on usage and redistribution, and for a DISCLAIMER OF ALL
 * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
 
-char pd_version[] = "Pd version 0.39-2\n";
+char pd_version[] = "Pd version 0.40-0test01\n";
 char pd_compiletime[] = __TIME__;
 char pd_compiledate[] = __DATE__;