[Win32forth-cvs] win32forth/apps/Player4 Catalog.f,1.19,1.20 PLAYER4.F,1.30,1.31 Pl_MciWindow.f,1.12,1.13

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

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

Modified Files:
	Catalog.f PLAYER4.F Pl_MciWindow.f 
Log Message:
Jos: Solved the reported bug by Dirk

Index: PLAYER4.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.F,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** PLAYER4.F	26 Nov 2005 21:56:34 -0000	1.30
--- PLAYER4.F	29 Nov 2005 16:51:47 -0000	1.31
***************
*** 1,2 ****
--- 1,14 ----
+ (( > I found a Bug in the latest Player 4th from the CVS:
+ > 
+ > 1. Delete the catalog files
+ > 2. Start the Player
+ > 3. Choose "Catalog>Add file(s)"
+ > 4. Click "Abort"
+ > => the Player will be closed
+ > 
+ > 5. Start the Player again
+ > => the Menu and the splitter window are missing
+  ))
+ 
  \ Play flat Music? => adr lastmusic/vid
  \    File: PLAYER4.F

Index: Pl_MciWindow.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_MciWindow.f,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Pl_MciWindow.f	16 Nov 2005 19:47:22 -0000	1.12
--- Pl_MciWindow.f	29 Nov 2005 16:51:47 -0000	1.13
***************
*** 251,264 ****
  
  :M AddFilesFromSelector:  ( - )    \ add one or more files
!             OpenAppendDatabase
!             GetHandle: self Start: GetFilesDialog count nip 0>
!                if    0 GetFile: GetFilesDialog GetLabel
!                      #SelectedFiles: GetFilesDialog wait-cursor 0
                          do      dup i GetFile: GetFilesDialog AddFile
                          loop
!                      arrow-cursor
                 then
-          CloseReMap
-          RefreshCatalog
          ;M
  
--- 251,265 ----
  
  :M AddFilesFromSelector:  ( - )    \ add one or more files
!      GetHandle: self Start: GetFilesDialog count nip 0>
!                if    vadr-config 0=
!                         if    map-config-file
!                         then
!                      OpenAppendDatabase 0 GetFile: GetFilesDialog GetLabel
!                      #SelectedFiles: GetFilesDialog
!                      wait-cursor 0
                          do      dup i GetFile: GetFilesDialog AddFile
                          loop
!                      arrow-cursor  CloseReMap  RefreshCatalog
                 then
          ;M
  
***************
*** 280,284 ****
          if   begin  MAXCOUNTED drop$ #File wParam Call DragQueryFile dup 0> drag-aborted? 0= and 
               while  drop$ swap (PlayOneFile) 1 +to #File
!              repeat drop 
          then wParam Call DragFinish ;
  
--- 281,285 ----
          if   begin  MAXCOUNTED drop$ #File wParam Call DragQueryFile dup 0> drag-aborted? 0= and 
               while  drop$ swap (PlayOneFile) 1 +to #File
!              repeat drop
          then wParam Call DragFinish ;
  

Index: Catalog.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Catalog.f,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Catalog.f	16 Nov 2005 19:47:22 -0000	1.19
--- Catalog.f	29 Nov 2005 16:51:47 -0000	1.20
***************
*** 451,454 ****
--- 451,456 ----
   ;
  
+ debug write-record
+ 
  external
  
***************
*** 487,494 ****
--- 489,501 ----
          >hfile @ -1 <> ;
  
+ : DataBaseFilled? ( - f )
+     database$ count r/o open-file drop dup file-size drop d0= not
+     swap close-file drop
+   ;
  : catalog-exist?        ( -- f )
          DatFile$ count file-exist?
          database$ count file-exist?     and
          \ database-mhndl map-file-open?   or
+         DataBaseFilled? and
  [defined] MciDebug? [if]
          MciDebug?
***************
*** 497,501 ****
  [then]
          ;
- 
  \ --------------------------------------------------------------------------
  \  add a directory tree to the catalog
--- 504,507 ----