[Win32forth-cvs] win32forth/apps/Player4 Catalog.f,1.4,1.5 Mediatree.f,1.6,1.7 PLAYER4.F,1.7,1.8 Pl_Version.f,1.6,1.7

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

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

Modified Files:
	Catalog.f Mediatree.f PLAYER4.F Pl_Version.f 
Log Message:
Jos: Fixed 2 bugs

Index: PLAYER4.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.F,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PLAYER4.F	2 May 2005 20:47:57 -0000	1.7
--- PLAYER4.F	3 May 2005 22:35:31 -0000	1.8
***************
*** 314,324 ****
  
  :noname ( -- )
!         Refresh: Catalog
          ; is RefreshCatalog
  
  :noname ( -- )
!         0 to show-deleted
          Refresh: Catalog
!         255 to show-deleted
          ; is ShowDeleted
  
--- 314,326 ----
  
  :noname ( -- )
!         catalog-exist?
!           if  Refresh: Catalog
!           then
          ; is RefreshCatalog
  
  :noname ( -- )
!         true to show-deleted
          Refresh: Catalog
!         false to show-deleted
          ; is ShowDeleted
  
***************
*** 485,492 ****
  
  \ Resize the configuration file when needed.
! DatFile$ count file-exist?  [IF]
! DatFile$ count r/o open-file throw dup file-size throw d>s pad ! close-file throw
!         pad @ sizeof ConfigDef = check-config
! [THEN]
  
  \ -----------------------------------------------------------------------------
--- 487,496 ----
  
  \ Resize the configuration file when needed.
!  DatFile$ count file-exist?  [IF]
!  DatFile$ count r/o open-file throw dup file-size throw d>s pad ! close-file throw
!            pad @ sizeof ConfigDef = check-config
!  [ELSE]    DatFile$ create/open  close-file throw
!            0 sizeof ConfigDef = check-config
!  [THEN]
  
  \ -----------------------------------------------------------------------------

Index: Mediatree.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Mediatree.f,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Mediatree.f	2 May 2005 20:47:57 -0000	1.6
--- Mediatree.f	3 May 2005 22:35:31 -0000	1.7
***************
*** 327,333 ****
                  ;M
  
! : add-record    ( n - )
!                 dup n>record Deleted- w@ \ Not deleted and found in the collection
!                 show-deleted =
                          if      drop
                          Else    dup to lParam
--- 327,332 ----
                  ;M
  
! : add-record    ( n - )   \ Add when not deleted and found in a collection
!                 dup n>record dup Deleted- c@ 0= show-deleted = swap Excluded- c@ or
                          if      drop
                          Else    dup to lParam

Index: Catalog.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Catalog.f,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Catalog.f	2 May 2005 20:47:57 -0000	1.4
--- Catalog.f	3 May 2005 22:35:31 -0000	1.5
***************
*** 176,180 ****
   ;
  
! : delete-record   ( n - )  dup true swap n>record  Deleted- c! free-list-check ;
  
  : mark-as-undeleted ( adr - )
--- 176,184 ----
   ;
  
! : delete-record   ( n - )
!    dup true swap n>record dup>r Deleted- c!
!    0 r> Excluded- c!
!    free-list-check
!  ;
  
  : mark-as-undeleted ( adr - )
***************
*** 195,199 ****
   ;
  
! 255 value show-deleted
  
  : delete-record-in-collection ( n - )
--- 199,203 ----
   ;
  
! false value show-deleted
  
  : delete-record-in-collection ( n - )
***************
*** 229,232 ****
--- 233,237 ----
                  r@ RandomLevel ?
                  r@ Played- c@ .
+                 r@ Excluded- c@ .
          then
      r>drop
***************
*** 284,288 ****
  : catalog-exist?        ( -- f )
          DatFile$ count file-exist?
!         database-mhndl map-file-open?  or
          MciDebug?
             if   cr ." catalog-exist? " dup .
--- 289,294 ----
  : catalog-exist?        ( -- f )
          DatFile$ count file-exist?
!         database$ count file-exist?     and
!         \ database-mhndl map-file-open?   or
          MciDebug?
             if   cr ." catalog-exist? " dup .
***************
*** 327,330 ****
--- 333,337 ----
  : init-dlg ( base adr count - pad base )        pad place pad swap ;
  
+ 
  NewEditDialog searchDlg "Search for artist/album in the catalog." "The name contains:" "Ok" "Cancel" ""
  

Index: Pl_Version.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_Version.f,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Pl_Version.f	2 May 2005 20:47:58 -0000	1.6
--- Pl_Version.f	3 May 2005 22:35:31 -0000	1.7
***************
*** 3,7 ****
  anew -Pl_Version.f
  
! 10112 value player_version#
  
  \ Version numbers: v.ww.rr
--- 3,7 ----
  anew -Pl_Version.f
  
! 10113 value player_version#
  
  \ Version numbers: v.ww.rr
***************
*** 104,106 ****
                  (The Treeview was loaded 2 times when it was refreshed)
          - Added a freelist, delete and undelete
!