Changeset 665 for trunk/Packages/uos

Timestamp:

Jul 9, 2025, 4:45:12 PM (13 hours ago)

Author:

chronos

Message:

• Fixed: Playing music on Windows.

Location:

trunk/Packages/uos

Files:

• . (modified) (1 prop)
• uos.pas (modified) (8 diffs)
• uos_cdrom.pas (modified) (1 diff)
• uos_flat.pas (modified) (5 diffs)

trunk/Packages/uos/uos.pas

@@ -575 +575 @@
   {$else}
   TProc = procedure  of object;
+  TPlayerProc = procedure (PlayerIndex: cint32)  of object;
   {$endif}
 
@@ -762 +763 @@
       procedure DoTerminatePlayer;
       procedure DoEndProc;
+      procedure EndProcExecute;
 
   {$IF DEFINED (mse)}
@@ -795 +797 @@
 
       // Procedure of object to execute at end of thread
-      EndProc: TProc;
+      EndProc: TPlayerProc;
 
       // Procedure to execute at end of thread (not of object)
@@ -840 +842 @@
       // Stop playing and free thread
       procedure Stop ();
-
-      // Stop playing and free thread
-      procedure StopAndWait ();
 
       // Pause playing
@@ -2471 +2470 @@
       Status := 0;
     end;
-end;
-
-procedure Tuos_Player.StopAndWait();
-begin
-  Stop;
-  if Assigned(thethread) then thethread.WaitFor;
 end;
 
@@ -9722 +9715 @@
  {$IF not DEFINED (Library)}
   if EndProc <> nil then
-    thethread.{$IF DEFINED (usequeue)}Queue{$else}Synchronize{$endif} (thethread,EndProc);
+    thethread.{$IF DEFINED (usequeue)}Queue{$else}Synchronize{$endif} (thethread, @EndProcExecute);
  
   {$elseif not DEFINED (java)}
@@ -9734 +9727 @@
 end;
 
+procedure Tuos_Player.EndProcExecute;
+begin
+  EndProc(Index);
+end;
+
 procedure Tuos_Player.DoTerminateNoFreePlayer;
 var 
@@ -9791 +9789 @@
   if EndProc <> nil then
   {$IF FPC_FULLVERSION>=20701}
-    thethread.{$IF DEFINED (usequeue)}Queue{$else}Synchronize{$endif} (thethread,EndProc);
+    thethread.{$IF DEFINED (usequeue)}Queue{$else}Synchronize{$endif} (thethread, @EndProcExecute);
   {$else}
   thethread.{$IF DEFINED (usequeue)}Queue{$else}Synchronize{$endif} (thethread,EndProc);

trunk/Packages/uos/uos_cdrom.pas

@@ -643 +643 @@
 end;
 
-Function CDROM_Close(var pCDROMI: PCDROMInfo): LongWord;
+Function CDROM_Close(var pCDROMI: PCDROMInfo): Integer;
 Begin
   Result := CDROM_UNKNOWNERR;

trunk/Packages/uos/uos_flat.pas

@@ -197 +197 @@
   {$else}
   TProc = procedure of object;
+  TPlayerProc = procedure(PlayerIndex: cint32) of object;
   {$endif}
 
@@ -537 +538 @@
  // PlayerIndex : Index of an existing Player
  // InIndex : Index of an existing Input
-procedure uos_EndProc(PlayerIndex: cint32; Proc: TProc);
+procedure uos_EndProc(PlayerIndex: cint32; Proc: TPlayerProc);
 
  // Assign the procedure (not of object) to execute at end, after loop
@@ -917 +918 @@
  // Stop playing and free thread
 procedure uos_Stop(PlayerIndex: cint32);
-
-// Stop playing and free thread
-procedure uos_StopAndWait(PlayerIndex: cint32);
 
 // Pause playing
@@ -2299 +2297 @@
 end;
 
-procedure uos_StopAndWait(PlayerIndex: cint32);
-begin
-  if (length(uosPlayers) > 0) and (PlayerIndex < length(uosPlayers)) then
-    if uosPlayersStat[PlayerIndex] = 1 then
-      if Assigned(uosPlayers[PlayerIndex]) then
-        uosPlayers[PlayerIndex].StopAndWait()
-{$IF DEFINED (mse)}
-{$endif}
-  ;
-end;
-
 procedure uos_Pause(PlayerIndex: cint32);// Pause playing
 begin
@@ -2328 +2315 @@
 end;
 
-procedure uos_EndProc(PlayerIndex: cint32; Proc: TProc);
+procedure uos_EndProc(PlayerIndex: cint32; Proc: TPlayerProc);
  // Assign the procedure of object to execute at end, after loop
  // PlayerIndex : Index of an existing Player