Menu
▾
▴
[Win32forth-cvs] win32forth/apps/Player4 Catalog.f,1.16,1.17 Mediatree.f,1.20,1.21 View.f,1.4,1.5
|
From: Jos v.d.V. <jo...@us...> - 2005-10-30 18:58:21
|
Update of /cvsroot/win32forth/win32forth/apps/Player4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26533/apps/Player4 Modified Files: Catalog.f Mediatree.f View.f Log Message: Jos: Prepared the catalog for Asx-play-lists and changed the view, so that it will also show the album from which the record was taken. The album is extracted from the full file-name. You will have to remove your old *.dat files for the catalog to use this version. (last time I hope) Index: Mediatree.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Mediatree.f,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Mediatree.f 26 Oct 2005 15:26:54 -0000 1.20 --- Mediatree.f 30 Oct 2005 18:58:14 -0000 1.21 *************** *** 51,54 **** --- 51,56 ---- else dup RecordDef Artist over Cnt_Artist c@ +InlineRecord s" --" +InlineRecord + dup RecordDef Album over Cnt_Album c@ +InlineRecord + s" --" +InlineRecord dup RecordDef Title swap Cnt_Title c@ then Index: Catalog.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Catalog.f,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Catalog.f 26 Oct 2005 15:19:15 -0000 1.16 --- Catalog.f 30 Oct 2005 18:58:14 -0000 1.17 *************** *** 43,48 **** BYTE l_#Played- BYTE l_Filename- ! BYTE l_Artist_and_title- ! ;struct --- 43,47 ---- BYTE l_#Played- BYTE l_Filename- ! BYTE l_Record- ;struct *************** *** 58,70 **** ; ! \ Record discription of the catalog. October 14th, 2005. ! \ This model assumes that the filename is the title of an album and ! \ that it is placed in a directory named after the artist. 255 constant /file_name 32 constant /MediaLabel ! 80 constant /artist ! 120 constant /Title 1 constant /Drivetype :struct RecordDef \ catalog --- 57,73 ---- ; ! \ Record discription of the catalog. October 30th, 2005. ! \ This model assumes that the filename is the title and ! \ that it placed in a directory named after the album ! \ The directory the album is is placed in a directory named after artist. 255 constant /file_name 32 constant /MediaLabel ! 90 constant /artist ! 80 constant /album ! 85 constant /Title 1 constant /Drivetype + 90 constant /Composer + 15 constant /Genre :struct RecordDef \ catalog *************** *** 72,76 **** BYTE Excluded- BYTE Played- ! DWORD FileSize Offset Deleted-thread DWORD RandomLevel --- 75,79 ---- BYTE Excluded- BYTE Played- ! DWORD FileSize Offset Deleted-thread DWORD RandomLevel *************** *** 78,92 **** /Drivetype Field: DriveType /MediaLabel Field: MediaLabel /artist Field: Artist \ Extracted from the filename /Title Field: Title \ Extracted from the filename /file_name Field: File_name BYTE Cnt_File_name BYTE Cnt_MediaLabel BYTE Cnt_Artist BYTE Cnt_Title ! DWORD Not_used1 ! DWORD Not_used2 ! DWORD Not_used3 ! DWORD Not_used4 ;struct --- 81,101 ---- /Drivetype Field: DriveType /MediaLabel Field: MediaLabel + /Genre Field: Genre /artist Field: Artist \ Extracted from the filename + /Album Field: Album \ Extracted from the filename /Title Field: Title \ Extracted from the filename /file_name Field: File_name + /Composer Field: Composer BYTE Cnt_File_name BYTE Cnt_MediaLabel BYTE Cnt_Artist + BYTE Cnt_Album BYTE Cnt_Title ! BYTE UserRating ! BYTE PlayPeriod ! DWORD YearReleased ! DWORD Bitrate ! DWORD NotUsed1 ! DWORD NotUsed2 ;struct *************** *** 310,313 **** --- 319,323 ---- cr 3 spaces r@ RecordDef Artist r@ Cnt_Artist c@ type-space + r@ RecordDef Album r@ Cnt_Album c@ type-space r@ RecordDef Title r@ Cnt_Title c@ type-space *************** *** 411,417 **** struct, InlineRecord RecordDef Cnt_Title c! struct, InlineRecord RecordDef Title swap cmove \ move Title ! swap 1- dup rot ascii \ -scan drop 2dup - swap 1+ over ! struct, InlineRecord RecordDef Cnt_Artist c! ! struct, InlineRecord RecordDef Artist rot cmove drop struct, InlineRecord RecordDef File_name r@ cmove --- 421,433 ---- struct, InlineRecord RecordDef Cnt_Title c! struct, InlineRecord RecordDef Title swap cmove \ move Title ! ! >r 1- dup r> ascii \ -scan >r 2dup - >r 1+ ! r@ struct, InlineRecord RecordDef Cnt_Album c! ! struct, InlineRecord RecordDef Album r@ cmove ! ! r> - 1- dup r> ascii \ -scan drop 2dup - swap 1+ over ! struct, InlineRecord RecordDef Cnt_Artist c! ! struct, InlineRecord RecordDef Artist rot cmove ! drop struct, InlineRecord RecordDef File_name r@ cmove *************** *** 427,430 **** --- 443,448 ---- ; + debug (add-file) + external Index: View.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/View.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** View.f 27 Oct 2005 21:26:27 -0000 1.4 --- View.f 30 Oct 2005 18:58:14 -0000 1.5 *************** *** 19,23 **** CheckBox lbl_Label CheckBox R_Filename ! CheckBox R_Artist_and_title PushButton Button1 PushButton Button2 --- 19,23 ---- CheckBox lbl_Label CheckBox R_Filename ! CheckBox R_Record PushButton Button1 PushButton Button2 *************** *** 128,135 **** s" Filename" SetText: R_Filename ! self Start: R_Artist_and_title ! 60 270 104 16 Move: R_Artist_and_title ! Handle: Winfont SetFont: R_Artist_and_title ! s" Artist_and_title" SetText: R_Artist_and_title IDOK SetID: Button1 --- 128,135 ---- s" Filename" SetText: R_Filename ! self Start: R_Record ! 60 270 104 16 Move: R_Record ! Handle: Winfont SetFont: R_Record ! s" Record" SetText: R_Record IDOK SetID: Button1 *************** *** 218,222 **** l_Filename- c@ if CheckButton: R_Filename ! else CheckButton: R_Artist_and_title then ;M --- 218,222 ---- l_Filename- c@ if CheckButton: R_Filename ! else CheckButton: R_Record then ;M *************** *** 240,244 **** IsButtonChecked?: lbl_#Played over l_#Played- c! IsButtonChecked?: R_Filename over l_Filename- c! ! IsButtonChecked?: R_Artist_and_title swap l_Artist_and_title- c! ; --- 240,244 ---- IsButtonChecked?: lbl_#Played over l_#Played- c! IsButtonChecked?: R_Filename over l_Filename- c! ! IsButtonChecked?: R_Record swap l_Record- c! ; |
