diff --git a/TempleOSCD/0000Boot/0000Kernel.BIN.C b/TempleOSCD/0000Boot/0000Kernel.BIN.C index 1640f89..ba5aeff 100644 Binary files a/TempleOSCD/0000Boot/0000Kernel.BIN.C and b/TempleOSCD/0000Boot/0000Kernel.BIN.C differ diff --git a/TempleOSCD/Adam/ADefine.HC b/TempleOSCD/Adam/ADefine.HC index f4e2ba4..2517b47 100644 --- a/TempleOSCD/Adam/ADefine.HC +++ b/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","81,445"); +$ID,2$DefinePrint("DD_TEMPLEOS_LOC","80,800"); $ID,-2$ DefinePrint("DD_MP_VECT","%08X",MP_VECT_ADDR); DefinePrint("DD_MP_VECT_END","%08X", diff --git a/TempleOSCD/Adam/AExts.HC b/TempleOSCD/Adam/AExts.HC index 9006192..7e63cf8 100644 --- a/TempleOSCD/Adam/AExts.HC +++ b/TempleOSCD/Adam/AExts.HC @@ -5,13 +5,10 @@ extern U0 ACFillIn(I64 n); extern U0 ACMan(I64 n,CTask *parent_task=NULL); extern I64 AdamFile(U8 *filename,Bool warn_ext=TRUE); extern Bool AutoComplete(Bool val=OFF); -extern I64 BMPWrite(U8 *filename,CDC *dc,I64 bits=4); extern U0 ClipDel(); extern CCtrl *CtrlFindUnique(CTask *haystack_task,I64 needle_type); extern Bool CtrlInside(CCtrl *c,I64 x,I64 y); extern U8 *DC2Sprite(CDC *tmpb); -extern U0 DocBMP(CDoc *doc=NULL,U8 *filename, - Bool dither_probability=FALSE,Bool use_ms_paint_palette=FALSE); extern U0 DocBinDel(CDoc *doc,CDocBin *b); extern U0 DocBinsValidate(CDoc *doc); extern U0 DocBottom(CDoc *doc=NULL); diff --git a/TempleOSCD/Adam/ASnd.HC b/TempleOSCD/Adam/ASnd.HC new file mode 100644 index 0000000..fa6bf00 --- /dev/null +++ b/TempleOSCD/Adam/ASnd.HC @@ -0,0 +1,412 @@ +#help_index "Snd" +public U0 SndTaskEndCB() +{//Will turn-off snd when a task gets killed. + Snd; + Exit; +} + +#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/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 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; +} + +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); +} + +#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 (tSona1; + 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 (tSduration; + 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; +} diff --git a/TempleOSCD/Adam/DolDoc/DocFile.HC b/TempleOSCD/Adam/DolDoc/DocFile.HC index a524ecf..ae5bdc3 100644 --- a/TempleOSCD/Adam/DolDoc/DocFile.HC +++ b/TempleOSCD/Adam/DolDoc/DocFile.HC @@ -296,8 +296,7 @@ U0 DocUndoRestore(CDoc *doc) DocUnlock(doc); } -#help_index "Graphics/Windows BMP Files;Graphics/GR Files;"\ - "DolDoc/Output;StdOut/DolDoc" +#help_index "Graphics/GR Files;DolDoc/Output;StdOut/DolDoc" public Bool DocType(CDoc *doc=NULL,U8 *filename,I64 trailing_new_lines=1) {//Output txt or graphic file to document. Bool res=FALSE; @@ -311,12 +310,6 @@ public Bool DocType(CDoc *doc=NULL,U8 *filename,I64 trailing_new_lines=1) DocDump(doc2,100000); DocDel(doc2); res=TRUE; - } else if (FilesFindMatch(filename,"*.BMP.Z")) { - DocBMP(doc,filename,,FALSE); - res=TRUE; - } else if (FilesFindMatch(filename,"*.BMP;*.bmp")) { - DocBMP(doc,filename,,TRUE); - res=TRUE; } else if (FilesFindMatch(filename,"*.GR*")) { DocGR(doc,filename); res=TRUE; @@ -326,7 +319,7 @@ public Bool DocType(CDoc *doc=NULL,U8 *filename,I64 trailing_new_lines=1) return res; } -#help_index "Graphics/Windows BMP Files;Graphics/GR Files;"\ +#help_index "Graphics/GR Files;"\ "File/Cmd Line (Typically);DolDoc/Cmd Line (Typically);"\ "StdOut;Cmd Line (Typically)" public Bool Type(U8 *filename,I64 trailing_new_lines=1) diff --git a/TempleOSCD/Adam/Gr/GrDC.HC b/TempleOSCD/Adam/Gr/GrDC.HC index 3e66d38..0238d6e 100644 --- a/TempleOSCD/Adam/Gr/GrDC.HC +++ b/TempleOSCD/Adam/Gr/GrDC.HC @@ -376,6 +376,10 @@ public CDC *DCLoad(U8 *src,I64 *_size=NULL,CTask *task=NULL) #help_index "Graphics/GR Files" #help_file "::/Doc/GRFiles" #help_index "Graphics/Device Contexts;Graphics/GR Files" + +#define GR_FILE_MAX (offset(CDC.end)-offset(CDC.start)+\ + COLORS_NUM*sizeof(CBGR48)+sizeof(CArcCtrl)+GR_WIDTH*GR_HEIGHT) + public I64 GRWrite(U8 *filename,CDC *dc,I64 dcsf_flags=DCSF_COMPRESSED) {//TempleOS GR File. I64 size; diff --git a/TempleOSCD/Adam/Gr/GrMV.HC b/TempleOSCD/Adam/Gr/GrMV.HC new file mode 100644 index 0000000..5ef3639 --- /dev/null +++ b/TempleOSCD/Adam/Gr/GrMV.HC @@ -0,0 +1,58 @@ +#help_index "Graphics/Device Contexts;Graphics/GR Files" + +#define MV_FILE_MAX 0x007FF000 + +public I64 GR2MV(U8 *print_fmt="VID%03d.MV", + U8 *files_find_mask,U8 *fu_flags=NULL) +{/*Merge GR lst to MV file. +"+d" will delete GR list files. +*/ + I64 fuf_flags=0,file_num=0,size; + CDirEntry *tmpde,*tmpde1; + U8 *base,*dst,*src,*st; + CDC *dc,*dc_base=DCNew(GR_WIDTH,GR_HEIGHT); + CDate cdt; + 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); + if (progress1_max=LinkedLstCnt(tmpde1)) { + dst=base=MAlloc(MV_FILE_MAX); + while (tmpde) { + dc=GRRead(tmpde->full_name); + GrBlot(dc_base,dc->x0,dc->y0,dc); + if (dst+GR_FILE_MAX>base+MV_FILE_MAX) { + st=MStrPrint(print_fmt,file_num++); + FileWrite(st,base,dst-base); + Free(st); + dst=base; + + cdt=dc->cdt; + dc=DCCopy(dc_base); + dc->cdt=cdt; + } + src=DCSave(dc,&size); + DCDel(dc); + MemCpy(dst,src,size); + dst+=size; + Free(src); + if (fuf_flags&FUF_DEL) { + old_silent=Silent; + Del(tmpde->full_name); + Silent(old_silent); + } + progress1++; + tmpde=tmpde->next; + } + if (dst>base) { + st=MStrPrint(print_fmt,file_num++); + FileWrite(st,base,dst-base); + Free(st); + } + Free(base); + } + progress1=progress1_max=0; + DirTreeDel(tmpde1); + DCDel(dc_base); + return file_num; +} diff --git a/TempleOSCD/Adam/Gr/MakeGr.HC b/TempleOSCD/Adam/Gr/MakeGr.HC index f0008c9..4437052 100644 --- a/TempleOSCD/Adam/Gr/MakeGr.HC +++ b/TempleOSCD/Adam/Gr/MakeGr.HC @@ -14,6 +14,7 @@ Cd(__DIR__);; #include "GrBitMap" #include "GrPrimatives" #include "GrComposites" +#include "GrMV" #define SPE_ABORT (-1) #define SPE_EXIT 0 diff --git a/TempleOSCD/Adam/Gr/SpriteBitMap.HC b/TempleOSCD/Adam/Gr/SpriteBitMap.HC index 4e8f169..4185842 100644 --- a/TempleOSCD/Adam/Gr/SpriteBitMap.HC +++ b/TempleOSCD/Adam/Gr/SpriteBitMap.HC @@ -26,8 +26,7 @@ #define SPBM_ADD_OUTLINE 23 #define SPBM_ETCH 24 #define SPBM_UNDO 25 -#define SPBM_SAVE_BMP 26 -#define SPBM_SAVE_GRA 27 +#define SPBM_SAVE_GR 26 U0 GrInit4() { @@ -36,7 +35,7 @@ U0 GrInit4() "Rect\0Circle\0Text\0Text Box\0Text Diamond\0Flood Fill\0" "Flood Fill Not Color\0PolyLine\0PolyPoint\0Copy\0Delete\0Paste\0" "Paste Transparent\0Find and Replace\0Trim to Extents\0Add Outline\0" - "Etch\0Undo\0Save BMP\0Save GR\0"); + "Etch\0Undo\0Save GR\0"); } GrInit4; @@ -79,8 +78,7 @@ I64 PopUpSpriteBitMap(CColorROPU32 color,I64 width) "$$MU-UL,\"Delete to Clip\",LE=SPBM_DELETE$$\n" "$$MU-UL,\"Paste Clip\",LE=SPBM_PASTE$$\n" "$$MU-UL,\"Paste Transparent Clip\",LE=SPBM_PASTE_TRANSPARENT$$\n" - "\n$$MU-UL,\"Save BMP File\",LE=SPBM_SAVE_BMP$$\n" - "$$MU-UL,\"Save GR File\",LE=SPBM_SAVE_GRA$$\n" + "\n$$MU-UL,\"Save GR File\",LE=SPBM_SAVE_GR$$\n" "\n$$MU-UL,\"Undo\",LE=SPBM_UNDO$$\n" "\n$$PURPLE$$$$MU-UL,\"+] Sprite Main Menu\",LE=SPBM_MAIN_MENU$$$$LTBLUE$$\n" "$$MU-UL,\"Exit Sprite\",LE=SPBM_EXIT$$\n" @@ -293,12 +291,7 @@ bm_menu: GrBitMapEdPrepPersistentDC(dc,xx1,yy1,img); } goto bm_menu; - case SPBM_SAVE_BMP: - *filename.name=0; - if (DocForm(&filename) && *filename.name) - BMPWrite(filename.name,img); - goto bm_menu; - case SPBM_SAVE_GRA: + case SPBM_SAVE_GR: *filename.name=0; if (DocForm(&filename) && *filename.name) GRWrite(filename.name,img,DCSF_COMPRESSED|DCSF_PALETTE_GET); diff --git a/TempleOSCD/Adam/MakeAdam.HC b/TempleOSCD/Adam/MakeAdam.HC index 8b5c2f7..2d5ca21 100644 --- a/TempleOSCD/Adam/MakeAdam.HC +++ b/TempleOSCD/Adam/MakeAdam.HC @@ -6,7 +6,7 @@ Cd(__DIR__);; #include "TaskRep" #include "AMathODE" #include "Gr/MakeGr" -#include "Snd/MakeSnd" +#include "ASnd" #include "ABlkDev/MakeABlkDev" #include "Menu" #include "Win" diff --git a/TempleOSCD/Adam/Opt/Utils/MakeUtils.HC b/TempleOSCD/Adam/Opt/Utils/MakeUtils.HC index 15b9e11..27d3a46 100644 --- a/TempleOSCD/Adam/Opt/Utils/MakeUtils.HC +++ b/TempleOSCD/Adam/Opt/Utils/MakeUtils.HC @@ -1,6 +1,5 @@ Cd(__DIR__);; #include "Diff" -#include "FileBMP" #include "Find" #include "HeapLog" #include "LineRep" diff --git a/TempleOSCD/Adam/WinMgr.HC b/TempleOSCD/Adam/WinMgr.HC index 47a9f49..5c9cc5f 100644 --- a/TempleOSCD/Adam/WinMgr.HC +++ b/TempleOSCD/Adam/WinMgr.HC @@ -35,7 +35,7 @@ public U0 Refresh(I64 cnt=1,Bool force=FALSE) public Bool ScrnCast(Bool val=ON,U8 *print_fmt="B:/Tmp/%X.GR") {//WinMgr saves GR files to a dir. - Bool old_val,old_silent=Silent; + Bool old_val; if (val) { if (!(old_val=LBtr(&winmgr.scrn_cast,0))) { Free(winmgr.scrn_cast_print_fmt); @@ -46,7 +46,6 @@ public Bool ScrnCast(Bool val=ON,U8 *print_fmt="B:/Tmp/%X.GR") } } else old_val=LBtr(&winmgr.scrn_cast,0); - Silent(old_silent); return old_val; } diff --git a/TempleOSCD/Apps/Psalmody/Help.DD b/TempleOSCD/Apps/Psalmody/Help.DD index 9e90edb..a79f735 100644 --- a/TempleOSCD/Apps/Psalmody/Help.DD +++ b/TempleOSCD/Apps/Psalmody/Help.DD @@ -11,14 +11,3 @@ $WW,1$$FG,5$$TX+CX,"Psalmody Help"$$FG$ * You can take the $LK,"Play",A="MN:Play"$() stmts out of a song file and place them in your programs. You can also add a song to a document with $FG,2$$FG$, but you should do it after pressing $FG,2$$FG$ because the clip-insert in $FG,2$$FG$ is screwy. See this $SO,"",A="4qG5EC4BeGG5qCeFD4sB5G4B5G4qG5EC4BeGG5qCeFD4sB5G4B5GqEeEFqE4BeG5FetC4A5GqFCEeEFqE4BeG5FetC4A5GqFC"$ after pressing $FG,2$$FG$, now. * You can call $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.HC,JukeBox"$("~/Psalmody"); to play your songs. - -* To create a $FG,2$.SND$FG$ file which can be exported and played under Windows, set the $FG,2$Bool$FG$ $LK,"snd.record",A="MN:CSndGlbls"$ to $FG,2$TRUE$FG$, play music, and set it to $FG,2$FALSE$FG$. Then, call $LK,"SndFileCreate",A="MN:SndFileCreate"$(). You might wish to make a $FG,2$$FG$ to toggle this system level recording feat. See $LK,"Snd",A="MN:Snd"$(). Add this code to your $LK,"~/HomeKeyPlugIns.HC"$ file. - -$FG,5$U0 CtrlAltR(I64) -{ - snd.record=!snd.record; -} -CtrlAltCBSet('R',&CtrlAltR,"Cmd /Toggle snd.record");$FG$ - -* When calling $LK,"SndFileCreate",A="MN:SndFileCreate"$() you can set a waveform. The PC speaker is $LK,"WF_SQUARE",A="MN:WF_SQUARE"$. You can sel reverb and averaging, also. - diff --git a/TempleOSCD/Apps/Psalmody/JukePuppet.HC b/TempleOSCD/Apps/Psalmody/JukePuppet.HC index 7a5f35c..8f6ccb1 100644 --- a/TempleOSCD/Apps/Psalmody/JukePuppet.HC +++ b/TempleOSCD/Apps/Psalmody/JukePuppet.HC @@ -71,7 +71,7 @@ U0 JukeSongPuppet(CTask *juke_task,I64 passes,I64 song_num,U8 *name) } public U0 JukeSongsPuppet(U8 *dirname="~/Psalmody",I64 passes=2, - I64 start_song=0,I64 end_song=I64_MAX,F64 start_delay=0) + I64 start_song=0,I64 end_song=I64_MAX) {//Help make music video by puppeting JukeBox task. I64 i; CDirEntry *tmpde,*tmpde1; @@ -80,7 +80,6 @@ public U0 JukeSongsPuppet(U8 *dirname="~/Psalmody",I64 passes=2, tmpde1=FilesFind("*",FUF_RECURSE|FUF_JUST_TXT|FUF_JUST_FILES); for (tmpde=tmpde1,i=0;tmpde && inext; - Sleep(start_delay*1000); for (i=start_song;tmpde && iname); tmpde=tmpde->next; diff --git a/TempleOSCD/Compiler/Compiler.BIN b/TempleOSCD/Compiler/Compiler.BIN index 36f65e7..fdfb941 100644 Binary files a/TempleOSCD/Compiler/Compiler.BIN and b/TempleOSCD/Compiler/Compiler.BIN differ diff --git a/TempleOSCD/Compiler/CompilerB.HH b/TempleOSCD/Compiler/CompilerB.HH index 166cd12..989e1f4 100644 --- a/TempleOSCD/Compiler/CompilerB.HH +++ b/TempleOSCD/Compiler/CompilerB.HH @@ -72,6 +72,7 @@ public extern U0 Ui(U8 *buf,U8 **_rip,I64 seg_size=64, I64 *_jmp_dst=NULL,Bool just_ins=FALSE); public extern I64 Un(U8 *rip,I64 cnt=0x80,I64 seg_size=64); extern CUAsmGlbls uasm; + #help_index "Hash/System" public extern I64 HashEntrySize(CHashSrcSym *tmph); public extern I64 HashEntrySize2(CHashSrcSym *tmph); diff --git a/TempleOSCD/Demo/AcctExample/HomeKeyPlugIns.HC b/TempleOSCD/Demo/AcctExample/HomeKeyPlugIns.HC index 2286cca..ddc25d6 100644 --- a/TempleOSCD/Demo/AcctExample/HomeKeyPlugIns.HC +++ b/TempleOSCD/Demo/AcctExample/HomeKeyPlugIns.HC @@ -156,12 +156,16 @@ Bool MyPutKey(I64 ch,I64 sc) case 'f': //With sync if (sc&SCF_KEY_DESC) KeyDescSet("Cmd /FrameGrabber Sync"); + else if (fg_on) + FrameGrabberToggle(FALSE,FALSE,FALSE); else FrameGrabberToggle(TRUE,FALSE,FALSE); return TRUE; case 'F': //With sync and intro TOS theme if (sc&SCF_KEY_DESC) KeyDescSet("Cmd /FrameGrabber Intro"); + else if (fg_on) + FrameGrabberToggle(FALSE,FALSE,TRUE); else FrameGrabberToggle(TRUE,TRUE,FALSE); return TRUE; @@ -220,6 +224,20 @@ Bool MyPutKey(I64 ch,I64 sc) "$$AN,\"\",A=\"ANC%d\"$$",i; } return TRUE; + case 'p': + if (sc&SCF_KEY_DESC) + KeyDescSet("Cmd /JukeBox"); + else + PopUp("#include \"::/Apps/Psalmody/Load\";" + "JukeBox(\"::/Home/Sup1/Sup1Hymns\");"); + return TRUE; + case 'P': + if (sc&SCF_KEY_DESC) + KeyDescSet("Cmd /Psalmody"); + else + PopUp("#include \"::/Apps/Psalmody/Load\";" + "Psalmody(\"~/Sup1/Sup1Hymns\");"); + return TRUE; //Ins your own ALT-key plug-ins case '1': diff --git a/TempleOSCD/Demo/AcctExample/PersonalMenu.DD b/TempleOSCD/Demo/AcctExample/PersonalMenu.DD index 4a63ff3..4362e7c 100644 Binary files a/TempleOSCD/Demo/AcctExample/PersonalMenu.DD and b/TempleOSCD/Demo/AcctExample/PersonalMenu.DD differ diff --git a/TempleOSCD/Demo/AcctExample/PersonalNotes.DD b/TempleOSCD/Demo/AcctExample/PersonalNotes.DD index fc40ba3..ab89b5f 100644 --- a/TempleOSCD/Demo/AcctExample/PersonalNotes.DD +++ b/TempleOSCD/Demo/AcctExample/PersonalNotes.DD @@ -1,6 +1,6 @@ $WW,1$$FG,5$$TX+CX,"TODO"$$FG$ -* Make $LK,"GR2BMPLst",A="MN:GR2BMPLst"$ combine disjoint rects for same frame. +* Make MV files combine disjoint rects for same frame. * God said to reconsider switch start/end, perhaps preface portion? @@ -198,8 +198,6 @@ $FG,5$$TX+CX,"Bugs? Not really sure."$$FG$ * $LK,"StrPrintJoin",A="MN:StrPrintJoin"$(,st); With st="\n\\"; (Forgot what this is talking about.) -* $LK,"BMPRLE4To",A="MN:BMPRLE4To"$() has files_size too big by 108. Fixed? - $FG,5$$TX+CX,"TODO? Not really, just angst."$$FG$ * Should these be moved into $LK,"CHashClass",A="MN:CHashClass"$ from $LK,"CMemberLst",A="MN:CMemberLst"$ and $LK,"CHashGlblVar",A="MN:CHashGlblVar"$? @@ -279,8 +277,6 @@ $FG,5$$TX+CX,"Committee Needed"$$FG$ * Import Intel datasheets so we can use links in $LK,"Code",A="FI:::/Kernel/Mem/PageTables.HC"$ for documentation. I tried a PDF-to-text convertor and it wasn't acceptible. -* Why are BMP file $LK,"CBGR24",A="MN:CBGR24"$'s wrong? $LK,"::/Adam/Opt/Utils/FileBMP.HC"$. - * Switch stmt with sparse cases? Maybe, ban sparse switch stmts. * Compiler Optimization: Postpone LocalVar init until last possible moment in case of return. diff --git a/TempleOSCD/Demo/AcctExample/Registry.HC b/TempleOSCD/Demo/AcctExample/Registry.HC index a0166f5..d7c7314 100644 --- a/TempleOSCD/Demo/AcctExample/Registry.HC +++ b/TempleOSCD/Demo/AcctExample/Registry.HC @@ -48,7 +48,7 @@ $ID,-2$$TR,"Wenceslas"$ $ID,2$F64 best_score=43.9944; $ID,-2$$TR,"OSTestSuite"$ $ID,2$progress1_tf=0.000;progress2_tf=0.000; -progress3_tf=0.000;progress4_tf=224.153; +progress3_tf=0.000;progress4_tf=223.150; $ID,-2$$TR,"XCaliber"$ $ID,2$I64 best_score=90; I64 msg_flags=2; @@ -60,13 +60,13 @@ $ID,-2$$TR,"Titanium"$ $ID,2$I64 best_score=16469; $ID,-2$$TR,"TOSRegen"$ $ID,2$progress1_tf=0.000;progress2_tf=0.000; -progress3_tf=0.000;progress4_tf=279.256; +progress3_tf=0.000;progress4_tf=279.384; $ID,-2$$ID,-2$$TR,"Once"$ $ID,2$$TR,"Adam"$ $ID,2$$ID,-2$$TR,"User"$ $ID,2$$ID,-2$$ID,-2$$TR,"DemoCompany"$ $ID,2$$TR,"Game1"$ -$ID,2$F64 best_score=184.02909; +$ID,2$F64 best_score=187.05180; $TR,"SimpleVal"$ -$ID,2$1244; +$ID,2$1245; $ID,-2$$ID,-2$$ID,-2$ \ No newline at end of file diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC index 8f6ae55..c180b5d 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSDistro.HC @@ -323,7 +323,8 @@ public U0 TOSPreRegen() CopyTree("D:/Home/Sup1/Sup1Bin","C:/Home/Sup1/Sup1Bin"); Copy("D:/Home/Sup1/Sup1CodeScraps/Comm/TOSSocket*", "C:/Home/Sup1/Sup1CodeScraps/Comm"); - Copy("D:/Home/Sup1/Sup1Bin/God*","C:/Linux"); + DelTree("C:/Linux"); + CopyTree("D:/Linux","C:/Linux"); } public U0 TOSRegen() diff --git a/TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC b/TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC index 70820f2..56804a2 100644 --- a/TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC +++ b/TempleOSCD/Demo/AcctExample/TOS/TOSMisc.HC @@ -12,11 +12,11 @@ I64 CopyVideo(Bool reverb) intensity=0.35; } Del("D:/Tmp/*.SND"); - DelTree("D:/Tmp/ScrnShots"); - DirMk("D:/Tmp/ScrnShots"); + Del("D:/Tmp/*.MV"); Silent(old_silent); - SndFileCreate("D:/Tmp/Audio",0.115,0.0,WF_SQUARE,delay,intensity); - GR2BMPLst("B:/Tmp","+d","D:/Tmp/ScrnShots/VID%05d.BMP.Z"); + RunFile("~/Sup1/Sup1Snd/SndFile",, + "D:/Tmp/AUD%03d.SND",0.115,0.0,1,delay,intensity,0.185); + GR2MV("D:/Tmp/VID%03d.MV","B:/Tmp","+d"); return res; } @@ -27,17 +27,15 @@ U0 DelScrnShots() DelTree("B:/Tmp"); DirMk("B:/Tmp"); Del("D:/Tmp/*.SND"); - DelTree("D:/Tmp/ScrnShots"); - DirMk("D:/Tmp/ScrnShots"); + Del("D:/Tmp/*.MV"); Del("C:/Tmp/*.SND"); - DelTree("C:/Tmp/ScrnShots"); - DirMk("C:/Tmp/ScrnShots"); + Del("C:/Tmp/*.MV"); Silent(old_silent); } public U0 FrameGrabberToggle(Bool sync_tone,Bool tos_theme, Bool reverb,Bool just_audio=FALSE) -{//The frame grabber saves BMP files to D:/Tmp/ScrnShots. +{//The frame grabber saves GR files to B:/Tmp. static F64 last_time=0; if (tS-last_time>3.0) { last_time=tS; @@ -73,7 +71,7 @@ public U0 JukeLines(I64 start_line,I64 end_line) {//Make movie of many lines of songs, starting at 0. if (!fg_on) FrameGrabberToggle(FALSE,FALSE,FALSE); - JukeSongsPuppet("~/Sup1/Sup1Hymns",,start_line*5,end_line*5,1.5); + JukeSongsPuppet("~/Sup1/Sup1Hymns",,start_line*5,end_line*5); if (fg_on) FrameGrabberToggle(FALSE,FALSE,TRUE); } @@ -137,33 +135,6 @@ public CDoc *DC2Doc(CDC *dc,I64 dx=0,I64 dy=0,I64 *_total_score=NULL) return doc; } -public U0 BMP2Doc(U8 *_in_name,U8 *_out_name=NULL) -{//Use OCR to make a text DolDoc from BMP file. - U8 *in_name,*out_name; - I64 dx,dy,score,best_score=I64_MAX; - CDC *dc; - CDoc *doc; - in_name=ExtDft(_in_name,"BMP"); - if (_out_name) - out_name=ExtDft(_out_name,"DD.Z"); - else - out_name=ExtChg(_in_name,"DD.Z"); - if (dc=BMPRead(in_name)) { - for (dy=-3;dy<=4;dy++) - for (dx=-3;dx<=4;dx++) { - doc=DC2Doc(dc,dx,dy,&score); - if (scorefilename.name,out_name); - DocWrite(doc); - } - DocDel(doc); - } - } - Free(in_name); - Free(out_name); -} - #define MEM_TEST_SIZE 1024*1024 U0 MemTest() { diff --git a/TempleOSCD/Doc/Charter.DD b/TempleOSCD/Doc/Charter.DD index aaa4db6..564833e 100644 --- a/TempleOSCD/Doc/Charter.DD +++ b/TempleOSCD/Doc/Charter.DD @@ -31,7 +31,7 @@ $ID,-5$ * Low line count is the highest good, so it is easy to learn the whole thing. Users should see the light at the end of the tunnel. One file system, for example, is better than many file systems. -* There is a limit of 100,000 lines of code for all time, not including applications and demos. $FG,4$Code comments count$FG$, however. Currently, there are $TX,"82,150",D="DD_TEMPLEOS_LOC"$ lines of code. $FG,4$3rd party libraries are banned$FG$ because they circumvent the intent of this limit. The vision is a Commodore 64 ROM -- a fixed core API that is the only dependency of applications. Dependency on components and libraries creates a hell that is no longer blissful. +* There is a limit of 100,000 lines of code for all time, not including applications and demos. $FG,4$Code comments count$FG$, however. Currently, there are $TX,"81,494",D="DD_TEMPLEOS_LOC"$ lines of code. $FG,4$3rd party libraries are banned$FG$ because they circumvent the intent of this limit. The vision is a Commodore 64 ROM -- a fixed core API that is the only dependency of applications. Dependency on components and libraries creates a hell that is no longer blissful. * The metric for resolving all TempleOS code governance issues is how fast the compiler compiles itself and the kernel with $LK,"BootHDIns",A="MN:BootHDIns"$(). The $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$ language should be changed to optimize this metric, as I did when I changed type casting from prefix standard C to postfix $LK,"HolyC",A="FI:::/Doc/HolyC.DD"$, but we need a rule to prevent degenerating into a brainfuck language. diff --git a/TempleOSCD/Doc/Tips.DD b/TempleOSCD/Doc/Tips.DD index 737d2ef..6649ca3 100644 --- a/TempleOSCD/Doc/Tips.DD +++ b/TempleOSCD/Doc/Tips.DD @@ -73,7 +73,7 @@ $FG,2$Merge(\"C:/*\",\"D:/*\",\"+r+d\");$FG$ to check my changes. * Use $FG,2$$FG$ will capture the scrn as a sprite on the clip. You can save the cmd line doc as text with $FG,2$$FG$. -* You can save a sprite as a $FG,2$.BMP$FG$ file in $FG,2$$FG$ on the Sprite BitMap Menu. +* You can save a sprite as a $FG,2$.GR$FG$ file in $FG,2$$FG$ on the Sprite BitMap Menu. * You can eye-dropper colors in the $FG,2$$FG$ sprite editor by pressing $FG,2$'c'$FG$. Press $FG,2$'t'$FG$ for transparent. @@ -131,7 +131,7 @@ $FG,2$Merge(\"C:/*\",\"D:/*\",\"+r+d\");$FG$ to check my changes. * For advanced heap debugging, play with $LK,"_CFG_HEAP_DBG",A="MN:_CFG_HEAP_DBG"$. You're on your own. -* You can use $LK,"Type",A="MN:Type"$() to display $FG,2$.BMP$FG$ or $FG,2$.GR$FG$ files. +* You can use $LK,"Type",A="MN:Type"$() to display $FG,2$.GR$FG$ files. * Use $LK,"Man",A="MN:Man"$() to jump to short sym name src code. diff --git a/TempleOSCD/Kernel/Kernel.MAP b/TempleOSCD/Kernel/Kernel.MAP index b791d94..d8af406 100644 --- a/TempleOSCD/Kernel/Kernel.MAP +++ b/TempleOSCD/Kernel/Kernel.MAP @@ -2834,14 +2834,15 @@ $LK,"_CALL_IND",A="FL:::/Kernel/KUtils.HC.Z,332"$ $LK,"PURPLE",A="FL:::/Kernel/KernelA.HH,2925"$ $LK,"TASKf_BREAK_LOCKED",A="FL:::/Kernel/KernelA.HH,3245"$ $LK,"FILEMASK_SRC",A="FL:::/Kernel/KernelA.HH,2308"$ -4AJ#QUUZDVc           ! " & @4@ccko<#33F`yD %88A3P - ''JVerʴ0(**4699,929L9O9[9p9v9|999999999999:::: :!:0:4:C:I:L:N:^:b:v:y:|:~:::: 6666666677 7 7H7K7N7P7c7f7i7q7w7|7|77777777777777 -Fd"+39<HHv˿ hڦڦ +;KZiyʧڧ @Zf::::::::::: 4՗44=HHI"I"I%I?I?IEI(-35=RT^H9x9xYxfxkxwxxxxxxxx(Z`8JRX`$ʈʈӈۈ0BBXctv~8ccccd d d"d"d+d1dP[kbbbbbc -cc c&c(c+c6cEQjwzƐƐƐِ͐*9Hhqۑ4;;O]u@@L%)`s!s!!!!!!!!!!!!!!!!|wҥҥ ,>N_oqqqwȦԦX3333333344)4)4+4.444@8D$11;|5F]buy Ahxyxyyyyyyyyyzzz#z-z>>>>?l?y?{?????? @ @@9@@@E@O@|@@@@@! \\\]]"H ))-7#VVwz  '47@CFKr$ lp &%DLY.;ADP&p%-8Rbqqxxxg'h#9vvvvvwwwwww/wow|wwwwwww($gl@y@yDyTy_yzy)d+ + A J W d q            !!!/!A!I!]!d!d!n!*|9,a,a6aCaTa^aealaua}aaaaaaaaaaaaaaa+Xddǧ˧ΧΧԧק,D ,PPP QQ%Q,Q3Q4QLRR`coyžžߞ? @\ '.13VA45JJJNB4u~KKKK-L=LILYL\L_LC NNRuyDpuBB\n - - -E4~~~~~~~~~F,'.49?GXl~EQjwzƐƐƐِ͐*9Hhqۑ4;;O]u@@L%)`s!s!!!!!!!!!!!!!!!!|wʥʥ + $6FWgiiio̦X3333333344)4)4+4.444@8D$11;| ->UZmq Ahpypyyyyyyyyyyy zz%z4z9z9zEzEzKzKzzzzzzzzz{ +{{;{ >>>>>?l?y?{?????? @ @@9@@@E@O@|@@@@@! \\\]]"H ))-7#VVwz  '47@CFKr$ lp &%DLY&39<H&p%-8Rbqqxxxg'h#9vvvvvwwwwww/wow|wwwwwww($gl@y@yDyTy_yzy)d+ + A J W d q            !!!/!A!I!]!d!d!n!*|9,a,a6aCaTa^aealaua}aaaaaaaaaaaaaaa+Xddǧ˧ΧΧԧק,D ,PPP QQ%Q,Q3Q4QLJJX[gqwמ۞ߞ? @\ '.13VA45JJJNB4u~KKKK-L=LILYL\L_LC NNRuyDpu::TfE4~~~~~~~~~F,'.49?GXl~H\i-9BGdmz ^ { _4`L`LiLsLLLLLLL`$iiiij ja$+0~~bCiکک&22:clqz}ªƪ"2c<$/ȨԨި d[V[VoV~VVVVVVVVVW%W2W@WNW\WjWWWWWWWWWWWWXXX)X5X_XuXXXXXXe@nz<<IQTbfjm{f(ajj}ÂԂF]v҃܃"-;BPPZs„Ą΄g<ppppqq3q:qPqVq\qqh,c4c4g4444 5 5i<bm "049j3     ) @@ -2861,71 +2862,84 @@ cc c&c(c+c6c>WZhhq|rH<Js$@E..7EKPt4nn|uLs{{{{{{{{||,|C|Z|q||||||||||||} }}!}:}G}M}P}Z}vc@i@icigitiyi}iiiiiiiiiijj4j>j>jRjRjUjcjwPoooooo p pp2p=pCpGpOpx(cc$c.c9cAcFcy0ltFFTcntvv|z<KV@x@xIxSxcxexxxxxx{^^dbr |4NNfn| %+9=Yl"0BBUWjl}H)+-<<KMMR~`hhhhii ii,i7iBiDiIiKiLiLiVi(##+6FUa&--?DKDnn~8bbbbbbc -c ccctkk{DMZ+T+T@TNTNTVTlTpTpTtT|T6[ʄф؄݄ 7:CILNX]twy81; !%%+$0u+ + 3 C S e t }          !!&!;!E!Z!d!y!!!!!!!!!""%"3"?"K"\"q""""""""#*#?#d#{###########$,^^^^^^^02:++?J\dgoKvddddddddeee%e2eVeeeleseeeeeeeeeeeeeeee f,D VxWxWWWWWWWWWWW"X)X-XEXQXnXwXwXwXXXXXXXYY'Y4YEY\YbYYYYYZZ ZdFd^d^dgd{ddddd@!-(sssssss %)nnxH/=RRgsv  -{zzz'zJzTzfzizqztzzz}zzzzzzzzzzzzzz{{ {-{3{@{K{P{V{h{h{h{h{s{s{{SLSLrLtLLLLLLLLLLMMMM M!M'M-M0M6M8MAMPMVMVMVM]MnM@%ğğџTVVz}`p&-=AAAEQH !++-;D"/‰ljlj͉X{IIIIIIIIIIIJ JJJJ,ss)sLs7s\sbss8{&DPRR8>HHIHIVI\IcIyIyIIII<x-;BFIMTx`226M@ ''44DFFnd27778868G8V8c8r88888889/9L9q9v9999999#:z:K:I::::::;;';';F;M;;;;;;<<"<8<@<@<e<u<<<<<<=7=?=?=_=t======>>>>>(>C>Q>i>>>>>>> -???(?A?U?j???????@@9@D@\@r@r@@@@@@A!A9AOAQAAlAjAAAAAAAAABB B B"B&B4 - ,szyyyyyyyyTddddddddeeee!e)e%VsGsGGGGGGGGGGGGGGGGGH HH$H&H&H&H)H.H:H:HFH_HbHuHuHxH{HH##$$.$.$@$E$E$W$\$\$n$s$s$$$$$$$$$$$$$$$$$$$ %4%4%F%M%T%]%l%%a~ffjyy\LtZ}Z}n}{}~}}}}}}}}}}}T)7AGQVdjms &44Q[sw (*09?dg4RR`bgjmrx"uuuuuvvv v#v/v@vMvSvVvYv\vavcvgvsvvvvvvvvvvvP]m";WfLԀ؀ -CSqUUVV%V%V1V9VAVLVUV]VbVdVhVwVVVVVVV 0=HQgz*6BBOYi -  = ,z -,fm#/39Hǁځd""+CNjlۂ߂JJ7J9JSJbJJJJJJJJJJJJKKK%K>KEKEKWKcKgKqK0LcScSSSSSSSSSSSSSSSSTTT T T T!T+T  ..8KP'F||¢Ǣʢآݢ.2RT\ѣ$@GOT}         ( = B L V ` ^ n          '-4;BIZ__[[yɞО֞ !4@WYqsvxx||ݟ"(+C4&/SSS$S.SASISSSUSbS4S6 6 ? a l }            # F V V V i n o  8fft5[[{Ɛ̐ "04>BKQd$).HHHHHH,+xxȌڌތ)4BLTXXX[]aaftL  $VVZgiX&8BBB CC4CP[gqtvy{~<MMMMMMMMMMM8%22<DXmuxz~}  $(/6?VV[]]accgnnsLQ`ʴʴӴӴ-11685?ңң -"*,]         !2NVbjrr} 1NPbkk}}$FF FF"F1FOFhFhFtFFFFFFFFFFF GGGG.GNGhGmGrGxv$$'$1$7$C$S$V$Z$c$s$v$$$$$$$$$$%%%D&dav**:JUZgptzƥƥΥ@nz/55A<AAABB.BTBzBBBBB(.4ǣ̣0**8PDǔՔ C C N V a l w        +   ) 4 kL##?FMYb|ĕĕٕl86X6XLXYXkXXXXXm$/4n4SpSpgpypppppppo0dlTTTTTT UUpPZjccu|ēqd>>WZhhq|rH<Js$@E..7EKPt4nn|uLs{{{{{{{{||,|C|Z|q||||||||||||} }}!}:}G}M}P}Z}vc8i8i[i_iliqiuiiiiiiiiiii j,j6j6jJjJjMj[jwPoooooo p pp2p=pCpGpOpx(cc$c.c9cAcFcy0ltFFTcntvv|z<KV@x@xIxSxcxexxxxxx{^^dbr |4NNfn| %+9=Yl"0BBUWjl}H)+-<<KMMR~`hhhhii ii,i7iBiDiIiKiLiLiVi(#.>MY}}  %%7<CDnn~8bbbbbbc +c ccctccsDMZ+T+T@TNTNTVTlTpTpTtT|T6[„ɄЄՄ /2;ADFPUloqx|81; !%%+$0u# # + ; K ] l u           !!3!=!R!\!q!{!!!!!!!!!""+"7"C"T"i"~"""""""#"#7#\#s#|##########$,^^^^^^^02:++?J\dgoKvddddddddeee%e2eVeeeleseeeeeeeeeeeeeeee f,D VpWpWWWWWWWWWWWX!X%X=XIXfXoXoXoX|XXXXXXX Y Y,Y=YTYZYYYYYZ ZZ4Z4Z@ZBZBZNZPZPZ`ZcZcZoZ{ZZZZZZZZZZ[ [[[[`[P,<ȍۍ  %'@4#0H0H9HNHNH[HpHpHuH vv +5XXvzƒɃ˃Ճڃ!&<HKNNNNQYaho0HPvv`j`jjjjjjjjjjjjkkk%k9k@kJkJk_k_kukkkkkkkkkkkkkll ll/l9ldFd^d^dgd{ddddd@!-(sssssss %)nnxH/=JJ_knw  +{zzz'zJzTzfzizqztzzz}zzzzzzzzzzzzzz{{ {-{3{@{K{P{V{h{h{h{h{s{s{{SLSLrLtLLLLLLLLLLMMMM M!M'M-M0M6M8MAMPMVMVMVM]MnM@%ɟ TVVz}`p&-=AAAEQH##%3D"/‰ljlj͉X{IIIIIIIIIIIJ JJJJ,ss)sLs7s\sbss8{ + +<HJJ8>HHIHIVI\IcIyIyIIII<x + +%3:>AELp`226M@   ,,<>>fd2777 88.8?8N8[8j8~888888 9'9D9i9n9999999:r:C:A:::::::: ; ;>;E;;;;;;<<<0<8<8<]<m<<<<<<</=7=7=W=l====== +> +> +>>> >;>I>a>z>>>>>>? ? ? ?9?M?b????????@1@<@T@j@j@@@@@@@A1AGAIAAdAbAAAAAAAAABBBBBB4 + ,szyyyyyyyyTddddddddeeee!e)e%VsGsGGGGGGGGGGGGGGGGGH HH$H&H&H&H)H.H:H:HFH_HbHuHuHxH{HH##$$.$.$@$E$E$W$\$\$n$s$s$$$$$$$$$$$$$$$$$$$ %4%4%F%M%T%]%l%%a~ffjyy\LtZ}Z}n}{}~}}}}}}}}}}}T)7AGQVdjms &44Q[sw (*09?dg4RR`bgjmrx"uuuuuvvv v#v/v@vMvSvVvYv\vavcvgvsvvvvvvvvvvvP]m";WfLԀ؀ -CSqUUVV%V%V1V9VAVLVUV]VbVdVhVwVVVVVVV(5@I_r ".::GQaw  5 ,z +,fm#/39Hǁځd""+CNjlۂ߂JJ7J9JSJbJJJJJJJJJJJJKKK%K>KEKEKWKcKgKqK0LcScSSSSSSSSSSSSSSSSTTT T T T!T+T  ..8KP'F||¢Ǣʢآݢ.2RT\ѣ$@GOT}         ( = B L V ` ^ n          '-4;BIZ__[[yɞО֞ !4@WYqsvxx||ݟ"(+C4&/SSS$S.SASISSSUSbS4S6 6 ? a l }            # F V V V i n o  8fft5[[{Ɛ̐ "04>BKQd$).HHHHHH,+ppҌ֌!,:DLPPPSUYY^lzL  $VVZgiX&8BBB CC4CP[gqtvy{~<MMMMMMMMMMM8%**4<Pemprv} '.7NNSUUY[[_ffk{LQ`´´˴˴ڴ%)).85?ʣʣڣ +",]           +*FNZbjjuw)FHZccuu$FF FF"F1FOFhFhFtFFFFFFFFFFF GGGG.GNGhGmGrGxv $ $ $)$/$;$K$N$R$[$k$n$w$z$$$$$$$$$% %D&dav""2BMR_hlrxƥ@nz/55A<AAABB.BTBzBBBBB(.4ģ0**8PDǔՔ ; ; F N Y d o x         -& -B -N -Y -q -| - - - - -8gq;; ;;$;1;3;@;@;C;LKKKLLL!L0L>L>LALLLssΏُ$(04<BHHKY|ҿҿ:Js,258  9OR]? +<M^szې -BUg‘ɑڑ9H=KHHbuL \KjKjSj^jpjvj~jjjjjjjjj(k6knkskskkkkkkkkll l ll*l7lL>LALLLssΏُ$(04<BHHKY|ʿʿܿ2Bk{ $*-8 1GJU?#4EVkrӐ:M_ґ1H=K@@ZmݎL \KjKjSj^jpjvj~jjjjjjjjj(k6knkskskkkkkkkkll l ll*l7lQfnqɰɰɰͰϰϰӰհհٰ۰۰߰߰߰05;>CVqsֱܱ&8]bbzӲղղ #??]innֳ۳۳߳ 7UYYw||ϴ /688FNwyyѵֵֵ%=\}öԶԶڶ O]czŷϷ &5;PXdnn͸͸ҸҸ +//8GPPY_{ùŹ,CHH`wúɺҺ4?Z\\e}Իֻ޻ *44OYdżɼ###7@D[ýý̽н 06MUbggptþԾݾ */E]]ſͿԿ߿#7Ulv$((((,11<@Xoy~ 1HRWmm @RZ\u '2<FMjss'E\aku.EO__{&8==Ulv$8;M_ddd| - EVhmm0EM|Ŷض#1AdL~ʷͷٷ8)7HLLQQW  -5<@HXfu{4GPƒܒ!Trcc|+q70-5'Qggggggggggggg hhh h&h,h/h8h9h9hEhGhSh X74:AQX`fm *;>@LNnsz  488N -@+_+_A_c_k_p______ 0ss| ,;B˩ԩ٩ߩ 6..LORfnu )111338W]l|8rrԥԥ + EVhmm0EM|ж)9\Dv·ŷѷ8!/@DDIIO%-48@P^ms{4GPƒܒ!Trcc|+q70-5'Qggggggggggggg hhh h&h,h/h8h9h9hEhGhSh X74:AQX`fm *;>@LNnsz  488N +@+_+_A_c_k_p______ 0kkty ,;Bé̩ѩש 6..LORfnu )111338W]l|8jjyԥԥ - &,39@FMSZ`gmtzӦզ #..8LWfxxxxxxxxxyyyyy:yh̎ԎԎ*5;FIQD<I..B^l|~2Z'/GWww*7CgP}} ~~~!~3~3~3~5~G~N~~~~~0[o[oqoooooo<al 19=INRX\-@S^r3Ni@Tct6<<<<BXYvYvyvvvvvvvvvvvv,'6Ęǘ3?S\duuu~řՙݙ #&&&&2u  Heefff&f1fEfXfcfoffffffffffffgg+g1gUg]g]gigmgqggggggggghhhh h?hDhDhPhVh\h^hnhKo[[o!1@RYhzL$,27=??E <{……Ѕ%3 rrɀـ',<EZ`dv! GKR{R{a{~{{"6%CCELL]dq̀̀.477:?GX_evy#lڗ .0DMQ`syҘޘ -.;L_e̙  ,P\gnt{$4Yb22;CO`ks%===$=$=3=?=F=L=L=V=_=_=e=i=l=v==================& "/1'(|(|>|J|R|c|g|{||||||||||}}} },}<}N}N}R}X}`}j}j}n}r}}}}}}}}}}}~ -~~~~*~*~8~A~A~P~~~~~~~~~~~~~~~ -$$+DIQYbir(,kkt)ДДؔ 3Te•ҕוߕ"'05:JxɖӖ%*/4UScoЗЗחޗ*(ss t t+t1t9t+ʮʮخ6>FQVlyůӯگ  /PXk{ʰڰ#DO^n~,(S>S>\>c>>>>-,9FRYbu-000<]bekkn.4^^^^^ ___'_/p !yyy -zzz!z(zDzzzzzz0,33;MVv{$0F\^j 3IIQ[g}18u~~280:""+Sv3,_______40  .8LRTZ5,8? !'6,eeeeeee7\mZZ|8``$`+`>`J`q`{``````````` -aaaa a(a9 F0<Dbm/66HNX:X______````#`+`9`D`L`e`w````````````````````aaa$a$a-a4a@aKagagagaoava}aaaaaaaaaaaaabbbb;|Kf#3?ENU\amq{{<,=0JJ^ʜ֜>ss{/8EQ]]jt A-RWimuu?LRa¤Ť̤ФӤפ@8GQTTailz~A0BP#+C(MS++3AS\^D0ڜڜ-4:RUaE'Jcccccccccdd d/d8d?dCdCdIdOdgdpdvdddddddFOwccdd'dBdPdWdddgdkduddddddddddddee&e0e4eMeOete}eeeeG<#""08@P\fHH?M99 969M9t9999999:: :IZ4S_sw} %)/AAAADINThlr}J!**6ERV`vvúȺںںں **<K ?FF GGG'G'G>GOGfGkG~GGGGGGGGGGG H HFHLHVV_t}M6RRRRRR S'S2SASKSaSiSoS|SSSSSSSSSTTTT T!T!T1T1T?TPTUTTTTTTTTTTUUU,U?UbUnUUUUUUUUUUUUUUVVVFVHVmVmVuVxVVVVVVVV;WN0 O(JJV\b{Pw f f5f8fTfffmfwfffffffffffffff ggg g"g(g.gFgOgOgVgqgtggQ<////00)0:0<0h0R@ +KKYa}}SE¼¼ؼ<_n׽#N^ckȾ־־T@nz3I3I;I\I`IsI|IIIU b(+(+3+7+?+`+m+~++++++++ ,,/,7,X,m,x,,,,,,,,,- ----E-I-N-N-_-_-r----------------..B.V4=====>?>M>Q>W@.:  !39<>DXҊ (+<<<CPSXUɋ̋΋ (8FOV[[[auYD &Nq~¼Z $3[8 &/5;DGM\hRhss%s'sEgjjmx`@@@@@@@@@@@ A!A7AMA_AfAfA|AAAAAAAAAAAa@ $*,,2b&X""8GRd{{ĠР۠ ,999Jv}cUyffo %=DDEES^jlxdf[[\ \\$\0\E\J\S\Z\h\v\\\\\\\\\\\\\\ -]#],]/]2]7][]]]y]s]]]]]]]]]]]]^e^^^^^__._7_P_U_k_g_w______________A`fVzcckv -&8eqgDNH`H`\`^`n`|```````aaa-a5a:aSasasaaaaaaaaaaaaaaab8bDbgbgbbbbbbbbbbbbbbcc&c*c6cDcMcacuc|cccch((6(9(<(F(T(_(w((((((((( -)7)<)B)l)v)|))))))))** *.*3*G*_*v*******++'+i<5@!(-8MPUaj0 GGGGGGGGk\Qd""24?DW`ejzlcH.H.S.[.f.q.|....... /#/+/A/I/g/s/~///////mxccn0 ɓϓѓדoLZiPPhjt͏ӏpx5RR.RKRRR^RmRsRwRRRRRRRq7]܁88FMSZbpvxʂ r.oZZZZZZ[[%[:[J[Q[b[m[|[[[[[[[[[[[[[[[[[[\\#\)\2\<\L\`\\\\\\\\\\\\]]]]]]1]s,07҉҉ۉt -1!0<Hg  )11CJJ\iuyup  +11>Jgv9[CCCCCCCCCD DDDDD'D2D4DCDEDQD[DiDnD}DDDDDDw$ Uax<7B{{Úʚ̚Ԛy,HHH(H,H,H0HzDu;;?Oegx{, -GGGH H HH|h@HHHHSH^HnHvHHHHHHHHI I'IHI]IhIrIIIIIIIIIJ#J-JJJUJ]JxJJJJJJJJJKKK-K)KCKNKVKaKaKaKlKlK}K}KKKKKKKKKKKKL LLL)L-L4L}Lp3]3]<]A]H]H]g]]]]]]]]]~ɭ̭έܭ6AP`ln{ƮQxpppppppppq q#q2qJq]qfqoq}qqqqqqqqqqqqq r r#r.r4r([(x((((( )&)C)`)})))))****)*,< -ړړ %($jj-jIj, RTTTTTTTTTTTUU UU)U9UDUIUIUPUPU[U[UzUUUUUUUUUUUUUUUUUUUUUUUUUUP111111 22 2,23282I2`2x2z2XEhs,JPx&&5BQW^v##18sKsKKKKKKK(<<DNd8%%)%1%9%Z%p%y%%P:Jwwwwwwwxxxx&x,x/x;x8pΩթݩ!*35>GIIRaccluzz˪Ԫ٪"X::BNYht}   8 8(8.888;8;8D8O8Y8c8o8q8w8~88888888888888888888888889,ZZcow|8ak(3;==C, 4rrrrrr sss$(-bbpx<@K**@JNS_dhlv  -*,t2 Hkzгֳسڳ+K K S W b p y          6 : S k z ~         ' 4 8 E W W e l ~ ~     haw::\bkktʵҵԵ@yɔΔД<CCXGgڷڷ $6ALbn0PWy^^gj**AUsu8d]d]z]]]]]]]47@:::::::::hq«ɫѫث999BDDMOOXZZceenppy{{ˬ۬ -  ((--6CHHQehmmvvc ]]]]]`UiPPPPQQQ"Q/Q5Q5QAQ0[cTTTTTTTTT( ] ] ]+]4]7]?]8LVń DT_T_h_z_________ "0<?BNS\ahh/9McX=O #,04\rĆĆކ  = )5555]55555A66666666667747F7V7k7777777PAQ::;; ;);/;4;R;T;b;h;k;y;lXo66WZhht{;Yss|ǒےے&FFHX^c @ssss$t8tINdqz˯ү'HPcs°Ұ <GVfv,(S>S>\>c>>>>- + +$1>JQZm%(((4UZ]ccf{.4^^^^^ ___'_/p !yyy +zzz!z(zDzzzzzz0 $++3ENns(>TVbx +AAIS_u18u~~280:#Knz3,_______40 &0DJLR5,8? !'6,eeeeeee7\mZZ|8``$`+`>`J`q`{``````````` +aaaa a(a9 F(4<Ze'..@FP:X______````#`+`9`D`L`e`w````````````````````aaa$a$a-a4a@aKagagagaoava}aaaaaaaaaaaaabbbb;|Kf#3?ENU\amq{{<,=0BBVœΜ>kks '0=IUUbl9%JOaemm{?LRa¤Ť̤ФӤפ@8GQTTailz~A0BP#C(MS++3AS\^D0ҜҜ%,2JMYE'Jcccccccccdd d/d8d?dCdCdIdOdgdpdvdddddddFOwccdd d:dHdOd\d_dcdmdzdddddddddddeee(e,eEeGeleue}eeeG<#(08HT^HH?M99 969M9t9999999:: :IZ ,KWkou !'9999<AFL`djuyJ"".=JNXnn~ҺҺҺں""4K ?FFGGG G G6GGG^GcGvGGGGGGGGGGGHH>HLHVV_t}M6RRRRRRS S*S9SCSYSaSgStSSSSSSSSSSSTSTTT)T)T7THTMTyTTTTTTTTTTUU$U7UZUfUyUUUUUUUUUUUUUU VV>V@VeVeVmVpV~VVVVVVV3WN0 O(JJV\b{Pw f f5f8fTfffmfwfffffffffffffff ggg g"g(g.gFgOgOgVgqgtggQ</////0!02040`0R@ +CCQYuuzzSEмؼ 4WfϽFV[cξξؾT@nz3I3I;I\I`IsI|IIIU b + +++/+7+X+e+v++++++++,,',/,P,e,p,z,,,,,,,, +--%-=-A-F-F-W-W-j-|---------------..:.V4=====>?>M>Q>W@.:+146<Xʊ #444;HKPMċƋ݋ 0>GNSSSYmYD  + +FivZ $3[8 + +'-3<?E\hRhrrs s4sTsZsTsqsssyssssssssss]0RRRRRRRRR^t/ + L ]             " _&::DF^l146=_bbepw~`@@@@@@@@@@@ A!A7AMA_AfAfA|AAAAAAAAAAAa@"$$*b&X0?J\ssȠӠ$111Bnu~cUyffo %=DDEES^jlxdf[[[\\\(\=\B\K\R\`\n\\\\\\\\\\\\\\]]$]']*]/]S]U]q]k]]]]]]]]]]]]^e^^^^^^_&_/_H_M_c___o______________9`fVz[[cn~0]i|gDN@`@`T`V`f`t`~``````` +aa%a-a2aKakakaaaaaaaaaaaaaaa b0b(L(W(o(w(((((((()/)4):)d)n)t)w)))))))))*&*+*?*W*n******* ++ + +i<5@!(-8MPUaj0 GGGGGGGGk\Qd""24?DW`ejzlc@.@.K.S.^.i.t.}......//#/9/A/_/k/v///////mx[[w|n0 ɓϓѓדoLZiHH`blŏˏpx5RR&RCRJRVReRkRoRRRRRRRq7]ԁ߁00>EKRZhnp‚r.oZZZZZZ[[%[:[J[Q[b[m[|[[[[[[[[[[[[[[[[[[\\#\)\2\<\L\`\\\\\\\\\\\\]]]]]]1]s,07҉҉ۉt +1(4@_w !));BBTamqup #))6B_{{{v9[CCCCCCCCCD DDDDD'D2D4DCDEDQD[DiDnD}DDDDDDw$ Uax<7B{{Úʚ̚Ԛy,HHH(H,H,H0HzDu;;?Oegx{, +GGGH H HH|h@@H@HKHVHfHnHHHHHHHHII I@IUI`IjIIIIIIIII JJ%JBJMJUJpJ{JJJJJJJJJK K%K!K;KFKNKYKYKYKdKdKuKuKKKKKKKKKKKKKL L L!L%L,L}Lp3]3]<]A]H]H]g]]]]]]]]]~ĭƭԭ .9HXdfsQpppppppppppqq*qBqUq^qgquqqqqqqqqqqqqqrrr&r,r4r8rJrPrVr]rcrur{rrrrrlƱϱ+:GRoвڲHWe`[`[t[[[[[[[[[[[,%%%% & &)&)&G&G&e&z&&&&&&&'9'V's'''''(!(>([(x((((( )&)C)`)})))))****)*,< +ړړ %($jj-jIj, RTTTTTTTTTTTUU UU)U9UDUIUIUPUPU[U[UzUUUUUUUUUUUUUUUUUUUUUUUUUUP111111 22 2,23282I2`2x2z2X=`k,JPx&&5BQW^v##18sKsKKKKKKK(<<DNd8%%!%)%1%R%h%q%w%P:Jwwwwwwwxxxx&x,x/x;x8pΩթݩ!*35>GIIRaccluzz˪Ԫ٪"X22:FQ`lu}  8 8(8.888;8;8D8O8Y8c8o8q8w8~88888888888888888888888889,RR[goty8ak(3;==C, 4rrrrrr sss$(-ZZhp<@K""8BFKW\`dn  +*,t2@crȳγгҳسڳ+C C K O Z h q          . 2 K c r v          , 0 = O O ] d v v     haw22TZccl{µʵ̵޵޵޵ +@yƔȔ<CCXGgҷҷ .9DZf|(HOq^^gj**AUsu8d]d]z]]]]]]]47@:::::::::hq«ɫѫث999BDDMOOXZZceenppy{{ˬ۬ +  ((--6CHHQehmmvvc ]]]]]`UiPPPPQQQ"Q/Q5Q5QAQ0[cTTTTTTTTT( ] ] ]+]4]7]?]8LVń DT_T_h_z_________ (47:FKTY`yyh/9McX=O #,04\rֆ 5 )5555]55555A66666666667747F7V7k7777777PAQ::;; ;);/;4;R;T;b;h;k;y;lXo66WZhht{;Yss|ǒےے&FFHX^c @sssst0t4tCtOt]tltttttuuu@u@ufufukupupuuuuuuv"v+vAvEvGvGvSvSvUvUvevqvqvuvzvvvvvvvv w wwmy4  --2@CIQTjj' &2;FQ\ao}Т  )0>MOXb<)4ăɃ̃߃8^ -&:J`m#V[u.CVp--`kv#(HOtt''8?TTeehph +-2@CIQTbbx'*3>ITYguȢ!(6EGPZ<)4ăɃ̃߃8zz^2BXexNSm&;Nh}%%Xcn @Gll +  07LL]]`hh  #,5>GPPh0qqqqqqqqrX<6<6J6S6_6e6h6m6s6v6{6{666666L-3Z3ZBZPZPZZZdZZZZZZZ`*>777 88$8+8+8A8A8O8W8e8m8m88888998AKbbruw|8~ - D $*06<BDh(B(B3BKB\BkBuB~BBBBBBB C C6C@CeCjCtCCCCCCCCCD,D4D4DSDcDDDDDDDEEE"E7EUE_ErEzEeEEEEEE F F F1F9FLFdFwFFFFFFFFFFFFF4{ƥΥ<L^L^p^t^^^^^^^8]]]]^,^6^9^I^L *6PYfz`L`zzĤϤޤ $ ~~~#Gnn=c')07pY++GJS\fx{~ - 58::OOOa`[[wz˖͖͖Жܖ D]D]M]Z]_]X.6A]]ffk|<66:CJSZccjl\"__________```d\qԅ)7[kqzzdMMMMMMN -NN#N%N5NAN^N^NgNpNvNN<{{{{{{{{{|zzƁՁځ "4,@@fir{LJЇԇԇ݇ DLcjo{ÈÈȈш1RRkrw‰2GG 1őőˑˑˑˑˑˑˑˑББܑ )`\pDDDDDDDDEE%E6EGEXEyEEEEEFqH{H{^{e{s{{{{{{{{{{{{{{||||#|,::>C]bd@11111111111, + D $*06<BDh B B+BCBTBcBmBvBBBBBBBCC.C8C]CbClC}CCCCCCCCD$D,D,DKD[DyDDDDDDDEEE/EMEWEjErE]EEEEEEFFF)F1FDF\FoFwFwFFFFFFFFFFF4{ƥΥ<L^L^p^t^^^^^^^8]]]]^,^6^9^I^L *6PYfz`L`rrǤ֤ܤ ~~~#Gnn=c')07pY##?BKT^psv{ -022GGGY`[[wz˖͖͖Жܖ D]D]M]Z]_]X  &.9UU^^ct}<66:CJSZccjl\"__________```d\q̅ۅ!/Scirr~dMMMMMMMNNNN-N9NVNVN_NhNnNxN<{{{{{{{{{|zzƁՁځ "4,88^ajsȇ̇̇Շ +<D[bgsɈ݈)JJcjoz݉݉*?? 1őőˑˑˑˑˑˑˑˑББܑ )`\pDDDDDDDDEE%E6EGEXEyEEEEEFq@{@{V{]{k{{{{{{{{{{{{{{{{{||,::>C]bd@11111111111, - &&+4[[dr /3HHHHHH . (7=@L$FFJNPDȇԇههx]wmmmnnnn%nWnWnZn\n\nanancncncnenenennnqntnnhCۚۚ <WWWWWcov˛ЛЛ577TTZfry}֜؜؜ '*6GY[[[`xÝҝ؝۝')))4666AAAFXrVVVVVVVVVWWWWW!W.W4W7W9WCJ\_dk}Ŗזږܖ8r|rr| PbbvΝѝ  -Hjjx H\j;;;;;<<<<<"< H  ,29Ofjr $6;>FUgw~ %YY`dmsxxxxxxx #7>EZ^a x`&`&|&&&&&&&&&&&&#'.'3'3';'g'r'w'w'{'',nnx`-4?EHHOUinqvąڅޅk$<$<B<E<]<]<_<p<}<<<<<<<<<<<<<<<<=d)6ADJRfvĨƨƨ֨XxhhrxÓדד!:LP\^it UY@v˫6>Ch$+5AJ^v  !;VbrŌԌ /5;BKiexލ'28;APafr} *.L&5MMMMMNNNNN,N.N5N:N>N,znn0<04499?8NX"%'/\ BBPU]diλٻ, #) XXXXXY YY%Y)Y7YVYVYuYYYYYYYYYYYYZ ZZZZ2Z 4 !< &BRUe"47777777778#,W^HHHHHHHH$ QU++EWa%h0h0p0x00000000001&1K1X1`1v111111111 22&2&242;2M2M2[2[2\2o2&^33;K]lu-@Ncz2GY^jv'(QW ,0(0X`)@ /=KUfw* QU  '+ sMsMMMMMMMMMMMMNN-N;NFNWNeNoNoNoNN,P#=N[ov|-$mryyyyyy.H^^^^_ ___"_%_(_2_/D&KcKcTcbcbcdcjcucucccc0(!&021D.;66DRRZy2d;PKKdhtt3T$(+<OY_cfhnru{~#6PX[l$)):NUZZk499J^kpp&:CCIIRR44 5l 7NNNNNNNNNNOO!O&O7OEOPOaOoOyOyOO67UOOOOOOOOOOPP"P'P1P:PDPGPJPOPgPuPPPPPPP7l:Q -L^8T3D&22P]nvv9Xwwwwwwww -xxx%x)x5x:Xvvw&w+w7wWw]wjwww~wwww;$ ĠĠڠ3A< X\=  ~~> ?(*0ܨܨ#7@0qy&&@CCL]`hAHەە$$CHJJTBX qJJUnuDTey!2DU3^o  0V^vmC`AU  ! ! ) 8 D _ h o t       DXzzŹҹܹ߹E0ccyFDGLDDTbrxǡء#'/H9džՆ #(14>FIL`wLJׇۇ $I<13A^brJH - %**.6K@:FuQuQQQQQQQQLH'''''''' ( ((MPWWWWWX XXX!X%X-X.X6XNpbz".GR`nO 4_4_=_O_Ph{0{0000000011)1A1C1C1V1g11111Q0$, R@ S4rr9rUrlrxr~rrrrT,TT T)T=TOTTTU<NY : ::1:B:R:c:r:::::V`ss{ \ No newline at end of file +`l`lllllllllllll +m mmm'm2m9m=mAmOmcmjmtmzm}mmmmmmmmmmmmmn!n%n1n8n?nEnHnVnlnlnlnqn}nnnnnnnnnnnnnnooooo-o-o4oJo4R[|;|;;;;;;;;tIbhhhhvhhhhhhhhhhiiii"i+i1i1i7i,..7AgglZ|,GVcr|+:L_hv}}X66JT[j144555(525>5>5B5J5N5g55555555666%6;6O6V6666667 7?7r777777777777777P/?EJJTX]]eDJJVmx~H{%{%%%%%%%%& +&!&3&:&F&,;t;tUthtstytt8<Fbbv<dž҆چ<ju22FMW`u(kFjmx•ŕŕҕ ");>CJ\_dk}Ŗזږܖ8r|jjt| PZZnwƝɝ +Hjjx H\j;;;;;<<<<<"< H$*1G^bj| +.36>M_ovQQX\ekppppppp/6=RVww|||Y xX&X&t&w&|&&&&&&&&&&'&'+'+'3'_'j'o'o's'',nnx`-4?EHHOUinqvąڅޅk$<$<B<E<]<]<_<p<}<<<<<<<<<<<<<<<<=d)6ADJRfvĨƨƨ֨Xx``jpw}ϓϓ2DHTValww{ UY@vë .6;h$+5AJ^v  !;VbrŌԌ /5;BKiexލ'28;APafr} *.L&5MMMMMNNNNN,N.N5N:N>N,znn0<(,,1178NX '\ ::HMU\aƻѻ, #) XXXXXY YY%Y)Y7YVYVYuYYYYYYYYYYYYZ ZZZZ2Z 4 !< &BRUe"47777777778#,W^HHHHHHHH$ QU##=OY%`0`0h0p0{00000000001C1P1X1n1y111111112 222,232E2E2S2S2T2g2&^++3CUdm{%8F[r{ *?QVbn|'(QW ,0(0X`)@ '5CM^oy* QU + sMsMMMMMMMMMMMMNN-N;NFNWNeNoNoNoNN,P#=N[ov|-$mryyyyyy.H^^^^_ ___"_%_(_2_/D&KcKcTcbcbcdcjcucucccc0(!&021D.;66DRRZy2d;PCC\`llxx3T$(+<OY_cfhnru{~#6PX[l$)):NUZZk499J^kpp&:CCIIRR445l 7NNNNNNNNNNOO!O&O7OEOPOaOoOyOyOO67UOOOOOOOOOOPP"P'P1P:PDPGPJPOPgPuPPPPPPP7l:Q%DV{8T3D**HUfnnz9Xwwwwwwww +xxx%x)x5x:Xvvw&w+w7wWw]wjwww~wwww;$ ĠĠڠ3A< X\=  ~~> ?(*0ܨܨ#7@0qy&&@CCL]`hAHەە$$CHJJTBX qBBMfm<L]qx}}*<Mx+Vg(NVn}eC`AU  ! ! ) 8 D _ h o t       DXrrʹԹ׹ڹE0[[q}FDGLDDTbrxǡء#'/H9džՆ #(14>FIL`wLJׇۇ $I<13A^brJH - %**.6K@:FuQuQQQQQQQQLH''''''''(((MPWWWWWX XXX!X%X-X.X6XNpbz".GR`nO 4_4_=_O_Ph{0{0000000011)1A1C1C1V1g11111Q0$, R@ zzS4rr9rUrlrxr~rrrrT,TT T)T=TOTTTU<NY : ::1:B:R:c:r:::::V`kks \ No newline at end of file diff --git a/TempleOSCD/Kernel/KernelA.HH b/TempleOSCD/Kernel/KernelA.HH index de17020..5799a57 100644 --- a/TempleOSCD/Kernel/KernelA.HH +++ b/TempleOSCD/Kernel/KernelA.HH @@ -2308,7 +2308,7 @@ public class CATARep #define FILEMASK_SRC "*.HC*;*.HH*;*.IN*;*.PRJ*" #define FILEMASK_DD FILEMASK_SRC ";*.DD*" #define FILEMASK_TXT FILEMASK_DD ";*.TXT*" -#define FILEMASK_GR "*.GR*;*.BMP*" +#define FILEMASK_GR "*.GR*" #help_index "File/Low Level" #define BLK_SIZE_BITS 9 diff --git a/TempleOSCD/Kernel/KernelC.HH b/TempleOSCD/Kernel/KernelC.HH index ce08272..97eb0c9 100644 --- a/TempleOSCD/Kernel/KernelC.HH +++ b/TempleOSCD/Kernel/KernelC.HH @@ -749,10 +749,10 @@ public extern U16 mon_start_days2[12]; #help_index "Time/HPET" #help_file "::/Doc/TimeHPET" public extern I64 HPET(); - #help_index "Time/Jiffies" #help_file "::/Doc/TimeJiffy" public extern I64 SysTimerRead();//18.33333*65536Hz (SYS_TIMER_FREQ) + #help_index "Time/Seconds" public extern Bool Blink(F64 Hz=2.5); public extern F64 tS(); //From SysTimerFreq. diff --git a/TempleOSCD/Linux/TOSZ b/TempleOSCD/Linux/TOSZ new file mode 100644 index 0000000..8b56dee Binary files /dev/null and b/TempleOSCD/Linux/TOSZ differ diff --git a/TempleOSCD/Linux/TOSZ.CPP b/TempleOSCD/Linux/TOSZ.CPP index 45de8db..4d9b512 100644 --- a/TempleOSCD/Linux/TOSZ.CPP +++ b/TempleOSCD/Linux/TOSZ.CPP @@ -1,17 +1,76 @@ #include #include #include +#include #pragma pack(1) -#define TRUE 1 -#define FALSE 0 +#define TRUE 1 +#define FALSE 0 +#define BYTE_MAX 0xFF +#define CHAR_MIN (-0x80) +#define CHAR_MAX 0x7F +#define SHORT_MIN (-0x8000) +#define SHORT_MAX 0x7FFF +#define INT_MIN (-0x80000000) +#define INT_MAX 0x7FFFFFFF +#define DWORD_MIN 0 +#define DWORD_MAX 0xFFFFFFFF +#define CDATE_FREQ 49710 // Hz typedef unsigned char BYTE; typedef unsigned short WORD; typedef unsigned int DWORD; typedef unsigned char BOOL; +class CDate +{public: + DWORD time; + int date; +}; + +WORD EndianWORD(WORD d) +{ + return ((d&255)<<8)|((d>>8)&255); +} + +DWORD EndianDWORD(DWORD d) +{ + return ((d&255)<<24)|(((d>>8)&255)<<16)| + (((d>>16)&255)<<8)|((d>>24)&255); +} + +DWORD StrOcc(char *src, char ch) +{//Count occurrences of a char. + DWORD i=0; + if (!src) return 0; + while (*src) + if (*src++==ch) + i++; + return i; +} + +void *CAlloc(DWORD size) +{ + BYTE *res=(BYTE *)malloc(size); + memset(res,0,size); + return res; +} + +void Free(void *ptr) +{ + if (ptr) free(ptr); +} + +int FSize(FILE *f) +{ + int res,original=ftell(f); + fseek(f,0,SEEK_END); + res=ftell(f); + fseek(f,original,SEEK_SET); + return res; +} + #define ARC_MAX_BITS 12 #define CT_NONE 1 @@ -67,7 +126,7 @@ int Bts(int bit_num, BYTE *bit_field) return (res) ? 1:0; } -DWORD BFieldExtU32(BYTE *src,DWORD pos,DWORD bits) +DWORD BFieldExtDWORD(BYTE *src,DWORD pos,DWORD bits) { DWORD i,res=0; for (i=0;istk_ptr==c->stk_base && dst_ptrsaved_basecode==0xFFFFFFFFl) { - lastcode=BFieldExtU32(c->src_buf,c->src_pos, + lastcode=BFieldExtDWORD(c->src_buf,c->src_pos, c->next_bits_in_use); c->src_pos=c->src_pos+c->next_bits_in_use; *dst_ptr++=lastcode; @@ -131,7 +190,7 @@ void ArcExpandBuf(CArcCtrl *c) } else lastcode=c->saved_basecode; while (dst_ptrsrc_pos+c->next_bits_in_use<=c->src_size) { - basecode=BFieldExtU32(c->src_buf,c->src_pos, + basecode=BFieldExtDWORD(c->src_buf,c->src_pos, c->next_bits_in_use); c->src_pos=c->src_pos+c->next_bits_in_use; if (c->cur_entry==&c->compress[basecode]) { @@ -167,8 +226,7 @@ void ArcExpandBuf(CArcCtrl *c) CArcCtrl *ArcCtrlNew(DWORD expand,DWORD compression_type) { CArcCtrl *c; - c=(CArcCtrl *)malloc(sizeof(CArcCtrl)); - memset(c,0,sizeof(CArcCtrl)); + c=(CArcCtrl *)CAlloc(sizeof(CArcCtrl)); if (expand) { c->stk_base=(BYTE *)malloc(1<stk_ptr=c->stk_base; @@ -190,8 +248,8 @@ CArcCtrl *ArcCtrlNew(DWORD expand,DWORD compression_type) void ArcCtrlDel(CArcCtrl *c) { - free(c->stk_base); - free(c); + Free(c->stk_base); + Free(c); } BYTE *ExpandBuf(CArcCompress *arc) @@ -225,15 +283,6 @@ BYTE *ExpandBuf(CArcCompress *arc) return res; } -long FSize(FILE *f) -{ - long res,original=ftell(f); - fseek(f,0,SEEK_END); - res=ftell(f); - fseek(f,original,SEEK_SET); - return res; -} - BOOL Cvt(char *in_name,char *out_name,BOOL cvt_ascii) { DWORD out_size,i,j,in_size; @@ -265,70 +314,680 @@ BOOL Cvt(char *in_name,char *out_name,BOOL cvt_ascii) fclose(io_file); okay=TRUE; } - free(out_buf); + Free(out_buf); } } - free(arc); + Free(arc); } return okay; } -void FillGaps(char *in_name) +#define ONA_REST CHAR_MIN + +double Ona2Freq(char ona) +{//Ona to freq. Ona=60 is 440.0Hz. + if (ona==ONA_REST) + return 0; +// else +// return 440.0/32*pow(2.0,ona/12.0); +} + +class CSndData +{public: + double time; + char ona; +}; + +class CSndWaveCtrl +{public: + int sample_rate; + double phase,last_y,next_y; +}; + +CSndWaveCtrl *SndWaveCtrlNew(int sample_rate=8000) { - char buf[512]; - FILE *fp; - int i=0,i1; - sprintf(buf,"ls %s",in_name); - fp = popen(buf, "r"); - if (fp) { - while (fgets(buf,sizeof(buf), fp)) { - printf("%s\n",buf); + CSndWaveCtrl *swc=(CSndWaveCtrl *)CAlloc(sizeof(CSndWaveCtrl)); + swc->sample_rate=sample_rate; + return swc; +} + +void SndWaveAddBuf(CSndWaveCtrl *swc,BYTE *buf,int num_samples, + double _freq,double _amp=1.0) +{ + int i,j,k; + double a,f,amp,phase; + if (!swc) return; + if (!_freq||!_amp) + swc->last_y=swc->phase=0; + else { + phase=swc->phase; + i=0; + if (INT_MAXsample_rate*_freq; + while (phase<0) + phase+=2; + while (phase>=2) + phase-=2; + while (i=1.0) + j=-amp; + else + j=amp; + k=j>>16; + *((short *)buf+i++)+=k; + phase+=f; + while (phase>=2) + phase-=2; } - pclose(fp); + swc->phase=phase; } } +#define SNDFILE_SAMPLE_RATE 8000 +//Header for a ".SND" file +class CFileSND +{public: + DWORD signature; //0x646e732e + DWORD offset; //24 + DWORD data_size; + DWORD coding; //3=16bit uncompressed + DWORD sample_rate; //Hz + DWORD channels; //1=mono + short body[1]; +}; + +#define SND_FILE_MAX 0x007FF000 + +int SndFileCreate(char *print_fmt,double normalized_vol=1.0, + double reverb_delay=0,double reverb_intensity=0,double time_shift=0) +{ + int i,i1,k,cnt,cnt2,level,file_num; + double dt; + CFileSND *s; + CSndWaveCtrl *swc=SndWaveCtrlNew(SNDFILE_SAMPLE_RATE); + CSndData *d,*d1; + char st[512]; + FILE *out_file; + +// dt=snd.record_head.last->time-snd.record_head.next->time; + if (!dt) return 0; + cnt=dt*SNDFILE_SAMPLE_RATE; + cnt++; //Terminator + + s=(CFileSND *)CAlloc(sizeof(CFileSND)-sizeof(short)+cnt*sizeof(short)); + s->signature=0x646e732e; + s->offset=EndianDWORD(sizeof(CFileSND)-sizeof(short)); + s->coding=EndianDWORD(3); + s->sample_rate=EndianDWORD(SNDFILE_SAMPLE_RATE); + s->channels=EndianDWORD(1); + + if (time_shift) { +// d=snd.record_head.next; + d->time-=time_shift; +// while (d->next!=&snd.record_head) { + while (TRUE) { +// 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,(BYTE *)&s->body[k],i1-i, + Ona2Freq(d->ona),normalized_vol); + k+=i1-i; + i=i1; + } +// QueRem(d); +// Free(d); + d=d1; +// } + + //Reverb + if (reverb_intensity) { + if (dt=reverb_delay*SNDFILE_SAMPLE_RATE) + for (i=dt;ibody[i]+=reverb_intensity*s->body[i-(DWORD)dt]; + } + + //Get rid of D.C. component + for (k=0;k<3;k++) { + level=0; + for (i=0;ibody[i]; + level/=cnt-1; + for (i=0;ibody[i]-level<=SHORT_MIN) + s->body[i]=SHORT_MIN; + else if (s->body[i]-level>=SHORT_MIN) + s->body[i]=SHORT_MAX; + else + s->body[i]=s->body[i]-level; + } + } + + for (i=0;ibody[i]=EndianWORD(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; +// } + + cnt2=cnt; + file_num=0; + while (cnt2>0) { + i=cnt2; + if (i>SND_FILE_MAX) + i=SND_FILE_MAX; + s->data_size=EndianDWORD(i*sizeof(short)); + memcpy(s->body,&s->body[file_num*SND_FILE_MAX],i*sizeof(short)); + sprintf(st,print_fmt,file_num++); + if (out_file=fopen(st,"wb")) { + fwrite(s,1,sizeof(CFileSND)-sizeof(short)+i*sizeof(short),out_file); + fclose(out_file); + } + cnt2-=i; + } + Free(s); + Free(swc); + return cnt; +} + +#define GR_WIDTH 640 +#define GR_HEIGHT 480 +#define COLORS_NUM 16 + +class CBGR24 +{public: + BYTE b,g,r,pad; +}; + +class CBGR48 +{public: + WORD b,g,r,pad; +} gr_palette_std[COLORS_NUM]={ +{0x0000,0x0000,0x0000,0},{0xAAAA,0x0000,0x0000,0}, +{0x0000,0xAAAA,0x0000,0},{0xAAAA,0xAAAA,0x0000,0}, +{0x0000,0x0000,0xAAAA,0},{0xAAAA,0x0000,0xAAAA,0}, +{0x0000,0x5555,0xAAAA,0},{0xAAAA,0xAAAA,0xAAAA,0}, +{0x5555,0x5555,0x5555,0},{0xFFFF,0x5555,0x5555,0}, +{0x5555,0xFFFF,0x5555,0},{0xFFFF,0xFFFF,0x5555,0}, +{0x5555,0x5555,0xFFFF,0},{0xFFFF,0x5555,0xFFFF,0}, +{0x5555,0xFFFF,0xFFFF,0},{0xFFFF,0xFFFF,0xFFFF,0}}; + +#define DCF_COMPRESSED 1 +#define DCF_PALETTE 2 + +class CDC +{public: + CDate cdt; + int x0,y0, + width,width_internal, + height, + flags; + CBGR48 palette[COLORS_NUM]; + BYTE *body; +}; + +CDC *DCNew(DWORD width,DWORD height) +{ + CDC *res=(CDC *)CAlloc(sizeof(CDC)); + res->width=width; + res->width_internal=(width+7)&~7; + res->height=height; + res->body=(BYTE *)CAlloc(res->width_internal*res->height); + return res; +} + +void DCDel(CDC *dc) +{//Free dc, image body, rot mat and depth buf. + if (!dc) return; + Free(dc->body); + Free(dc); +} + +CDC *DCLoad(BYTE *src,DWORD *_size) +{//Loads device context from mem. + BYTE *ptr=src; + CArcCompress *arc; + DWORD body_size; + CDC *res=(CDC *)CAlloc(sizeof(CDC)); + memcpy(res,ptr,sizeof(CDC)-sizeof(BYTE *)-COLORS_NUM*sizeof(CBGR48)); + ptr+=sizeof(CDC)-sizeof(BYTE *)-COLORS_NUM*sizeof(CBGR48); + if (res->flags&DCF_PALETTE) { + memcpy(&res->palette,ptr,COLORS_NUM*sizeof(CBGR48)); + ptr+=COLORS_NUM*sizeof(CBGR48); + } else + memcpy(&res->palette,gr_palette_std,sizeof(gr_palette_std)); + + body_size=res->width_internal*res->height; + if (res->flags&DCF_COMPRESSED) { + res->flags&=~DCF_COMPRESSED; + arc=(CArcCompress *)ptr; + res->body=ExpandBuf(arc); + ptr+=arc->compressed_size; + } else { + res->body=(BYTE *)malloc(body_size); + memcpy(res->body,ptr,body_size); + ptr+=body_size; + } + *_size=ptr-src; + return res; +} + +BOOL GrBlot(CDC *dc,int x,int y,CDC *img) +{ + int j,k,k1,w1,h1,w2,h2; + if (x<0) + w1=-x; + else + w1=0; + if (y<0) + h1=-y; + else + h1=0; + w2=img->width; + h2=img->height; + if (x+w2>dc->width) + w2=dc->width-x; + if (y+h2>dc->height) + h2=dc->height-y; + if (w1width && h1

