Housekeeping

This commit is contained in:
Devine Lu Linvega 2024-08-27 08:20:28 -07:00
parent eb48ec2382
commit efbd264273
2 changed files with 41 additions and 46 deletions

View File

@ -408,9 +408,9 @@
0000 0000 0000 0000 0000 3333 0000 0000 0000 0000 0000 0000 0000 3333 0000 0000
0000 0000 0000 0000 0000 3030 0000 0000 ] 0000 0000 0000 0000 0000 3030 0000 0000 ]
@mem &filepath $80 &dir $800 &folders $800 &tracks $800 &misc $200
@message &buf $200 @message &buf $200
@id3 &title $100 &artist $100 &album $100 @id3 &title $100 &artist $100 &album $100
@mem &filepath $80 &dir $800 &folders $800 &tracks $800

View File

@ -16,10 +16,9 @@
|000 |000
@misc $1
@selection $1 &mod $1 &track $1 @selection $1 &mod $1 &track $1
@path $2 &null $80 @path $2 &null $80
@lines &folders $1 &tracks $1 &misc $1 @lines &folders $1 &tracks $1
@playing $1 @playing $1
@paused $1 @paused $1
@secfrom $2 @secfrom $2
@ -199,6 +198,43 @@
[ LIT2 02 -paused ] LDZ ORA .paused STZ [ LIT2 02 -paused ] LDZ ORA .paused STZ
;dict/pause-cmd <pstr> !<draw-play> ;dict/pause-cmd <pstr> !<draw-play>
@<move> ( mod -- )
.selection LDZ ADD INCk ?{
POP count-lines #01 SUB !<select> }
count-lines DIVk MUL SUB
( >> )
@<select> ( id -- )
[ LIT &last ff ] NEQk ?{ POP2 JMP2r }
POP DUP ,&last STR
.selection STZ
<redraw-player> !<redraw>
@<pick> ( alt id -- )
DUP .lines/folders LDZ LTH ?&folder
.lines/folders LDZ SUB DUP .lines/tracks LDZ LTH ?&tracks
POP JMP2r
&tracks ( id -- )
DUP .selection/track STZ
#00 SWP
( CELLSIZE ) #70 SFT2 ;mem/tracks ADD2 !<send-load>
&folder ( id -- )
#00 SWP
( CELLSIZE ) #70 SFT2 ;mem/folders ADD2 !<enter>
@<enter> ( folder* -- )
[ LIT2 00 -selection ] STZ
push-path !<refresh-dir>
@<leave> ( -- )
pop-path !<refresh-dir>
@<escape> ( -- )
;path/null LDA ?<leave>
JMP2r
( (
@|events ) @|events )
@ -276,7 +312,6 @@
( | clean ) ( | clean )
[ LIT2 00 -lines/folders ] STZ [ LIT2 00 -lines/folders ] STZ
[ LIT2 00 -lines/tracks ] STZ [ LIT2 00 -lines/tracks ] STZ
[ LIT2 00 -lines/misc ] STZ
( | parse ) ( | parse )
;mem/dir ;mem/dir
&w ( -- ) &w ( -- )
@ -298,10 +333,7 @@
#0005 ADD2 LDAk [ LIT ". ] EQU ?&hidden #0005 ADD2 LDAk [ LIT ". ] EQU ?&hidden
is-folder ?&folder is-folder ?&folder
is-mp3 ?&mp3 is-mp3 ?&mp3
;mem/misc [ LIT2 00 -lines/misc ] LDZ POP2 JMP2r
( CELLSIZE ) #70 SFT2 ADD2 <lcpy>
.lines/misc LDZ INC .lines/misc STZ
JMP2r
&folder ( line* -- ) &folder ( line* -- )
;mem/folders [ LIT2 00 -lines/folders ] LDZ ;mem/folders [ LIT2 00 -lines/folders ] LDZ
@ -318,43 +350,6 @@
&hidden ( line* -- ) &hidden ( line* -- )
POP2 JMP2r POP2 JMP2r
@<move> ( mod -- )
.selection LDZ ADD INCk ?{
POP count-lines #01 SUB !<select> }
count-lines DIVk MUL SUB
( >> )
@<select> ( id -- )
[ LIT &last ff ] NEQk ?{ POP2 JMP2r }
POP DUP ,&last STR
.selection STZ
<redraw-player> !<redraw>
@<pick> ( alt id -- )
DUP .lines/folders LDZ LTH ?&folder
.lines/folders LDZ SUB DUP .lines/tracks LDZ LTH ?&tracks
POP JMP2r
&tracks ( id -- )
DUP .selection/track STZ
#00 SWP
( CELLSIZE ) #70 SFT2 ;mem/tracks ADD2 !<send-load>
&folder ( id -- )
#00 SWP
( CELLSIZE ) #70 SFT2 ;mem/folders ADD2 !<enter>
@<enter> ( folder* -- )
[ LIT2 00 -selection ] STZ
push-path !<refresh-dir>
@<leave> ( -- )
pop-path !<refresh-dir>
@<escape> ( -- )
;path/null LDA ?<leave>
JMP2r
@count-lines ( -- lines ) @count-lines ( -- lines )
.lines/folders LDZ .lines/tracks LDZ ADD JMP2r .lines/folders LDZ .lines/tracks LDZ ADD JMP2r