Nightly update (ISO SHA-1 57e189b)

TempleOSCD/Adam/ADefine.HC

@@ -15,7 +15,7 @@ U0 LoadDocDefines()
   //$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/Adam/Opt/Boot/BootDVD.HC,DD_BOOT_HIGH_LOC_DVD"$
 
 $TR,"LineRep"$
-$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,800");
+$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,845");
 $ID,-2$
   DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR);
   DefinePrint("DD_MP_VECT_END","%08X",

TempleOSCD/Adam/AutoComplete/ACDictGen.HC

@@ -4,8 +4,6 @@ which will regenerate processed dictionary
 files from a raw Project Gutenberg
 dictionary file.
 
-$TX,"http://www.templeos.org/files/DICTIONARY.DD",HTML="http://www.templeos.org/files/DICTIONARY.DD"$
-
 See $LK,"::/Doc/Credits.DD"$.
 */
 

TempleOSCD/Adam/Gr/MakeGr.HC

@@ -14,7 +14,7 @@ Cd(__DIR__);;
 #include "GrBitMap"
 #include "GrPrimatives"
 #include "GrComposites"
-#include "GrMV"
+#include "ScrnCast"
 
 #define SPE_ABORT	(-1)
 #define SPE_EXIT	0

TempleOSCD/Adam/Gr/ScrnCast.HC

@@ -1,4 +1,4 @@
-#help_index "Graphics/Device Contexts;Graphics/GR Files"
+#help_index "ScrnCast;Graphics/Device Contexts;Graphics/GR Files"
 
 #define MV_FILE_MAX	0x007FF000
 
@@ -56,3 +56,41 @@ public I64 GR2MV(U8 *print_fmt="VID%03d.MV",
   DCDel(dc_base);
   return file_num;
 }
+
+#help_index "ScrnCast;Snd/AU Files"
+public U0 SndShift(CSndData *head,F64 dt=0)
+{//Shift CSndData in time.
+  CSndData *tmpsd,*tmpsd1;
+  if (dt) {
+    tmpsd=head->next;
+    while (tmpsd!=head) {
+      tmpsd1=tmpsd->next;
+      tmpsd->tS-=dt;
+      if (tmpsd->tS<tmpsd->last->tS) {
+	QueRem(tmpsd);
+	Free(tmpsd);
+      }
+      tmpsd=tmpsd1;
+    }
+  }
+}
+
+public I64 AUWrite(U8 *filename,CSndData *head,CDate *t0_now,F64 t0_tS)
+{//Write AU file.
+  CSndData *tmpsd;
+  CAUData *base,*dst;
+  I64 size=(1+QueCnt(head))*sizeof(CAUData);
+  U8 *st=ExtDft(filename,"AU");
+  base=dst=MAlloc(size);
+  tmpsd=head;
+  do {
+    dst->cdt=t0_now(I64)+ToI64(CDATE_FREQ*(tmpsd->tS-t0_tS));
+    dst->ona=tmpsd->ona;
+    dst++;
+    tmpsd=tmpsd->next;
+  } while (tmpsd!=head);
+  FileWrite(st,base,dst(U8 *)-base(U8 *));
+  Free(base);
+  Free(st);
+  return size;
+}

TempleOSCD/Adam/Opt/Utils/FileBMP.HC

@@ -1,386 +0,0 @@
-#help_index "Graphics/Windows BMP Files"
-
-#define BMP_COLORS_NUM	16
-
-class CFileBMP
-{
-  U16 type;
-  U32 file_size;
-  U32 reserved;
-  U32 data_offset;
-
-  U32 header_size;
-  U32 width;
-  U32 height;
-  U16 planes;
-  U16 bit_cnt;
-  U32 compression;
-  U32 image_size;
-  U32 x_pixs_per_meter;
-  U32 y_pixs_per_meter;
-  U32 colors_used;
-  U32 important_colors;
-
-  U0 end;
-
-  CBGR24 palette[BMP_COLORS_NUM];
-};
-
-public CFileBMP *BMP4To(CDC *dc)
-{//To Windows 4-bit BMP.
-  U8 *src,*ptr;
-  CBGR48 palette[COLORS_NUM];
-  I64 i,x,y,w=dc->width>>1,
-	size=sizeof(CFileBMP)+dc->width*dc->height>>1;
-  CFileBMP *bmp	=CAlloc(size);
-  bmp->type	='BM';
-  bmp->planes	=1;
-  bmp->file_size=size;
-  bmp->data_offset=sizeof(CFileBMP);
-  bmp->header_size=offset(CFileBMP.end)-offset(CFileBMP.header_size);
-  bmp->width	=dc->width;
-  bmp->height	=dc->height;
-  bmp->bit_cnt	=4;
-  bmp->image_size=dc->width*dc->height>>1;
-  GrPaletteGet(palette);
-#assert COLORS_NUM==BMP_COLORS_NUM
-  for (i=0;i<BMP_COLORS_NUM;i++) {
-    bmp->palette[i].b=palette[i].b>>8;
-    bmp->palette[i].g=palette[i].g>>8;
-    bmp->palette[i].r=palette[i].r>>8;
-    bmp->palette[i].pad=0;
-  }
-  ptr=bmp(U8 *)+bmp->data_offset;
-  for (y=dc->height-1;y>=0;y--) {
-    src=y*dc->width_internal+dc->body;
-    for (x=0;x<w;x++) {
-      *ptr|=(*src++&15)<<4;
-      *ptr|=*src++&15;
-      ptr++;
-    }
-  }
-  return bmp;
-}
-
-public CFileBMP *BMPRLE4To(CDC *dc)
-{//To Windows RLE4 bit BMP.
-  U8 *src,*ptr,*start;
-  I64 i,x,y,w=dc->width,cnt,pattern;
-  CBGR48 palette[COLORS_NUM];
-  CFileBMP *bmp	=CAlloc(sizeof(CFileBMP)+2*(dc->width+1)*dc->height);
-  bmp->type	='BM';
-  bmp->planes	=1;
-  bmp->data_offset=sizeof(CFileBMP);
-  bmp->header_size=offset(CFileBMP.end)-offset(CFileBMP.header_size);
-  bmp->width	=dc->width;
-  bmp->height	=dc->height;
-  bmp->bit_cnt	=4;
-  bmp->compression=2; //RLE4
-  GrPaletteGet(palette);
-#assert COLORS_NUM==BMP_COLORS_NUM
-  for (i=0;i<BMP_COLORS_NUM;i++) {
-    bmp->palette[i].b=palette[i].b>>8;
-    bmp->palette[i].g=palette[i].g>>8;
-    bmp->palette[i].r=palette[i].r>>8;
-    bmp->palette[i].pad=0;
-  }
-  start=ptr=bmp(U8 *)+bmp->data_offset;
-  for (y=dc->height-1;y>=0;y--) {
-    src=y*dc->width_internal+dc->body;
-    x=0;
-    while (x<w) {
-      pattern=(src[0]&15)<<4+src[1]&15;
-      if (x+1<w && src[0]&15==src[1]&15) {
-	src+=2;
-	cnt=2;
-	x+=2;
-	while (x<w && cnt<U8_MAX) {
-	  if (*src&15==pattern&15) {
-	    src++;
-	    cnt++;
-	    x++;
-	  } else
-	    break;
-	}
-      } else {
-	src+=2;
-	if (x+1<w)
-	  cnt=2;
-	else
-	  cnt=1;
-	x+=2;
-      }
-      *ptr++=cnt;
-      *ptr++=pattern;
-    }
-    *ptr(U16 *)++=0;
-  }
-  bmp->image_size=ptr-start;
-  bmp->file_size=sizeof(CFileBMP)+bmp->image_size;
-  return bmp;
-}
-
-public CFileBMP *BMP24To(CDC *dc)
-{//To Windows 24-bit BMP.
-  U8 *src;
-  I64 i,x,y,size=offset(CFileBMP.end)+dc->width*dc->height*sizeof(CBGR24);
-  CBGR24 *bgr;
-  CFileBMP *bmp	=CAlloc(size);
-  bmp->type	='BM';
-  bmp->planes	=1;
-  bmp->file_size=size;
-  bmp->data_offset=offset(CFileBMP.end);
-  bmp->header_size=offset(CFileBMP.end)-offset(CFileBMP.header_size);
-  bmp->width	=dc->width;
-  bmp->height	=dc->height;
-  bmp->bit_cnt	=32;
-  bmp->image_size=dc->width*dc->height<<2;
-
-  bgr=bmp(U8 *)+bmp->data_offset;
-  for (y=dc->height-1;y>=0;y--) {
-    src=y*dc->width_internal+dc->body;
-    for (x=0;x<dc->width;x++) {
-      i=*src++;
-      if (i&BLUE)  bgr->b=0x7F;
-      if (i&GREEN) bgr->g=0x7F;
-      if (i&RED)   bgr->r=0x7F;
-      if (i&8) {
-	if (bgr->b) bgr->b=0xFF;
-	if (bgr->g) bgr->g=0xFF;
-	if (bgr->r) bgr->r=0xFF;
-      }
-      bgr(U8 *)+=4;
-    }
-  }
-  return bmp;
-}
-
-public I64 BMPWrite(U8 *filename,CDC *dc,I64 bits=4)
-{//Window's BMP Files.
-  I64 size;
-  CFileBMP *bmp;
-  if (bits==4) {
-    if (IsDotZ(filename)) //.Z compression is better than RLE
-      bmp=BMP4To(dc);
-    else {
-      bmp=BMPRLE4To(dc);
-      if (bmp->file_size>sizeof(CFileBMP)+dc->width*dc->height>>1) {
-	Free(bmp);
-	bmp=BMP4To(dc);
-      }
-    }
-  } else if (bits==24)
-    bmp=BMP24To(dc);
-  else {
-    "Format Not Supported.\n";
-    return 0;
-  }
-  size=bmp->file_size;
-  FileWrite(filename,bmp,bmp->file_size);
-  Free(bmp);
-  return size;
-}
-
-U8 *BMPPaletteNew(CFileBMP *bmp)
-{
-  I64 i,j,best,score,best_score;
-  CBGR48 palette[COLORS_NUM];
-  U8 *res=CAlloc(BMP_COLORS_NUM*sizeof(U8));
-  GrPaletteGet(palette);
-#assert COLORS_NUM==BMP_COLORS_NUM
-  for (i=0;i<BMP_COLORS_NUM;i++) {
-    best=i;
-    best_score=I64_MAX;
-    for (j=0;j<BMP_COLORS_NUM;j++) {
-      score=SqrI64(bmp->palette[i].r-palette[j].r>>8)+
-	    SqrI64(bmp->palette[i].g-palette[j].g>>8)+
-	    SqrI64(bmp->palette[i].b-palette[j].b>>8);
-      if (score<best_score) {
-	best=j;
-	best_score=score;
-      }
-    }
-    res[i]=best;
-  }
-  return res;
-}
-
-U8 ms_paint_palette[BMP_COLORS_NUM]={0,4,2,6,1,5,3,8,7,12,10,14,9,13,11,15};
-
-I64 BMP24Color(CBGR24 *ptr,Bool dither_probability)
-{
-  I64 res,k;
-  if (dither_probability) {
-    k=RandU32;
-    if (SqrI64(ptr->r)+SqrI64(ptr->g)+SqrI64(ptr->b)>=3*SqrI64(k.u8[0]))
-      res=8;
-    else
-      res=0;
-    if (ptr->r>=k.u8[1]) res|=RED;
-    if (ptr->g>=k.u8[2]) res|=GREEN;
-    if (ptr->b>=k.u8[3]) res|=BLUE;
-  } else {
-    if (SqrI64(ptr->r)+SqrI64(ptr->g)+SqrI64(ptr->b)>=SqrI64(0x80)) {
-      res=8;
-      if (ptr->r>=0x80) res|=RED;
-      if (ptr->g>=0x80) res|=GREEN;
-      if (ptr->b>=0x80) res|=BLUE;
-    } else {
-      res=0;
-      if (ptr->r>=0x40) res|=RED;
-      if (ptr->g>=0x40) res|=GREEN;
-      if (ptr->b>=0x40) res|=BLUE;
-    }
-  }
-  return res;
-}
-
-public CDC *BMPRead(U8 *filename,Bool dither_probability=FALSE,
-	Bool use_ms_paint_palette=FALSE)
-{//Window's BMP Files.
-  I64 i,j,cnt;
-  U8 *palette_map,*ptr;
-  Bool rle;
-  CFileBMP *bmp;
-  CDC *res=NULL;
-  if (ptr=FileRead(filename)) {
-    bmp=ptr;
-    if (0<bmp->width<I32_MAX && 0<bmp->height<I32_MAX) {
-      res=DCNew(bmp->width,bmp->height);
-      ptr+=bmp->data_offset;
-      if (bmp->compression==2)
-	rle=TRUE;
-      else
-	rle=FALSE;
-      if (use_ms_paint_palette)
-	palette_map=ms_paint_palette;
-      else
-	palette_map=BMPPaletteNew(bmp);
-      if (bmp->bit_cnt==4) {
-	for (i=bmp->height-1;i>=0;i--)
-	  if (rle) {//We don't support full RLE4, just our own subset
-	    j=0;
-	    while (cnt=*ptr++) {
-	      if (cnt==1) {
-		res->color=palette_map[*ptr++&15];
-		GrPlot(res,j++,i);
-	      } else {
-		if (cnt==2 && *ptr>>4!=*ptr&15) {
-		  res->color=palette_map[*ptr&15];
-		  GrPlot(res,j+1,i);
-		  res->color=palette_map[*ptr>>4];
-		  GrPlot(res,j,i);
-		  ptr++;
-		  j+=2;
-		} else {
-		  res->color=palette_map[*ptr++&15];
-		  while (cnt--)
-		    GrPlot(res,j++,i);
-		}
-	      }
-	    }
-	    ptr++;
-	  } else
-	    for (j=0;j<(bmp->width+7)&~7;) {
-	      res->color=palette_map[*ptr&15];
-	      GrPlot(res,j+1,i);
-	      res->color=palette_map[*ptr>>4];
-	      GrPlot(res,j,i);
-	      ptr++;
-	      j+=2;
-	    }
-	if (!use_ms_paint_palette)
-	  Free(palette_map);
-      } else if (bmp->bit_cnt==24) {
-	for (i=bmp->height-1;i>=0;i--) {
-	  for (j=0;j<bmp->width;j++,ptr+=3) {
-	    res->color=BMP24Color(ptr,dither_probability);
-	    GrPlot(res,j,i);
-	  }
-	  ptr+=bmp->width&3;
-	}
-	if (!use_ms_paint_palette)
-	  Free(palette_map);
-      } else if (bmp->bit_cnt>=32) {
-	for (i=bmp->height-1;i>=0;i--)
-	  for (j=0;j<bmp->width;j++,ptr+=4) {
-	    res->color=BMP24Color(ptr,dither_probability);
-	    GrPlot(res,j,i);
-	  }
-	if (!use_ms_paint_palette)
-	  Free(palette_map);
-      } else {
-	"Format Not Supported.\n";
-	DCDel(res);
-	res=NULL;
-      }
-    } else
-      "Invalid BMP File\n";
-    Free(bmp);
-  }
-  return res;
-}
-
-#help_index "Graphics/Sprite;Graphics/Windows BMP Files;"\
-	"DolDoc/Output;StdOut/DolDoc"
-public U0 DocBMP(CDoc *doc=NULL,U8 *filename,Bool dither_probability=FALSE,
-	Bool use_ms_paint_palette=FALSE)
-{//Put a BMP file into a document as a sprite.
-  CDC *dc=BMPRead(filename,dither_probability,use_ms_paint_palette);
-  U8 *elems=DC2Sprite(dc);
-  DocSprite(doc,elems);
-  Free(elems);
-  DCDel(dc);
-}
-
-#help_index "Graphics/Windows BMP Files;Graphics/Scrn"
-public I64 BMPScrnCapture(U8 *filename,I64 bits=4,Bool include_zoom=TRUE)
-{//Capture scrn as BMP file.
-  CDC *dc=DCScrnCapture(include_zoom);
-  I64 size=BMPWrite(filename,dc,bits);
-  DCDel(dc);
-  return size;
-}
-
-public I64 GR2BMPLst(U8 *files_find_mask,U8 *fu_flags=NULL,
-	U8 *out_print_fmt="~:/Tmp/VID%05d.BMP.Z",F64 fps=30000.0/1001)
-{/*Cvt movie from GR lst to BMP lst
-"+d" will delete GRLst files.
-*/
-  I64 res=0,fuf_flags=0;
-  CDirEntry *tmpde,*tmpde1;
-  CDC *dc,*base=DCNew(GR_WIDTH,GR_HEIGHT);
-  U8 *st,*last_st;
-  CDate cdt=I64_MIN;
-  Bool old_silent;
-  ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),"+f+F");
-  ScanFlags(&fuf_flags,Define("ST_FILE_UTIL_FLAGS"),fu_flags);
-  tmpde=tmpde1=FilesFind(files_find_mask,fuf_flags&FUG_FILES_FIND);
-  last_st=MStrPrint(out_print_fmt,0);
-  progress1_max=LinkedLstCnt(tmpde);
-  while (tmpde) {
-    dc=GRRead(tmpde->full_name);
-    GrBlot(base,dc->x0,dc->y0,dc);
-    if (cdt==I64_MIN)
-      cdt=dc->cdt;
-    while (cdt<=dc->cdt) {
-      st=MStrPrint(out_print_fmt,res++);
-      BMPWrite(st,base);
-      Free(st);
-      cdt+=CDATE_FREQ/fps;
-    }
-    if (fuf_flags&FUF_DEL) {
-      old_silent=Silent;
-      Del(tmpde->full_name);
-      Silent(old_silent);
-    }
-    DCDel(dc);
-    progress1++;
-    tmpde=tmpde->next;
-  }
-  progress1=progress1_max=0;
-  DirTreeDel(tmpde1);
-  Free(last_st);
-  DCDel(base);
-  return res;
-}

