[Win32forth-cvs] win32forth/apps/Player4 Catalog.f,1.13,1.14 Mediatree.f,1.15,1.16 PLAYER4.F,1.24,1.25

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Player4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16030/apps/Player4

Modified Files:
	Catalog.f Mediatree.f PLAYER4.F 
Log Message:
Jos: Removed a bug from the catalog while extending the catalog. The new form is not fully operational yet.

Index: PLAYER4.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.F,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** PLAYER4.F	16 Oct 2005 10:24:39 -0000	1.24
--- PLAYER4.F	17 Oct 2005 20:26:31 -0000	1.25
***************
*** 20,25 ****
  decimal
  
!  true  value turnkey?
! \ false value turnkey?
   true  value MciDebug?
  
--- 20,25 ----
  decimal
  
! \ true  value turnkey?
!  false value turnkey?
   true  value MciDebug?
  
***************
*** 50,53 ****
--- 50,55 ----
  needs Resources.f
  needs multiopen.f
+ needs view.f
+ 
  
  \ -----------------------------------------------------------------------------
***************
*** 88,97 ****
          MENUSEPARATOR
  
!         SUBMENU      "S&ort"
             MENUITEM  "Se&t maximum random level"        SetRandomLevel   ;
             MENUITEM  "&Generate random numbers"         RandomizeCatalog ;
          MENUSEPARATOR
             MENUITEM  "S&ort by random number"           SortRandom      ;
!            MENUITEM  "S&ort by least played"            SortLeastPlayed ;
             MENUITEM  "S&ort by size"                    SortSize        ;
             MENUITEM  "S&ort by filename"                SortCatalog     ;
--- 90,99 ----
          MENUSEPARATOR
  
!         SUBMENU      "S&ort and show"
             MENUITEM  "Se&t maximum random level"        SetRandomLevel   ;
             MENUITEM  "&Generate random numbers"         RandomizeCatalog ;
          MENUSEPARATOR
             MENUITEM  "S&ort by random number"           SortRandom      ;
!            MENUITEM  "Define a view"                    StartViewForm   ;
             MENUITEM  "S&ort by size"                    SortSize        ;
             MENUITEM  "S&ort by filename"                SortCatalog     ;
***************
*** 227,231 ****
          ['] on_unclicked to unclick-func
          InitFileNames
!         GetHandle: Self SetParent: ControlCenter
          catalog-exist?
          if   map-config-file map-database
--- 229,234 ----
          ['] on_unclicked to unclick-func
          InitFileNames
!         GetHandle: Self dup SetParent: ControlCenter
!                             SetParent: ViewForm
          catalog-exist?
          if   map-config-file map-database

Index: Mediatree.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Mediatree.f,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Mediatree.f	16 Oct 2005 10:24:39 -0000	1.15
--- Mediatree.f	17 Oct 2005 20:26:31 -0000	1.16
***************
*** 20,31 ****
                  ;M
  
  : add-record    ( n - )   \ Add when not deleted and found in a collection
                  dup n>record dup RecordDef Deleted- c@ 0= show-deleted = swap RecordDef Excluded- c@ or
                  if      drop
!                 Else    dup to lParam
!                         dup (l.int)     InlineRecord  place
!                         s"  "           InlineRecord +place
!                         n>record  dup RecordDef File_name swap Cnt_File_name c@
                                          InlineRecord +place
                                          InlineRecord +null
                                          InlineRecord 1+ to pszText
--- 20,52 ----
                  ;M
  
+ : +space ( - )  s"  "   InlineRecord +place ;
+ 
+ \ add-record is under construction....
  : add-record    ( n - )   \ Add when not deleted and found in a collection
                  dup n>record dup RecordDef Deleted- c@ 0= show-deleted = swap RecordDef Excluded- c@ or
                  if      drop
!                 Else  vadr-config over to lParam 0 InlineRecord !
!                       dup l_Index-  c@
!                           if  over (l.int)  InlineRecord  place +space
!                           then
!                       swap n>record
!                       over l_Drivetype- c@
!                           if   dup RecordDef DriveType c@
!                                DriveType$ InlineRecord +place +space
!                           then
! 
!                         dup RecordDef File_name swap Cnt_File_name c@
! 
                                          InlineRecord +place
+ 
+                   \  dup l_Label-          c@
+                   \  dup l_File_size-      c@
+                   \  dup l_#Played-        c@
+                   \      l_Filename-       c@
+                   \             if   CheckButton: R_Filename
+                   \             else CheckButton: R_Artist_and_title
+                   \             then
+ 
+ 
                                          InlineRecord +null
                                          InlineRecord 1+ to pszText
***************
*** 33,36 ****
--- 54,58 ----
                          tvins 0 TVM_INSERTITEMA hWnd Call SendMessage
                          to hInsertAfter
+                      drop
                  then
                  ;

Index: Catalog.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Catalog.f,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Catalog.f	16 Oct 2005 10:24:39 -0000	1.13
--- Catalog.f	17 Oct 2005 20:26:31 -0000	1.14
***************
*** 27,35 ****
                  DWORD                   first-free-record
                  DWORD                   MaximumRandomLevel
  ;struct
  
  sizeof ConfigDef  mkstruct: Config    s" \" Config ConfigDef PathMediaFiles place
  create DatFileFile$ ," \PathMediaFiles.dat"
! create DatFile$
  
  : InitFileNames ( - )
--- 27,49 ----
                  DWORD                   first-free-record
                  DWORD                   MaximumRandomLevel
+                 BYTE                    s_Drivetype-
+                 BYTE                    s_Label-
+                 BYTE                    s_filesize-
+                 BYTE                    s_#Played-
+                 BYTE                    s_Filename-
+                 BYTE                    s_Artist_Title-
+                 BYTE                    l_Index-
+                 BYTE                    l_Drivetype-
+                 BYTE                    l_Label-
+                 BYTE                    l_File_size-
+                 BYTE                    l_#Played-
+                 BYTE                    l_Filename-
+                 BYTE                    l_Artist_and_title-
+ 
  ;struct
  
  sizeof ConfigDef  mkstruct: Config    s" \" Config ConfigDef PathMediaFiles place
  create DatFileFile$ ," \PathMediaFiles.dat"
! string: DatFile$
  
  : InitFileNames ( - )