height) { + k = h1 *img ->width_internal+w1; + k1=(h1+y)*dc->width_internal+x+w1; + for (j=h1;jbody+k1,img->body+k,w2-w1); + k +=img->width_internal; + k1+=dc->width_internal; + } + return TRUE; + } else + return FALSE; +} + +#define BMP_COLORS_NUM 16 + +class CFileBMP +{public: + WORD type; + DWORD file_size; + DWORD reserved; + DWORD data_offset; + + DWORD header_size; + DWORD width; + DWORD height; + WORD planes; + WORD bit_cnt; + DWORD compression; + DWORD image_size; + DWORD x_pixs_per_meter; + DWORD y_pixs_per_meter; + DWORD colors_used; + DWORD important_colors; + + CBGR24 palette[BMP_COLORS_NUM]; +}; + +CFileBMP *BMPRLE4To(CDC *dc) +{//To Windows RLE4 bit BMP. + BYTE *src,*ptr,*start; + int i,x,y,w=dc->width,cnt,pattern; + CBGR48 palette[COLORS_NUM]; + CFileBMP *bmp =(CFileBMP *)CAlloc(sizeof(CFileBMP)+ + 2*(dc->width+1)*dc->height); + bmp->type ='B'+('M'<<8); + bmp->planes =1; + bmp->data_offset=sizeof(CFileBMP); + bmp->header_size=sizeof(CFileBMP)-BMP_COLORS_NUM*sizeof(CBGR24)-14; + bmp->width =dc->width; + bmp->height =dc->height; + bmp->bit_cnt =4; + bmp->compression=2; //RLE4 + memcpy(&palette,&gr_palette_std,sizeof(gr_palette_std)); + for (i=0;ipalette[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=(BYTE *)bmp+bmp->data_offset; + for (y=dc->height-1;y>=0;y--) { + src=y*dc->width_internal+dc->body; + x=0; + while (ximage_size=ptr-start; + bmp->file_size=sizeof(CFileBMP)+bmp->image_size; + return bmp; +} + +void BMPWrite(char *filename,CDC *dc) +{//Window's BMP Files. + CFileBMP *bmp=BMPRLE4To(dc); + FILE *out_file; + if (out_file=fopen(filename,"wb")) { + fwrite(bmp,1,bmp->file_size,out_file); + fclose(out_file); + } + Free(bmp); +} + +int MV2BMPLst(char *mv_print_fmt,char *dir_print_fmt,char *bmp_print_fmt, + char *mp4_print_fmt,char *out_name,double fps=30000.0/1001) +{//Cvt GR list MV file to BMP lst + DWORD bmp_num,size; + BOOL cont=TRUE; + int num=0,remaining,mv_percent_cnt,bmp_percent_cnt,dir_percent_cnt, + mp4_percent_cnt; + CDC *dc,*base; + BYTE *src,*src_base; + char st[512],st_dir[512],st_bmp[512],st_mp4[512]; + CDate cdt; + FILE *mv_file,*lst_file=fopen("TOSZTEMP_VID_LIST.TXT","wt"); + cdt.time=0; + cdt.date=INT_MIN; + + if (mv_print_fmt) + mv_percent_cnt=StrOcc(mv_print_fmt,'%'); + else + mv_percent_cnt=0; + if (bmp_print_fmt) + bmp_percent_cnt=StrOcc(bmp_print_fmt,'%'); + else + bmp_percent_cnt=0; + if (dir_print_fmt) + dir_percent_cnt=StrOcc(dir_print_fmt,'%'); + else + dir_percent_cnt=0; + if (mp4_print_fmt) + mp4_percent_cnt=StrOcc(mp4_print_fmt,'%'); + else + mp4_percent_cnt=0; + do { + if (mv_percent_cnt) + sprintf(st,mv_print_fmt,num); + else + strcpy(st,mv_print_fmt); + if (mv_file=fopen(st,"rb")) { + if (dir_percent_cnt) + sprintf(st_dir,dir_print_fmt,num); + else + strcpy(st_dir,dir_print_fmt); + sprintf(st,"mkdir %s",st_dir); + system(st); + bmp_num=0; + + remaining=FSize(mv_file); + src=src_base=(BYTE *)malloc(remaining+1); + fread(src_base,1,remaining,mv_file); + src_base[remaining]=0; + base=DCNew(GR_WIDTH,GR_HEIGHT); + while (cont && remaining>0) { + dc=DCLoad(src,&size); + if (!size) { + cont=FALSE; + break; + } + GrBlot(base,dc->x0,dc->y0,dc); + if (cdt.time==0 && cdt.date==INT_MIN) { + cdt.time=dc->cdt.time; + cdt.date=dc->cdt.date; + } + while (cdt.datecdt.date|| + ((cdt.date==dc->cdt.date) && (cdt.time<=dc->cdt.time))) { + if (bmp_percent_cnt) + sprintf(st_bmp,bmp_print_fmt,bmp_num); + else + strcpy(st_bmp,bmp_print_fmt); + sprintf(st,"%s/%s",st_dir,st_bmp); + BMPWrite(st,base); + if (cdt.time>=DWORD_MAX-(DWORD)(CDATE_FREQ/fps)+1) + cdt.date++; + cdt.time+=(DWORD)(CDATE_FREQ/fps); + if (!bmp_percent_cnt) { + cont=FALSE; + break; + } + bmp_num++; + } + DCDel(dc); + src+=size; + remaining-=size; + } + DCDel(base); + Free(src_base); + fclose(mv_file); + } else + break; + if (mp4_print_fmt) { + if (mp4_percent_cnt) + sprintf(st_mp4,mp4_print_fmt,num); + else + strcpy(st_mp4,mp4_print_fmt); + sprintf(st,"ffmpeg -framerate %0.16f -i %s/%s " + "-c:v libx264 -vf \"scale=2*trunc(iw/2):-2,setsar=1\" " + "-profile:v main -pix_fmt yuv420p %s", + fps,st_dir,bmp_print_fmt,st_mp4); + system(st); + fprintf(lst_file,"file '%s'\r\n",st_mp4); + } + num++; + if (!mv_percent_cnt) + break; + } while (cont); + + if (lst_file) { + fclose(lst_file); + if (num && out_name) { + sprintf(st,"ffmpeg -f concat -i TOSZTEMP_VID_LIST.TXT -c copy %s", + out_name); + system(st); + } + } + system("rm -R TOSZTEMP*"); + return num; +} + +int SND2MP4Lst(char *snd_print_fmt,char *mp4_print_fmt,char *out_name, + int rate=24000) +{//Cvt SND lst to BMP lst + int num=0,snd_percent_cnt,mp4_percent_cnt,mkdir_percent_cnt; + char st[512],st_snd[512],st_mp4[512]; + FILE *snd_file,*lst_file=fopen("TOSZTEMP_AUD_LIST.TXT","wt"); + + if (snd_print_fmt) + snd_percent_cnt=StrOcc(snd_print_fmt,'%'); + else + snd_percent_cnt=0; + if (mp4_print_fmt) + mp4_percent_cnt=StrOcc(mp4_print_fmt,'%'); + else + mp4_percent_cnt=0; + + while (TRUE) { + if (snd_percent_cnt) + sprintf(st_snd,snd_print_fmt,num); + else + strcpy(st_snd,snd_print_fmt); + if (snd_file=fopen(st_snd,"rb")) { + fclose(snd_file); + if (mp4_percent_cnt) + sprintf(st_mp4,mp4_print_fmt,num); + else + strcpy(st_mp4,mp4_print_fmt); + sprintf(st,"ffmpeg -i %s -ar %d %s",st_snd,rate,st_mp4); + system(st); + fprintf(lst_file,"file '%s'\r\n",st_mp4); + } else + break; + num++; + if (!snd_percent_cnt) + break; + } + + if (lst_file) { + fclose(lst_file); + if (num && out_name) { + sprintf(st,"ffmpeg -f concat -i TOSZTEMP_AUD_LIST.TXT -c copy %s", + out_name); + system(st); + } + } + system("rm -R TOSZTEMP*"); + return num; +} + int main(int argc, char* argv[]) { - char *in_name,*out_name,buf[256]; - BOOL cvt_ascii,fill_gaps,del_in=FALSE; + char *in_name,*out_name,st[256], + *mv_print_fmt,*snd_print_fmt; + BOOL cvt_ascii,del_in=FALSE; int i=1,l; - if (argc>i && !strcmp(argv[i],"-ascii")) { - cvt_ascii=TRUE; + if (argc>i && !strcmp(argv[i],"-bmp")) { i++; - } else - cvt_ascii=FALSE; - if (argc>i && !strcmp(argv[i],"-gaps")) { - fill_gaps=TRUE; - i++; - } else - fill_gaps=FALSE; - if (argc>i) { - in_name=argv[i++]; - if (argc>i) + if (argc>i) + mv_print_fmt=argv[i++]; + else + mv_print_fmt=(char *)"VID%03d.MV"; + if (argc>i) out_name=argv[i++]; - else { - strcpy(buf,in_name); - l=strlen(buf); - if (l>2 && buf[l-1]=='Z' && buf[l-2]=='.') { - buf[l-2]=0; - del_in=TRUE; - } - out_name=buf; - } - if (fill_gaps) - FillGaps(in_name); - else if (Cvt(in_name,out_name,cvt_ascii)) { - if (del_in) { - sprintf(buf,"rm %s",in_name); - system(buf); - } + else + out_name=(char *)"VIDEO.MP4"; + MV2BMPLst(mv_print_fmt,(char *)"TOSZTEMP%03d",(char *)"TOSZTEMP%06d.BMP", + (char *)"TOSZTEMPVID%03d.MP4",out_name); + } else if (argc>i && !strcmp(argv[i],"-snd")) { + i++; + if (argc>i) + snd_print_fmt=argv[i++]; + else + snd_print_fmt=(char *)"AUD%03d.SND"; + if (argc>i) + out_name=argv[i++]; + else + out_name=(char *)"AUDIO.MP4"; + SND2MP4Lst(snd_print_fmt,(char *)"TOSZTEMPAUD%03d.MP4",out_name); + } else if (argc>i && !strcmp(argv[i],"-mp4")) { + i++; + if (argc>i) + mv_print_fmt=argv[i++]; + else + mv_print_fmt=(char *)"VID%03d.MV"; + if (argc>i) + snd_print_fmt=argv[i++]; + else + snd_print_fmt=(char *)"AUD%03d.SND"; + MV2BMPLst(mv_print_fmt,(char *)"TOSZTEMP%03d", + (char *)"TOSZTEMP%06d.BMP",(char *)"TOSZTEMPVID%03d.MP4", + (char *)"TOSZVIDEO.MP4"); + SND2MP4Lst(snd_print_fmt,(char *)"TOSZTEMPAUD%03d.MP4", + (char *)"TOSZAUDIO.MP4"); + if (argc>i) + out_name=argv[i++]; + else + out_name=(char *)"MOVIE.MP4"; + sprintf(st,"ffmpeg -i TOSZVIDEO.MP4 -i TOSZAUDIO.MP4 %s",out_name); + system(st); + system("rm TOSZVIDEO.MP4"); + system("rm TOSZAUDIO.MP4"); + } else { + if (argc>i && !strcmp(argv[i],"-ascii")) { + cvt_ascii=TRUE; + i++; } else - printf("Fail: %s %s\r\n",in_name,out_name); - } else - puts("TOSZ [-ascii] [-gaps] in_name [out_name]\r\n\r\n" - "TOSZ expands a single TempleOS file. The -ascii flag will convert " - "nonstandard TempleOS ASCII characters to regular ASCII. The -gap flag " - "will fill-in missing BMP files in the sequence VID%05d.BMP.\r\n"); + cvt_ascii=FALSE; + if (argc>i) { + in_name=argv[i++]; + if (argc>i) + out_name=argv[i++]; + else { + strcpy(st,in_name); + l=strlen(st); + if (l>2 && st[l-1]=='Z' && st[l-2]=='.') { + st[l-2]=0; + del_in=TRUE; + } + out_name=st; + } + if (argc>i) + out_name=argv[i++]; + else { + strcpy(st,in_name); + l=strlen(st); + if (l>2 && st[l-1]=='Z' && st[l-2]=='.') { + st[l-2]=0; + del_in=TRUE; + } + out_name=st; + } + if (Cvt(in_name,out_name,cvt_ascii)) { + if (del_in) { + sprintf(st,"rm %s",in_name); + system(st); + } + } else + printf("Fail: %s %s\r\n",in_name,out_name); + } else { + puts("TOSZ [-ascii] in_name [out_name]\r\n\r\n" + "TOSZ expands a single TempleOS file. " + "The -ascii flag will convert " + "nonstandard TempleOS ASCII " + "characters to regular ASCII.\r\n\r\n"); + puts("TOSZ -bmp VID%03d.MV VIDEO.MP4\r\n" + "TOSZ will expand MV files to a sequence of BMP files and, " + "will call ffmpeg to convert BMP files to an MP4 file.\r\n\r\n"); + puts("TOSZ -snd AUD%03d.SND AUDIO.MP4\r\n\r\n" + "TOSZ will call ffmpeg to convert SND files " + "to an MP4 file.\r\n"); + puts("TOSZ -mp4 VID%03d.MV AUD%03d.SND MOVIE.MP4\r\n\r\n" + "TOSZ will call ffmpeg to convert MV files and SND files " + "to a combined MP4 file.\r\n"); + } + } return EXIT_SUCCESS; } diff --git a/TempleOSCD/Linux/make_tosz b/TempleOSCD/Linux/make_tosz new file mode 100644 index 0000000..118782a --- /dev/null +++ b/TempleOSCD/Linux/make_tosz @@ -0,0 +1,9 @@ +#!/bin/bash + +#Make TOSZ + +echo Make TOSZ +cc TOSZ.CPP -o TOSZ +chmod 777 TOSZ + + diff --git a/TempleOSCD/Misc/Tour/TourB.IN b/TempleOSCD/Misc/Tour/TourB.IN index f737d0b..039d26a 100644 --- a/TempleOSCD/Misc/Tour/TourB.IN +++ b/TempleOSCD/Misc/Tour/TourB.IN @@ -17,5 +17,4 @@ InPrint(250,"Dir;\n"); Sleep(1500); TourPut( -"$$GREEN$$Type()$$FG$$ can also be used on $$GREEN$$.BMP$$FG$$ or $$GREEN$$.GR$$FG$$ " -"files!",TRUE); +"$$GREEN$$Type()$$FG$$ can also be used on $$GREEN$$.GR$$FG$$ files!",TRUE);