TempleOSCD/Adam/Opt/Utils/MemRep.HC

@@ -136,10 +136,8 @@ Bool MemRepTask(CTask *task,Bool override_validate=FALSE)
   if (task==sys_winmgr_task) {
     "gr.pen_brushes\t:%010X\n",PenBrushesSize;
     "gr.scrn_zoom_tbles\t:%010X\n",ScrnZoomTablesSize;
-    "winmgr.scrn_cast_dc\t:%010X\n",
-	DCSize(winmgr.scrn_cast_dc);
-    "winmgr.dc2_alias\t:%010X\n",
-	DCSize(winmgr.dc2_alias);
+    "scrncast.dc\t:%010X\n",DCSize(scrncast.dc);
+    "scrncast.dc2_alias\t:%010X\n",DCSize(scrncast.dc2_alias);
   } else if (task==adam_task) {
     j=0;k=0;m=0;n=0;
     for (i=0;i<mp_cnt;i++) {

TempleOSCD/Adam/Opt/Utils/TOS.HC

@@ -13,7 +13,7 @@ U0 TOSStaffIns()
   "\nDownload TOS_Supplemental1.ISO.C\tfrom http://www.templeos.org\n";
 
   if (PressAKey!=CH_SHIFT_ESC) {
-    if (HostChgDsk("/home/tad/TOS_Supplemental1.ISO.C"))
+    if (HostChgDsk("/home/tad/Downloads/TOS_Supplemental1.ISO.C"))
       CopyTree("T:/","~/Sup1");
 
     Once("TOSBootHDIns;");

TempleOSCD/Adam/Snd/MakeSnd.HC

@@ -1,21 +0,0 @@
-Cd(__DIR__);;
-
-#help_index "Snd"
-class CSndWaveCtrl
-{
-  I64 sample_rate,sample_bits,channels;
-  F64 freq_multiplier,amp_multiplier;
-  F64 phase,last_y,last_dydt,next_y;
-};
-
-public U0 SndTaskEndCB()
-{//Will turn-off snd when a task gets killed.
-  Snd;
-  Exit;
-}
-
-#include "SndMath"
-#include "SndMusic"
-#include "SndEffects"
-#include "SndFile"
-Cd("..");;

TempleOSCD/Adam/Snd/SndEffects.HC

@@ -1,80 +0,0 @@
-#help_index "Snd"
-
-#define SE_NOISE	0
-#define SE_SWEEP	1
-
-class CSoundEffectFrame
-{
-  I32	type;
-  I8	ona1,ona2;
-  F64	duration;
-};
-
-U0 SoundEffectEndTaskCB()
-{
-  Free(FramePtr("CSoundEffectFrame"));
-  music.mute--;
-  SndTaskEndCB;
-}
-
-U0 SoundEffectTask(CSoundEffectFrame *ns)
-{
-  I64 i,ona;
-  F64 t0=tS,t,timeout=t0+ns->duration;
-  FramePtrAdd("CSoundEffectFrame",ns);
-  Fs->task_end_cb=&SoundEffectEndTaskCB;
-  switch (ns->type) {
-    case SE_NOISE:
-      i=MaxI64(ns->ona2-ns->ona1,1);
-      while (tS<timeout) {
-	ona=RandU16%i+ns->ona1;
-	Snd(ona);
-	t=Clamp(3000.0/Ona2Freq(ona),1.0,50.0);
-	if (t+tS>timeout)
-	  t=timeout-tS;
-	Sleep(t);
-      }
-      break;
-    case SE_SWEEP:
-      while (tS<timeout) {
-	t=(tS-t0)/ns->duration;
-	ona=(1.0-t)*ns->ona1+t*ns->ona2;
-	Snd(ona);
-	t=Clamp(3000.0/Ona2Freq(ona),1.0,50.0);
-	if (t+tS>timeout)
-	  t=timeout-tS;
-	Sleep(t);
-      }
-      break;
-  }
-}
-
-public CTask *Noise(I64 mS,F64 min_ona,F64 max_ona)
-{//Make white noise for given number of mS.
-  CSoundEffectFrame *ns;
-  if (mS>0) {
-    ns=MAlloc(sizeof(CSoundEffectFrame));
-    ns->type=SE_NOISE;
-    ns->duration=mS/1000.0;
-    ns->ona1=min_ona;
-    ns->ona2=max_ona;
-    music.mute++;
-    return Spawn(&SoundEffectTask,ns,"Noise",,Fs);
-  } else
-    return NULL;
-}
-
-public CTask *Sweep(I64 mS,F64 ona1,F64 ona2)
-{//Sweep through freq range in given number of mS.
-  CSoundEffectFrame *ns;
-  if (mS>0) {
-    ns=MAlloc(sizeof(CSoundEffectFrame));
-    ns->type=SE_SWEEP;
-    ns->duration=mS/1000.0;
-    ns->ona1=ona1;
-    ns->ona2=ona2;
-    music.mute++;
-    return Spawn(&SoundEffectTask,ns,"Noise",,Fs);
-  } else
-    return NULL;
-}

TempleOSCD/Adam/Snd/SndFile.HC

@@ -1,137 +0,0 @@
-#help_index "Snd/Snd Files"
-#define SNDFILE_SAMPLE_RATE	8000
-//Header for a ".SND" file
-class CFileSND
-{//big endian
-  U32 signature;    //0x646e732e
-  U32 offset;	   //24
-  U32 data_size;
-  U32 coding;	   //3=16bit uncompressed
-  U32 sample_rate;  //Hz
-  U32 channels;	   //1=mono
-  I16 body[1];
-};
-
-//Windows media constraint.
-//#define SND_FILE_DATA_MAX	0x0007FF00
-#define SND_FILE_DATA_MAX	0x7FFFFF00
-
-public I64 SndFileCreate(U8 *base_filename,F64 normalized_vol=1.0,
-	F64 averaging=0.0,I64 waveform=WF_SQUARE,
-	F64 reverb_delay=0,F64 reverb_intensity=0,F64 time_shift=0)
-{//Use "snd.record" flag to start or stop recording, then call this routine.
-//Averaging should be a num from 0.0 to 0.999.
-  //Vol should be from 0.0 to 1.0.
-  //Set reverb_delay to like 0.3 sec and reverb_intensity to like 0.4.
-  I64 i,i1,k,cnt,cnt2,level,file_num;
-  F64 avg,dt;
-  CFileSND *s;
-  CSndWaveCtrl *swc=SndWaveCtrlNew(SNDFILE_SAMPLE_RATE,16,1);
-  CSndData *d,*d1;
-  U8 *name,*name2;
-
-  snd.record=FALSE;
-
-  dt=snd.record_head.last->time-snd.record_head.next->time;
-  if (!dt) return 0;
-  cnt=dt*SNDFILE_SAMPLE_RATE;
-  cnt++; //Terminator
-
-  name=StrNew(base_filename);
-  FileExtRem(name);
-
-  s=CAlloc(offset(CFileSND.body)+cnt*sizeof(I16));
-  s->signature=0x646e732e;
-  s->offset=EndianU32(offset(CFileSND.body));
-  s->coding=EndianU32(3);
-  s->sample_rate=EndianU32(SNDFILE_SAMPLE_RATE);
-  s->channels=EndianU32(1);
-
-  if (time_shift) {
-    d=snd.record_head.next;
-    d->time-=time_shift;
-    while (d->next!=&snd.record_head) {
-      d1=d->next;
-      dt=d1->time-d->time;
-      if (dt<0) {
-	QueRem(d1);
-	Free(d1);
-      } else
-	break;
-    }
-  }
-
-  d=snd.record_head.next;
-  k=0;
-  i=d->time*SNDFILE_SAMPLE_RATE;
-  while (d->next!=&snd.record_head) {
-    d1=d->next;
-    i1=d1->time*SNDFILE_SAMPLE_RATE;
-    if (i1-i) {
-      SndWaveAddBuf(swc,&s->body[k],i1-i,
-	    Ona2Freq(d->ona),waveform,normalized_vol);
-      k+=i1-i;
-      i=i1;
-    }
-    QueRem(d);
-    Free(d);
-    d=d1;
-  }
-
-  //Average
-  if (averaging) {
-    avg=0;
-    for (i=0;i<cnt-1;i++)
-      s->body[i]=avg=LowPass1(averaging,avg,s->body[i],1.0);
-  }
-
-  //Reverb
-  if (reverb_intensity) {
-    if (dt=reverb_delay*SNDFILE_SAMPLE_RATE)
-      for (i=dt;i<cnt;i++)
-	s->body[i]+=reverb_intensity*s->body[i-dt];
-  }
-
-  //Get rid of D.C. component
-  for (k=0;k<3;k++) {
-    level=0;
-    for (i=0;i<cnt-1;i++)
-      level+=s->body[i];
-    level/=cnt-1;
-    for (i=0;i<cnt-1;i++)
-      s->body[i]=ClampI64(s->body[i]-level,I16_MIN,I16_MAX);
-  }
-
-  for (i=0;i<cnt-1;i++)
-    s->body[i]=EndianU16(s->body[i]);
-
-  s->body[cnt-1]=0;
-
-  d=snd.record_head.next;
-  while (d!=&snd.record_head) {
-    d1=d->next;
-    QueRem(d);
-    Free(d);
-    d=d1;
-  }
-
-  name2=MAlloc(StrLen(name)+3+1+3+1);
-  cnt2=cnt;
-  file_num=0;
-  while (cnt2>0) {
-    i=cnt2;
-    if (i>SND_FILE_DATA_MAX)
-      i=SND_FILE_DATA_MAX;
-    s->data_size=EndianU32(i*sizeof(I16));
-    MemCpy(s->body,&s->body[file_num*SND_FILE_DATA_MAX],i*sizeof(I16));
-    StrPrint(name2,"%s%03d.SND",name,file_num++);
-    FileWrite(name2,s,offset(CFileSND.body)+i*sizeof(I16));
-    cnt2-=i;
-  }
-  Free(s);
-  Free(name);
-  Free(name2);
-
-  SndWaveCtrlDel(swc);
-  return cnt;
-}

TempleOSCD/Adam/Snd/SndMath.HC

@@ -1,248 +0,0 @@
-#help_index "Snd/Math;Math"
-public F64 Saw(F64 t,F64 period)
-{//Sawtooth. 0.0 - 1.0 think "(Sin+1)/2"
-  if (period) {
-    if (t>=0.0)
-      return t%period/period;
-    else
-      return 1.0+t%period/period;
-  } else
-    return 0.0;
-}
-
-public F64 FullSaw(F64 t,F64 period)
-{//Plus&Minus Sawtooth. 1.0 - -1.0 think "Sin"
-  if (period) {
-    if (t>=0.0)
-      return 2.0*(t%period/period)-1.0;
-    else
-      return 2.0*(t%period/period)+1.0;
-  } else
-    return 0.0;
-}
-
-public F64 Caw(F64 t,F64 period)
-{//Cawtooth. 1.0 - 0.0 think "(Cos+1)/2"
-  if (period) {
-    if (t>=0.0)
-      return 1.0-t%period/period;
-    else
-      return -(t%period)/period;
-  } else
-    return 1.0;
-}
-
-public F64 FullCaw(F64 t,F64 period)
-{//Plus&Minus Cawtooth. 1.0 - -1.0 think "Cos"
-  if (period) {
-    if (t>=0.0)
-      return -2.0*(t%period/period)+1.0;
-    else
-      return -2.0*(t%period/period)-1.0;
-  } else
-    return 1.0;
-}
-
-public F64 Tri(F64 t,F64 period)
-{//Triangle waveform. 0.0 - 1.0 - 0.0
-  if (period) {
-    t=2.0*(Abs(t)%period)/period;
-    if (t<=1.0)
-      return t;
-    else
-      return 2.0-t;
-  } else
-    return 0.0;
-}
-
-public F64 FullTri(F64 t,F64 period)
-{//Plus&Minus Triangle waveform. 0.0 - 1.0 - 0.0 - -1.0 -0.0
-  if (period) {
-    t=4.0*(t%period)/period;
-    if (t<=-1.0) {
-      if (t<=-3.0)
-	return t+4.0;
-      else
-	return -2.0-t;
-    } else {
-      if (t<=1.0)
-	return t;
-      else if (t<=3.0)
-	return 2.0-t;
-      else
-	return t-4.0;
-    }
-  } else
-    return 0.0;
-}
-
-#help_index "Snd/Math"
-
-public I8 Note2Ona(I64 note,I64 octave=4)
-{//Note to ona. Mid C is ona=51, note=3 and octave=4.
-  if (note<3)
-    return (octave+1)*12+note;
-  else
-    return octave*12+note;
-}
-
-public I8 Ona2Note(I8 ona)
-{//Ona to note in octave. Mid C is ona=51, note=3 and octave=4.
-  return ona%12;
-}
-
-public I8 Ona2Octave(I8 ona)
-{//Ona to octave. Mid C is ona=51, note=3 and octave=4.
-  I64 note=ona%12,octave=ona/12;
-  if (note<3)
-    return octave-1;
-  else
-    return octave;
-}
-
-F64 SinPhaseCont(F64 last_y,F64 last_dydt,
-		    F64 current_amp,F64 phase_offset)
-{//Next sample of sin waveform.
-  F64 phase;
-  phase=last_y/current_amp;
-  if (phase>1.0) phase=1.0;
-  if (phase<-1.0) phase=-1.0;
-  if (last_dydt<0)
-    phase=ã-ASin(phase);
-  else
-    phase=ASin(phase);
-  return phase-phase_offset;
-}
-
-public CSndWaveCtrl *SndWaveCtrlNew(I64 sample_rate=8000,I64 sample_bits=24,
-  I64 channels=2,CTask *mem_task=NULL)
-{//MAlloc ctrl struct for generating waveforms.
-  CSndWaveCtrl *swc=CAlloc(sizeof(CSndWaveCtrl),mem_task);
-  swc->freq_multiplier=1.0;
-  swc->amp_multiplier=1.0;
-  swc->sample_rate=sample_rate;
-  swc->sample_bits=sample_bits;
-  swc->channels=channels;
-  swc->last_dydt=1.0;
-  return swc;
-}
-
-public U0 SndWaveCtrlDel(CSndWaveCtrl *swc)
-{//Free waveform ctrl.
-  Free(swc);
-}
-
-#define WF_NULL			0
-#define WF_SQUARE		1
-#define WF_SINE			2
-#define WF_TRI			3
-#define WF_SAWTOOTH		4
-#define WF_NOISE		5
-#define WF_WAVEFORMS_NUM	6
-
-public U0 SndWaveAddBuf(CSndWaveCtrl *swc,U8 *buf,I64 num_samples,
-  F64 _freq,I64 _waveform=WF_SQUARE,F64 _amp=1.0,F64 _left=1.0, F64 _right=1.0)
-{//Add waveform to buffer.
-//num_samples is multiplied by channels to get buf_len.
-  //left,right range from 0.0-1.0
-  //Supports 16,24 and 32 bits
-  I64 reg i,reg j,reg k;
-  F64 a,f,amp,reg phase;
-  if (!swc) return;
-  _freq*=swc->freq_multiplier;
-  _amp*=swc->amp_multiplier;
-  if (!_freq||!_amp) {
-    swc->last_y=swc->phase=0;
-    swc->last_dydt=1.0;
-  } else {
-    phase=swc->phase;
-    i=0;
-    amp=Min(I32_MAX,I32_MAX*_amp);
-    f=2*ã/swc->sample_rate*_freq;
-    switch (_waveform) {
-      case WF_NOISE:
-	a=2.0/ã*amp;
-	break;
-      case WF_SAWTOOTH:
-	a=amp/ã;
-	break;
-      case WF_SINE:
-	phase=SinPhaseCont(swc->last_y,swc->last_dydt,amp,0.0);
-	break;
-    }
-    while (phase<0)
-      phase+=2*ã;
-    while (phase>=2*ã)
-      phase-=2*ã;
-    num_samples*=swc->channels;
-    while (i<num_samples) {
-      switch (_waveform) {
-	case WF_SQUARE:
-	  if (phase>=ã)
-	    j=-amp;
-	  else
-	    j=amp;
-	  break;
-	case WF_SINE:
-	  j=amp*Sin(phase);
-	  break;
-	case WF_TRI:
-	  if (phase>=ã) {
-	    swc->last_y=swc->next_y;
-	    swc->next_y=-amp*Sign(swc->last_y)+.00001;
-	    phase-=ã;
-	  }
-	  j=(swc->last_y*(ã-phase)+swc->next_y*phase)/ã;
-	  break;
-	case WF_SAWTOOTH:
-	  j=a*(phase-ã);
-	  break;
-	case WF_NOISE:
-	  if (phase<ã) {
-	    if (phase<f) {
-	      swc->last_y=swc->next_y;
-	      swc->next_y=a*RandI16/U16_MAX;
-	    }
-	    j=swc->last_y*(ã-phase)+swc->next_y*phase;
-	  } else {
-	    if (phase-ã<f) {
-	      swc->last_y=swc->next_y;
-	      swc->next_y=a*RandI16/U16_MAX;
-	    }
-	    j=swc->last_y*(2.0*ã-phase)+swc->next_y*(phase-ã);
-	  }
-	  break;
-      }
-//left channel
-      k=j*_left;
-      if (swc->sample_bits==16) {
-	k>>=16;
-	buf(I16 *)[i++]+=k;
-      } else {
-	if (swc->sample_bits==24)
-	  k&=0xFFFFFF00;
-	buf(I32 *)[i++]+=k;
-      }
-//right channel
-      if (swc->channels==2) {
-	k=j*_right;
-	if (swc->sample_bits==16) {
-	  k>>=16;
-	  buf(I16 *)[i++]+=k;
-	} else {
-	  if (swc->sample_bits==24)
-	    k&=0xFFFFFF00;
-	  buf(I32 *)[i++]+=k;
-	}
-      }
-      phase+=f;
-      while (phase>=2*ã)
-	phase-=2*ã;
-    }
-    if (_waveform==WF_SINE) {
-      swc->last_y=amp*Sin(phase);
-      swc->last_dydt=Cos(phase);
-    }
-    swc->phase=phase;
-  }
-}

TempleOSCD/Adam/Snd/SndMusic.HC

@@ -1,224 +0,0 @@
-#help_index "Snd/Music"
-
-public class CMusicGlbls
-{
-  U8	*cur_song;
-  CTask	*cur_song_task;
-  I64	octave;
-  F64	note_len;
-  U8	note_map[7];
-  Bool	mute;
-  I64	meter_top,meter_bottom;
-  F64	tempo,stacatto_factor;
-
-  //If you wish to sync with a
-  //note in a Play() string.  0 is the start
-  I64	play_note_num;
-
-  F64	tM_correction,last_Beat,last_tM;
-} music={NULL,NULL,4,1.0,{0,2,3,5,7,8,10},FALSE,4,4,2.5,0.9,0,0,0,0};
-
-#help_index "Snd/Music;Time/Seconds"
-public F64 tM()
-{//Time in seconds synced to music subsystem.
-  return (cnts.jiffies+music.tM_correction)/JIFFY_FREQ;
-}
-
-public F64 Beat()
-{//Time in music beats.
-  F64 res,cur_tM;
-  PUSHFD
-  CLI
-  if (mp_cnt>1)
-    while (LBts(&sys_semas[SEMA_TMBEAT],0))
-      PAUSE
-  cur_tM=tM;
-  res=music.last_Beat;
-  if (music.tempo)
-    res+=(cur_tM-music.last_tM)*music.tempo;
-  music.last_tM=cur_tM;
-  music.last_Beat=res;
-  LBtr(&sys_semas[SEMA_TMBEAT],0);
-  POPFD
-  return res;
-}
-
-#help_index "Snd/Music"
-U8 *MusicSetOctave(U8 *st)
-{
-  I64 ch;
-  ch=*st++;
-  while ('0'<=ch<='9') {
-    music.octave=ch-'0';
-    ch=*st++;
-  }
-  return --st;
-}
-
-U8 *MusicSetMeter(U8 *st)
-{
-  I64 ch;
-  ch=*st++;
-  while (ch=='M') {
-    ch=*st++;
-    if ('0'<=ch<='9') {
-      music.meter_top=ch-'0';
-      ch=*st++;
-    }
-    if (ch=='/')
-      ch=*st++;
-    if ('0'<=ch<='9') {
-      music.meter_bottom=ch-'0';
-      ch=*st++;
-    }
-  }
-  return --st;
-}
-
-U8 *MusicSetNoteLen(U8 *st)
-{
-  Bool cont=TRUE;
-  do {
-    switch (*st++) {
-      case 'w': music.note_len=4.0;  break;
-      case 'h': music.note_len=2.0;  break;
-      case 'q': music.note_len=1.0;  break;
-      case 'e': music.note_len=0.5;   break;
-      case 's': music.note_len=0.25;   break;
-      case 't': music.note_len=2.0*music.note_len/3.0; break;
-      case '.': music.note_len=1.5*music.note_len; break;
-      default:
-	st--;
-	cont=FALSE;
-    }
-  } while (cont);
-  return st;
-}
-
-public U0 Play(U8 *st,U8 *words=NULL)
-{/* Notes are entered with a capital letter.
-
-Octaves are entered with a digit and
-stay set until changed.  Mid C is octave 4.
-
-Durations are entered with
-'w' whole note
-'h' half note
-'q' quarter note
-'e' eighth note
-'t' sets to 2/3rds the current duration
-'.' sets to 1.5 times the current duration
-durations stay set until changed.
-
-'(' tie, placed before the note to be extended
-
-$LK,"music.meter_top",A="MN:CMusicGlbls"$,$LK,"music.meter_bottom",A="MN:CMusicGlbls"$ is set with
-"M3/4"
-"M4/4"
-etc.
-
-Sharp and flat are done with '#' or 'b'.
-
-The var music.stacatto_factor can
-be set to a range from 0.0 to 1.0.
-
-The var music.tempo is quarter-notes
-per second.  It defaults to
-2.5 and gets faster when bigger.
-*/
-  U8 *word,*last_st;
-  I64 note,octave,i=0,ona,timeout_val,timeout_val2;
-  Bool tie;
-  F64 d,on_jiffies,off_jiffies;
-  music.play_note_num=0;
-  while (*st) {
-    timeout_val=cnts.jiffies;
-    tie=FALSE;
-
-    do {
-      last_st=st;
-      if (*st=='(') {
-	tie=TRUE;
-	st++;
-      } else {
-	st=MusicSetMeter(st);
-	st=MusicSetOctave(st);
-	st=MusicSetNoteLen(st);
-      }
-    } while (st!=last_st);
-
-    if (!*st) break;
-    note=*st++-'A';
-    if (note<7) {
-      note=music.note_map[note];
-      octave=music.octave;
-      if (*st=='b') {
-	note--;
-	if (note==2)
-	  octave--;
-	st++;
-      } else if (*st=='#') {
-	note++;
-	if (note==3)
-	  octave++;
-	st++;
-      }
-      ona=Note2Ona(note,octave);
-    } else
-      ona=ONA_REST;
-    if (words && (word=LstSub(i++,words)) && StrCmp(word," "))
-      "%s",word;
-    d=JIFFY_FREQ*music.note_len/music.tempo;
-    if (tie) {
-      on_jiffies  =d;
-      off_jiffies =0;
-    } else {
-      on_jiffies  =d*music.stacatto_factor;
-      off_jiffies =d*(1.0-music.stacatto_factor);
-    }
-    timeout_val+=on_jiffies;
-    timeout_val2=timeout_val+off_jiffies;
-
-    if (!music.mute)
-      Snd(ona);
-    SleepUntil(timeout_val);
-    music.tM_correction+=on_jiffies-ToI64(on_jiffies);
-
-    if (!music.mute)
-      Snd;
-    SleepUntil(timeout_val2);
-    music.tM_correction+=off_jiffies-ToI64(off_jiffies);
-
-    music.play_note_num++;
-  }
-}
-
-U0 MusicSettingsRst()
-{
-  music.play_note_num=0;
-  music.stacatto_factor=0.9;
-  music.tempo=2.5;
-  music.octave=4;
-  music.note_len=1.0;
-  music.meter_top=4;
-  music.meter_bottom=4;
-  SndRst;
-  PUSHFD
-  CLI
-  if (mp_cnt>1)
-    while (LBts(&sys_semas[SEMA_TMBEAT],0))
-      PAUSE
-  music.last_tM=tM;
-  music.last_Beat=0.0;
-  LBtr(&sys_semas[SEMA_TMBEAT],0);
-  POPFD
-}
-
-MusicSettingsRst;
-
-U0 CurSongTask()
-{
-  Fs->task_end_cb=&SndTaskEndCB;
-  while (TRUE)
-    Play(music.cur_song);
-}

TempleOSCD/Adam/Win.HC

@@ -6,8 +6,7 @@ CMsStateGlbls old_ms={{-1000,-1000,0},{-1000,-1000,0},{-1000,-1000,0},
   FALSE,FALSE,TRUE,FALSE,FALSE,FALSE,FALSE,FALSE
 };
 
-public CWinMgrGlbls winmgr={0,0,0,WINMGR_FPS,tS,tS,NULL,
-	Now,tS,NULL,NULL,NULL,FALSE,FALSE,FALSE,FALSE};
+public CWinMgrGlbls winmgr={0,0,0,WINMGR_FPS,tS,tS,NULL,FALSE,FALSE,FALSE};
 winmgr.t=CAlloc(sizeof(CWinMgrTimingGlbls));
 winmgr.t->last_calc_idle_time=tS;
 

TempleOSCD/Adam/WinMgr.HC

@@ -31,24 +31,6 @@ public U0 Refresh(I64 cnt=1,Bool force=FALSE)
   LBEqu(&Fs->task_flags,TASKf_IDLE,old_idle);
 }
 
-#help_index "Windows;Cmd Line (Typically)"
-
-public Bool ScrnCast(Bool val=ON,U8 *print_fmt="B:/Tmp/%X.GR")
-{//WinMgr saves GR files to a dir.
-  Bool old_val;
-  if (val) {
-    if (!(old_val=LBtr(&winmgr.scrn_cast,0))) {
-      Free(winmgr.scrn_cast_print_fmt);
-      winmgr.scrn_cast_print_fmt=AStrNew(print_fmt);
-      winmgr.scrn_cast_now=Now;
-      winmgr.scrn_cast_tS=tS;
-      LBts(&winmgr.scrn_cast,0);
-    }
-  } else
-    old_val=LBtr(&winmgr.scrn_cast,0);
-  return old_val;
-}
-
 #help_index "Windows"
 
 I64 WinQueIPMsgs(Bool que)
@@ -288,28 +270,28 @@ I64 WinMgrSleep(Bool flush_msgs=FALSE)
     LBts(&sys_semas[SEMA_REFRESH_IN_PROGRESS],0);
     GrUpdateScrn;
     LBtr(&sys_semas[SEMA_REFRESH_IN_PROGRESS],0);
-    if (winmgr.scrn_cast) {
-      cdt=winmgr.scrn_cast_now+ToI64(CDATE_FREQ*(tS-winmgr.scrn_cast_tS));
-      if (!winmgr.scrn_cast_dc) {
-	winmgr.scrn_cast_dc=DCCopy(winmgr.dc2_alias);
-	winmgr.scrn_cast_dc->cdt=cdt;
-	st=MStrPrint(winmgr.scrn_cast_print_fmt,cdt);
-	GRWrite(st,winmgr.scrn_cast_dc);
+    if (scrncast.record  && !scrncast.just_audio) {
+      cdt=scrncast.t0_now(I64)+ToI64(CDATE_FREQ*(tS-scrncast.t0_tS));
+      if (!scrncast.dc) {
+	scrncast.dc=DCCopy(scrncast.dc2_alias);
+	scrncast.dc->cdt=cdt;
+	st=MStrPrint(scrncast.print_fmt,cdt);
+	GRWrite(st,scrncast.dc);
 	Free(st);
-      } else if (MemCmp(winmgr.scrn_cast_dc->body,
-	    winmgr.dc2_alias->body,MSize(winmgr.dc2_alias->body))) {
-	diff=DCDiff(winmgr.scrn_cast_dc,winmgr.dc2_alias);
+      } else if (MemCmp(scrncast.dc->body,
+	    scrncast.dc2_alias->body,MSize(scrncast.dc2_alias->body))) {
+	diff=DCDiff(scrncast.dc,scrncast.dc2_alias);
 	diff->cdt=cdt;
-	st=MStrPrint(winmgr.scrn_cast_print_fmt,cdt);
+	st=MStrPrint(scrncast.print_fmt,cdt);
 	GRWrite(st,diff);
 	Free(st);
 	DCDel(diff);
-	Free(winmgr.scrn_cast_dc->body);
-	winmgr.scrn_cast_dc->body=MAllocIdent(winmgr.dc2_alias->body);
+	Free(scrncast.dc->body);
+	scrncast.dc->body=MAllocIdent(scrncast.dc2_alias->body);
       }
-    } else if (winmgr.scrn_cast_dc) {
-      DCDel(winmgr.scrn_cast_dc); //TODO: $LK,"MemRep",A="MN:MemRep"$ can crash.
-      winmgr.scrn_cast_dc=NULL;
+    } else if (scrncast.dc) {
+      DCDel(scrncast.dc); //TODO: $LK,"MemRep",A="MN:MemRep"$ can crash.
+      scrncast.dc=NULL;
     }
     if (sys_focus_task && !Bt(&sys_focus_task->task_flags,TASKf_HAS_SONG)) {
       Free(music.cur_song);
@@ -450,7 +432,7 @@ U0 WinMgrTask(I64)
   gr.dc->win_task=Fs;
   Fs->win_inhibit&=~WIF_SELF_CTRLS;
   GrSetUpTables;
-  winmgr.dc2_alias=DCAlias(gr.dc2);
+  scrncast.dc2_alias=DCAlias(gr.dc2);
   WinZBufUpdate;
   LBts(&sys_run_level,RLf_WINMGR);
   while (TRUE) {