Update of /cvsroot/win32forth/win32forth/apps/Player4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19698/apps/Player4
Modified Files:
Catalog.f
Log Message:
Jos: Removed the debug command
Index: Catalog.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Catalog.f,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Catalog.f 30 Oct 2005 18:58:14 -0000 1.17
--- Catalog.f 31 Oct 2005 18:05:17 -0000 1.18
***************
*** 304,307 ****
--- 304,316 ----
>RecordDef FileSize 1 cells key: FileSizeKey FileSizeKey bin-sort
+ : &FlexKeyLen ( - &FlexKeyLen ) FlexKey &key-len ;
+ : MinFlexKey! ( n - ) min FlexKey ! ;
+
+ /artist /album + /Title + constant /Record
+
+ : by_record ( - FlexKey )
+ /Record &FlexKeyLen ! FlexKey @ >RecordDef Artist MinFlexKey! FlexKey
+ ;
+
: By_FileName ( - by ) by[ FileNameKey ]by ;
: By_Random ( - by ) by[ RandomKey ]by ;
***************
*** 316,320 ****
r@ RecordDef DriveType c@ .
r@ RecordDef MediaLabel r@ RecordDef Cnt_MediaLabel c@ type-space
! r@ RecordDef File_name r@ Cnt_File_name c@ type-space
cr 3 spaces
r@ RecordDef Artist r@ Cnt_Artist c@ type-space
--- 325,329 ----
r@ RecordDef DriveType c@ .
r@ RecordDef MediaLabel r@ RecordDef Cnt_MediaLabel c@ type-space
! r@ RecordDef File_name r@ Cnt_File_name c@ type-space
cr 3 spaces
r@ RecordDef Artist r@ Cnt_Artist c@ type-space
***************
*** 343,349 ****
;
- : &FlexKeyLen ( - &FlexKeyLen ) FlexKey &key-len ;
- : MinFlexKey! ( n - ) min FlexKey ! ;
-
: sort_by_filename ( - ) by_FileName sort-database ;
: sort_by_leastPlayed ( - ) by_leastPlayed sort-database ;
--- 352,355 ----
***************
*** 357,364 ****
r@ s_#Random- c@ of By_Random sort-database endof
! r@ s_Random_impopular- c@ of by[ RandomKey leastPlayedKey Ascending ]by
! sort-database endof
! r@ s_Random_popular- c@ of by[ RandomKey leastPlayedKey Descending ]by
! sort-database endof
r@ s_#Played- c@ of sort_by_leastPlayed endof
--- 363,372 ----
r@ s_#Random- c@ of By_Random sort-database endof
! r@ s_Random_impopular- c@ of by[ by_record RandomKey
! leastPlayedKey Ascending ]by
! sort-database endof
! r@ s_Random_popular- c@ of by[ by_record RandomKey
! leastPlayedKey Descending ]by
! sort-database endof
r@ s_#Played- c@ of sort_by_leastPlayed endof
***************
*** 367,379 ****
sizeof RecordDef FlexKey ! 0 &FlexKeyLen !
r@ s_Drivetype- c@
! if [ /Drivetype /MediaLabel + /artist + /Title + ] literal &FlexKeyLen !
FlexKey @ >RecordDef DriveType MinFlexKey!
then
r@ s_Label- c@
! if [ /MediaLabel /artist + /Title + ] literal &FlexKeyLen !
FlexKey @ >RecordDef MediaLabel MinFlexKey!
then
r@ s_Artist_Title- c@
! if [ /artist /Title + ] literal &FlexKeyLen !
FlexKey @ >RecordDef Artist MinFlexKey!
then
--- 375,387 ----
sizeof RecordDef FlexKey ! 0 &FlexKeyLen !
r@ s_Drivetype- c@
! if [ /Drivetype /MediaLabel + /Record + ] literal &FlexKeyLen !
FlexKey @ >RecordDef DriveType MinFlexKey!
then
r@ s_Label- c@
! if [ /MediaLabel /Record + ] literal &FlexKeyLen !
FlexKey @ >RecordDef MediaLabel MinFlexKey!
then
r@ s_Artist_Title- c@
! if [ /Record ] literal &FlexKeyLen !
FlexKey @ >RecordDef Artist MinFlexKey!
then
***************
*** 443,448 ****
;
- debug (add-file)
-
external
--- 451,454 ----
|
