[Win32forth-cvs] win32forth/apps/Player4 Catalog.f,1.8,1.9 PLAYER4.F,1.15,1.16

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

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

Modified Files:
	Catalog.f PLAYER4.F 
Log Message:
Jos: Added more sorts and changed the way random records gets sorted. I got bored by random only, since it also plays the records that were already played.

Index: PLAYER4.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.F,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PLAYER4.F	12 Jun 2005 08:37:34 -0000	1.15
--- PLAYER4.F	26 Jun 2005 15:49:31 -0000	1.16
***************
*** 20,25 ****
  decimal
  
!  true  value turnkey?
! \ false value turnkey?
  true  value MciDebug?
  
--- 20,25 ----
  decimal
  
! \ true  value turnkey?
!  false value turnkey?
  true  value MciDebug?
  
***************
*** 35,38 ****
--- 35,41 ----
  defer ShowDeleted       ' noop is ShowDeleted
  defer SetRandomLevel    ' noop is SetRandomLevel
+ defer SortRandom        ' noop is SortRandom
+ defer SortLeastPlayed   ' noop is SortLeastPlayed
+ defer SortSize          ' noop is SortSize
  
  needs Pl_Toolset.f
***************
*** 79,86 ****
          MENUITEM     "&Start/Resume playing\tCtrl+R"      'R' +k_control pushkey ;
  
          SUBMENU      "S&ort"
!            MENUITEM  "Se&t maximum random level"     SetRandomLevel   ;
!            MENUITEM  "&Randomsize catalog"           RandomizeCatalog ;
!            MENUITEM  "S&ort by filename"             SortCatalog      ;
          ENDSUBMENU
  
--- 82,94 ----
          MENUITEM     "&Start/Resume playing\tCtrl+R"      'R' +k_control pushkey ;
  
+        
          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     ;
          ENDSUBMENU
  
***************
*** 311,317 ****
          then ; is RandomizeCatalog
  
  :noname ( -- ) \ sort catalog by file names
          catalog-exist?
!         if   sort_by_filename RefreshCatalog
          then ; is SortCatalog
  
--- 319,342 ----
          then ; is RandomizeCatalog
  
+ 
+ 
+ :noname ( -- ) \ search the catalog
+         catalog-exist?
+         if   sort_by_RandomLevel RefreshCatalog
+         then ; is SortRandom
+ 
+ :noname ( -- ) \ search the catalog
+         catalog-exist?
+         if   sort_by_leastPlayed RefreshCatalog
+         then ; is SortLeastPlayed
+ 
+ :noname ( -- ) \ search the catalog
+         catalog-exist?
+         if   sort_by_size        RefreshCatalog
+         then ; is SortSize
+ 
  :noname ( -- ) \ sort catalog by file names
          catalog-exist?
!         if   sort_by_filename    RefreshCatalog
          then ; is SortCatalog
  
***************
*** 321,328 ****
          then ; is SearchCatalog
  
! :noname ( -- ) \ search the catalog
!         catalog-exist?
!           if   player-base ask-max-random-level
!           then ; is SetRandomLevel
  
  :noname ( -- )
--- 346,353 ----
          then ; is SearchCatalog
  
! \ :noname ( -- ) \ search the catalog
! \        catalog-exist?
! \          if   player-base ask-max-random-level
! \          then ; is SetRandomLevel
  
  :noname ( -- )
***************
*** 470,474 ****
          Start: MainWindow
          Start: ControlCenter
- 
          ['] FullScreenToggle SetDblClickFunc: MouseHandlerWindow
          ;
--- 495,498 ----
***************
*** 510,519 ****
          false to MciDebug?
          ' player4 turnkey Player4.exe
!         s" apps\Player4\Player4.ico" s" Player4.exe" AddAppIcon
          1 pause-seconds
  [else]
          true to MciDebug?
!         s" apps\Player4\Player4.ico" s" Player4.exe" AddAppIcon
          PLAYER4
  [then]
!