TempleOSTS_131005.ISO

TempleOS/Adam/Snd/MathAudio.CPP

@@ -119,7 +119,7 @@ public U0 SndWaveCtrlDel(CSndWaveCtrl *swc)
 #define WF_NULL			0
 #define WF_SQUARE		1
 #define WF_SINE			2
-#define WF_TRI		3
+#define WF_TRI			3
 #define WF_SAWTOOTH		4
 #define WF_NOISE		5
 #define WF_NUM_WAVEFORMS	6

TempleOS/Adam/Snd/Music.CPP

@@ -158,12 +158,8 @@ public U0 Play(U8 *st,U8 *words=NULL)
       f=Note2Freq(note,music_octave);
     } else
       f=0;
-    if (words) {
-      if (word=LstEntryPt(i++,words))
-	if (StrCmp(word," "))
-	  "" word;
-    }
-
+    if (words && (word=LstSub(i++,words)) && StrCmp(word," "))
+      "%s",word;
     d=JIFFY_FREQ*music_note_len/music_tempo;
     if (tie) {
       on_jiffies  =d;

TempleOS/Adam/Snd/SndEffects.CPP

@@ -9,7 +9,7 @@ class CSoundEffectFrame
 
 U0 SoundEffectEndTaskCB()
 {
-  Free(NamedFramePtr("CSoundEffectFrame"));
+  Free(FramePtr("CSoundEffectFrame"));
   music_mute--;
   SndTaskEndCB;
 }
@@ -18,7 +18,7 @@ U0 SoundEffectTask(CSoundEffectFrame *ns)
 {
   I64 i;
   F64 f,t0=tS,t,timeout=t0+ns->duration;
-  NamedFramePtrAdd("CSoundEffectFrame",ns);
+  FramePtrAdd("CSoundEffectFrame",ns);
   Fs->task_end_cb=&SoundEffectEndTaskCB;
   switch (ns->type) {
     case SE_NOISE:

TempleOS/Adam/Snd/SndFile.CPP

@@ -13,7 +13,8 @@ class CFileSND
 };
 
 //This is a windows media constraint.
-#define MAX_SND_FILE_DATA	0x7FF00
+//#define MAX_SND_FILE_DATA	0x0007FF00
+#define MAX_SND_FILE_DATA	0x7FFFFF00
 
 
 public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,F64 averaging=0.0,I64 waveform=WF_SQUARE,
@@ -107,7 +108,7 @@ public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,F64 averaging=
       i=MAX_SND_FILE_DATA;
     s->data_size=EndianU32(i*sizeof(I16));
     MemCpy(s->body,&s->body[file_num*MAX_SND_FILE_DATA],i*sizeof(I16));
-    SPrintF(name2,"%s%03d.SND",name,file_num++);
+    SPrint(name2,"%s%03d.SND",name,file_num++);
     FileWrite(name2,s,offset(CFileSND.body)+i*sizeof(I16));
     cnt2-=i;
   }