TempleOSCDV4.08.ISO

Apps/Psalmody/Help.TXT

@@ -10,9 +10,9 @@ $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$<CTRL-l>$FG$, but you should do it after pressing $FG,2$<CTRL-t>$FG$ because the clipboard-insert in $FG,2$<CTRL-l>$FG$ is screwy.  See this $SO,"<Song>",A="2qG3ECB2eGG3qCeFDsBGBG2qG3ECB2eGG3qCeFDsBGBGqEeEFqEB2eG3FetCAGqFCEeEFqEB2eG3FetCAGqFC"$ after pressing $FG,2$<CTRL-t>$FG$, now.
 
-* You can call $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.CPP,JukeBox"$("::/Home/Psalmody"); to play your songs.
+* You can call $LK,"JukeBox",A="FF:::/Apps/Psalmody/JukeBox.CPP,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$<CTRL-ALT-key>$FG$ to toggle this system level recording feat.  See $LK,"Snd",A="MN:Snd"$().  Add this code to your $LK,"::/Home/HomeKeyPlugIns.CPP"$ file.
+* 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$<CTRL-ALT-key>$FG$ to toggle this system level recording feat.  See $LK,"Snd",A="MN:Snd"$().  Add this code to your $LK,"~/HomeKeyPlugIns.CPP"$ file.
 
 $FG,5$U0 CtrlAltR(I64)
 {
@@ -20,5 +20,5 @@ $FG,5$U0 CtrlAltR(I64)
 }
 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 select reverb and averaging, also.
+* 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.
 

Apps/Psalmody/Install.CPP

@@ -1,2 +1,2 @@
-if (!FileFind("::/Home/Psalmody",,FUF_JUST_DIRS))
-  MkDir("::/Home/Psalmody");
+if (!FileFind("~/Psalmody",,FUF_JUST_DIRS))
+  MkDir("~/Psalmody");

Apps/Psalmody/JukeBox.CPP

@@ -49,7 +49,7 @@ Bool JBPutKey(CDoc *doc,U8 *,I64 ch,I64 sc)
   return FALSE;
 }
 
-public U0 JukeBox(U8 *dirname="::/Home/Psalmody",U8 **_filename=NULL)
+public U0 JukeBox(U8 *dirname="~/Psalmody",U8 **_filename=NULL)
 {//_filename is for using this as a song-chooser program.
   I64 i=0,rating;
   U8 *st,*st2;

Apps/Psalmody/JukePuppet.CPP

@@ -72,7 +72,7 @@ U0 JukeSongPuppet(CTask *juke_task,I64 passes,I64 song_num,U8 *name)
   Kill(task);
 }
 
