Rijn/TempleOS-Rijn
1
1 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Nightly update (ISO SHA-1 a27f9ed)

Browse Source
This commit is contained in:
ohnx's Git Bot committed 2017-11-07 00:03:53 -05:00
1 parent c2a069f1e5
commit fc2ebdad75
26 files changed
+351 -240
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

TempleOSCD/Apps/Psalmody/PsalmodyDraw.HC
+2 -2
View File
@@ -154,7 +154,7 @@ U0 PsmRecalcNoteXY()
break;
else {
if (tmpn->type!=PSMT_METER) {
if (tmpn->ona!=ONA_REST) {
if (tmpn->ona) {
ona=tmpn->ona;
if (Bt(&tmpn->flags,PSMf_SHARP))
ona--;
@@ -230,7 +230,7 @@ U0 DrawIt(CTask *task,CDC *dc)
} else if (tmpn->flags&PSMF_SEL)
dc->color=RED;
else {
if (tmpn->ona!=ONA_REST)
if (tmpn->ona)
dc->color=BLACK;
else
dc->color=LTGRAY;
TempleOSCD/Apps/Psalmody/PsalmodyFile.HC
+4 -4
View File
@@ -164,7 +164,7 @@ U0 PsmLoadSongStr(U8 *st,I64 *psm_octave,F64 *psm_duration)
}
tmpn->ona=Note2Ona(note,*psm_octave);
} else
tmpn->ona=ONA_REST;
tmpn->ona=0;
if (*psm_duration<=2*.25/3)
i=0;
else if (*psm_duration<=.25)
@@ -263,7 +263,7 @@ U8 *PsmCvtSong()
*dst++='/';
*dst++=tmpn->meter_bottom+'0';
} else {
if (tmpn->ona!=ONA_REST) {
if (tmpn->ona) {
ona=tmpn->ona;
if (Bt(&tmpn->flags,PSMf_SHARP))
ona--;
@@ -275,7 +275,7 @@ U8 *PsmCvtSong()
}
if (Bt(&tmpn->flags,PSMf_TIE))
*dst++='(';
if (octave!=last_octave && tmpn->ona!=ONA_REST) {
if (octave!=last_octave && tmpn->ona) {
*dst++=octave+'0';
last_octave=octave;
}
@@ -286,7 +286,7 @@ U8 *PsmCvtSong()
*dst++=src[1];
last_duration=tmpn->duration;
}
if (tmpn->ona!=ONA_REST) {
if (tmpn->ona) {
src=LstSub(note,psm_note_lst);
*dst++=src[0];
if (src[1])
TempleOSCD/Apps/Psalmody/PsalmodyMain.HC
+7 -7
View File
@@ -42,10 +42,10 @@ U0 PsmRightClick(I64 x,I64 y)
switch (i) {
case PSMR_REST:
if (tmpn->type==PSMT_NOTE)
tmpn->ona=ONA_REST;
tmpn->ona=0;
break;
case PSMR_SHARP:
if (tmpn->type==PSMT_NOTE && tmpn->ona!=ONA_REST) {
if (tmpn->type==PSMT_NOTE && tmpn->ona) {
if (Btr(&tmpn->flags,PSMf_FLAT))
tmpn->ona++;
if (Btc(&tmpn->flags,PSMf_SHARP))
@@ -55,7 +55,7 @@ U0 PsmRightClick(I64 x,I64 y)
}
break;
case PSMR_FLAT:
if (tmpn->type==PSMT_NOTE && tmpn->ona!=ONA_REST) {
if (tmpn->type==PSMT_NOTE && tmpn->ona) {
if (Btr(&tmpn->flags,PSMf_SHARP))
tmpn->ona--;
if (Btc(&tmpn->flags,PSMf_FLAT))
@@ -350,7 +350,7 @@ U0 PsmPopMode()
U0 Psalmody(U8 *dirname="~/Psalmody")
{
Bool was_playing,is_null=TRUE,was_null=TRUE;
I64 arg1,arg2,msg_code=0,col,ona=ONA_REST,last_ona=ONA_REST,
I64 arg1,arg2,msg_code=0,col,ona=0,last_ona=0,
psm_octave=4,timeout_val,timeout_val2,old_doc_flags;
U8 *filename=NULL,*st,*st2;
PsmNote *tmpn;
@@ -504,7 +504,7 @@ mo_got_msg:
case '[': ona+=8; break;
case '\'': ona+=9; break;
case ']': ona+=10; break;
case CH_SPACE: ona=ONA_REST; break;
case CH_SPACE: ona=0; break;
end:
is_null=FALSE;
break;
@@ -742,9 +742,9 @@ mo_got_msg:
PsmRightClick(arg1,arg2);
}
if (is_null)
ona=ONA_REST;
ona=0;
if (ona!=last_ona || is_null!=was_null) {
if (ona==ONA_REST) {
if (!ona) {
if (is_null)
st="";
else