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

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

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

Modified Files:
	Catalog.f Mediatree.f PLAYER4.F Pl_MciWindow.f Pl_Version.f 
Log Message:
Jos:  - When the catalog is randomsized the least played file will be
          shown first in its randomsized group.
        - Made it possible to change the maximum randomlevel.

Index: PLAYER4.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.F,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PLAYER4.F	5 May 2005 09:43:26 -0000	1.9
--- PLAYER4.F	10 May 2005 15:48:45 -0000	1.10
***************
*** 32,35 ****
--- 32,36 ----
  defer UndeleteAll       ' noop is UndeleteAll
  defer ShowDeleted       ' noop is ShowDeleted
+ defer SetRandomLevel    ' noop is SetRandomLevel
  
  
***************
*** 79,82 ****
--- 80,84 ----
  
          SUBMENU      "S&ort"
+            MENUITEM  "Se&t maximum random level"     SetRandomLevel   ;
             MENUITEM  "&Randomsize catalog"           RandomizeCatalog ;
             MENUITEM  "S&ort by filename"             SortCatalog      ;
***************
*** 312,318 ****
            then ; is SearchCatalog
  
  :noname ( -- )
          catalog-exist?
!           if  Refresh: Catalog
            then
          ; is RefreshCatalog
--- 314,325 ----
            then ; is SearchCatalog
  
+ :noname ( -- ) \ search the catalog
+         catalog-exist?
+           if   player-base ask-max-random-level
+           then ; is SetRandomLevel
+ 
  :noname ( -- )
          catalog-exist?
!           if   Refresh: Catalog
            then
          ; is RefreshCatalog

Index: Pl_MciWindow.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_MciWindow.f,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Pl_MciWindow.f	4 May 2005 19:08:47 -0000	1.5
--- Pl_MciWindow.f	10 May 2005 15:48:46 -0000	1.6
***************
*** 225,234 ****
  
                Playing?: Self not
!               if   next-not-played dup -1 = 
                     if   cr cr ." All done. Reset randomlevel and shuffle..." 
                          set-all-not-played random-shuffle
                     else cr 2 spaces dup . 2 spaces n>record  dup>r
                          File_name r@ Cnt_File_name c@  2dup type-space
!                         -1 r> Played- c!
                          PlayFile: Self 2drop
                     then
--- 225,235 ----
  
                Playing?: Self not
!               if   next-not-played dup -1 =
                     if   cr cr ." All done. Reset randomlevel and shuffle..." 
                          set-all-not-played random-shuffle
                     else cr 2 spaces dup . 2 spaces n>record  dup>r
                          File_name r@ Cnt_File_name c@  2dup type-space
!                         r@ incr-#played
!                         r> mark-played
                          PlayFile: Self 2drop
                     then

Index: Mediatree.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Mediatree.f,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Mediatree.f	5 May 2005 09:43:26 -0000	1.8
--- Mediatree.f	10 May 2005 15:48:45 -0000	1.9
***************
*** 308,312 ****
  
  0 value hItem-last-selected
- 0 value last-selected-rec
  
  \   ***************************************************
--- 308,311 ----
***************
*** 345,348 ****
--- 344,348 ----
  
  :M FillTreeView:  ( -- )
+                 0  to last-selected-rec
                  tvins  /tvins  erase
                  tvitem /tvitem erase
***************
*** 370,375 ****
  
          last-selected-rec   n>record  dup>r  File_name  r@ Cnt_File_name c@
!         -1 r> Played- c!
!         2dup cr type-space
          PlayFile: PLAYER4W
                  false
--- 370,376 ----
  
          last-selected-rec   n>record  dup>r  File_name  r@ Cnt_File_name c@
!         r@ incr-#played
!         r> mark-played
!          2dup cr type-space
          PlayFile: PLAYER4W
                  false
***************
*** 454,456 ****
  \s
  
!