-public U0 JukeSongsPuppet(U8 *dirname="::/Home/Psalmody",I64 passes=2,
+public U0 JukeSongsPuppet(U8 *dirname="~/Psalmody",I64 passes=2,
 			I64 start_song=0,I64 end_song=MAX_I64)
 {//Help make music video by puppeting JukeBox task.
   I64 i;

Apps/Psalmody/Psalmody.CPP

@@ -29,8 +29,8 @@ $WW,1$$WW,0$*/
 #define PSMT_NOTE	1
 #define PSMT_METER	2
 
-#define PSMf_SELECTED	0
-#define PSMF_SELECTED	1
+#define PSMf_SEL	0
+#define PSMF_SEL	1
 #define PSMf_SHARP	1
 #define PSMf_FLAT	2
 #define PSMf_TIE	3

Apps/Psalmody/PsalmodyDraw.CPP

@@ -86,15 +86,15 @@ Bool PsmIsDotted(I64 duration)
     return FALSE;
 }
 
-U0 PsmMarkSelected(I64 x1,I64 x2,Bool sel)
+U0 PsmMarkSel(I64 x1,I64 x2,Bool sel)
 {
   PsmNote *tempo=oc.root.next;
   while (tempo!=&oc.root) {
     if (sel) {
       if (x1<=tempo->x<=x2)
-	tempo->flags|=PSMF_SELECTED;
+	tempo->flags|=PSMF_SEL;
     } else
-      tempo->flags&=~PSMF_SELECTED;
+      tempo->flags&=~PSMF_SEL;
     tempo=tempo->next;
   }
 }
@@ -236,7 +236,7 @@ U0 DrawIt(CTask *task,CDC *dc)
       if (tempo==oc.cur_note && PsmBlink) {
 	dc->color=BROWN;
 	GrPrint(dc,x+8,y,"%s",tempo->word);
-      } else if (tempo->flags&PSMF_SELECTED)
+      } else if (tempo->flags&PSMF_SEL)
 	dc->color=RED;
       else {
 	if (tempo->note!=NOTE_REST)
@@ -331,7 +331,7 @@ Bool PsmGetPickToolBox(I64 xx,I64 yy)
 {
   if (PSM_TOOLS_X<=xx<PSM_TOOLS_X+27 &&
 	PSM_TOOLS_Y<=yy<PSM_TOOLS_Y+15) {
-    PsmMarkSelected(0,0,FALSE);
+    PsmMarkSel(0,0,FALSE);
     if (xx<PSM_TOOLS_X+13)
       oc.tool=PSMTT_BOX_TOOL;
     else

Apps/Psalmody/PsalmodyFile.CPP

@@ -33,11 +33,11 @@ U0 PsmCutToClipboard()
   tempo=oc.root.next;
   while (tempo!=&oc.root) {
     tempo1=tempo->next;
-    if (tempo->flags&PSMF_SELECTED) {
+    if (tempo->flags&PSMF_SEL) {
       if (oc.cur_note==tempo)
 	oc.cur_note=tempo->next;
       QueRem(tempo);
-      tempo->flags&=~PSMF_SELECTED;
+      tempo->flags&=~PSMF_SEL;
       QueIns(tempo,oc.clipboard.last);
     }
     tempo=tempo1;
@@ -61,8 +61,8 @@ U0 PsmCopyToClipboard()
   PsmSongDel(&oc.clipboard);
   tempo=oc.root.next;
   while (tempo!=&oc.root) {
-    if (tempo->flags&PSMF_SELECTED) {
-      tempo->flags&=~PSMF_SELECTED;
+    if (tempo->flags&PSMF_SEL) {
+      tempo->flags&=~PSMF_SEL;
       tempo1=PsmNoteCopy(tempo);
       QueIns(tempo1,oc.clipboard.last);
     }

Apps/Psalmody/PsalmodyMain.CPP

@@ -241,7 +241,7 @@ U0 PsmLeftClickStaffBox(I64 x,I64 y)
     GrBorder(oc.dc2,x,y,a1,a2);
     if (msg_code==MSG_IP_L_UP) {
       if (x>a1) SwapI64(&x,&a1);
-      PsmMarkSelected(x,a1,TRUE);
+      PsmMarkSel(x,a1,TRUE);
     }
   } while (msg_code!=MSG_IP_L_UP);
   DrawDC2;
@@ -396,7 +396,7 @@ U0 PsmPopMode()
 #define PSMF_CD		1
 #define PSMF_INCOMPLETE	2
 
-U0 Psalmody(U8 *dirname="::/Home/Psalmody")
+U0 Psalmody(U8 *dirname="~/Psalmody")
 {
   Bool was_playing;
   I64 a1,a2,msg_code=0,col,
@@ -536,7 +536,7 @@ mo_got_msg:
 	    col=0;
 	  } else {
 	    switch (a1) {
-	      sub_switch_start:
+	      start:
 		case 'a': note=7; octave--; break;
 		case 's': note=8; octave--; break;
 		case 'e': note=9; octave--; break;
@@ -556,7 +556,7 @@ mo_got_msg:
 		case '[': note=11; break;
 		case '\'': note=0; octave++; break;
 		case ']': note=1; octave++; break;
-	      sub_switch_end:
+	      end:
 		f=Note2Freq(note,octave);
 		break;
 	      case CH_SPACE:
@@ -572,13 +572,13 @@ mo_got_msg:
 		      while (oc.cur_note->last!=&oc.root) {
 			oc.cur_note=oc.cur_note->last;
 			if (oc.cur_note!=&oc.root)
-			  LBEqu(&oc.cur_note->flags,PSMf_SELECTED,a2&SCF_SHIFT);
+			  LBEqu(&oc.cur_note->flags,PSMf_SEL,a2&SCF_SHIFT);
 		      }
 		    } else {
 		      if (oc.cur_note->last!=&oc.root) {
 			oc.cur_note=oc.cur_note->last;
 			if (oc.cur_note!=&oc.root)
-			  LBEqu(&oc.cur_note->flags,PSMf_SELECTED,a2&SCF_SHIFT);
+			  LBEqu(&oc.cur_note->flags,PSMf_SEL,a2&SCF_SHIFT);
 		      }
 		    }
 		    break;
@@ -586,13 +586,13 @@ mo_got_msg:
 		    if (a2&SCF_CTRL) {
 		      while (oc.cur_note!=&oc.root) {
 			if (oc.cur_note!=&oc.root)
-			  LBEqu(&oc.cur_note->flags,PSMf_SELECTED,a2&SCF_SHIFT);
+			  LBEqu(&oc.cur_note->flags,PSMf_SEL,a2&SCF_SHIFT);
 			oc.cur_note=oc.cur_note->next;
 		      }
 		    } else {
 		      if (oc.cur_note!=&oc.root) {
 			if (oc.cur_note!=&oc.root)
-			  LBEqu(&oc.cur_note->flags,PSMf_SELECTED,a2&SCF_SHIFT);
+			  LBEqu(&oc.cur_note->flags,PSMf_SEL,a2&SCF_SHIFT);
 			oc.cur_note=oc.cur_note->next;
 		      }
 		    }
@@ -638,7 +638,7 @@ mo_got_msg:
 	      case CH_CTRLO:
 		PsmPopMode;
 		RegOneTimePopUp(ARf_PSALMODY_JUKEBOX,
-		      "Select a song and preview it.\n"
+		      "Sel a song and preview it.\n"
 		      "$$GREEN$$<SHIFT-ESC>$$FG$$ to load it into Psalmody.\n\n"
 		      ST_WARN_ST " Graphics and other embelishments\n"
 		      "will be lost because Psalmody can't\n"