diff --git a/gui/m291/src/assets.tal b/gui/m291/src/assets.tal index 686056b..f4a5b51 100644 --- a/gui/m291/src/assets.tal +++ b/gui/m291/src/assets.tal @@ -408,9 +408,9 @@ 0000 0000 0000 0000 0000 3333 0000 0000 0000 0000 0000 0000 0000 3030 0000 0000 ] -@mem &filepath $80 &dir $800 &folders $800 &tracks $800 &misc $200 - @message &buf $200 @id3 &title $100 &artist $100 &album $100 +@mem &filepath $80 &dir $800 &folders $800 &tracks $800 + diff --git a/gui/m291/src/m291.tal b/gui/m291/src/m291.tal index 4d8c824..6998ac6 100644 --- a/gui/m291/src/m291.tal +++ b/gui/m291/src/m291.tal @@ -16,10 +16,9 @@ |000 - @misc $1 @selection $1 &mod $1 &track $1 @path $2 &null $80 - @lines &folders $1 &tracks $1 &misc $1 + @lines &folders $1 &tracks $1 @playing $1 @paused $1 @secfrom $2 @@ -199,6 +198,43 @@ [ LIT2 02 -paused ] LDZ ORA .paused STZ ;dict/pause-cmd ! +@ ( mod -- ) + .selection LDZ ADD INCk ?{ + POP count-lines #01 SUB ! ( id -- ) + [ LIT &last ff ] NEQk ?{ POP2 JMP2r } + POP DUP ,&last STR + .selection STZ + ! + +@ ( 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 ! + + &folder ( id -- ) + #00 SWP + ( CELLSIZE ) #70 SFT2 ;mem/folders ADD2 ! + +@ ( folder* -- ) + [ LIT2 00 -selection ] STZ + push-path ! + +@ ( -- ) + pop-path ! + +@ ( -- ) + ;path/null LDA ? + JMP2r + ( @|events ) @@ -276,7 +312,6 @@ ( | clean ) [ LIT2 00 -lines/folders ] STZ [ LIT2 00 -lines/tracks ] STZ - [ LIT2 00 -lines/misc ] STZ ( | parse ) ;mem/dir &w ( -- ) @@ -298,10 +333,7 @@ #0005 ADD2 LDAk [ LIT ". ] EQU ?&hidden is-folder ?&folder is-mp3 ?&mp3 - ;mem/misc [ LIT2 00 -lines/misc ] LDZ - ( CELLSIZE ) #70 SFT2 ADD2 - .lines/misc LDZ INC .lines/misc STZ - JMP2r + POP2 JMP2r &folder ( line* -- ) ;mem/folders [ LIT2 00 -lines/folders ] LDZ @@ -318,43 +350,6 @@ &hidden ( line* -- ) POP2 JMP2r -@ ( mod -- ) - .selection LDZ ADD INCk ?{ - POP count-lines #01 SUB ! ( id -- ) - [ LIT &last ff ] NEQk ?{ POP2 JMP2r } - POP DUP ,&last STR - .selection STZ - ! - -@ ( 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 ! - - &folder ( id -- ) - #00 SWP - ( CELLSIZE ) #70 SFT2 ;mem/folders ADD2 ! - -@ ( folder* -- ) - [ LIT2 00 -selection ] STZ - push-path ! - -@ ( -- ) - pop-path ! - -@ ( -- ) - ;path/null LDA ? - JMP2r - @count-lines ( -- lines ) .lines/folders LDZ .lines/tracks LDZ ADD JMP2r