Changeset 665

Timestamp:

Jul 9, 2025, 4:45:12 PM (3 weeks ago)

Author:

chronos

Message:

• Fixed: Playing music on Windows.

Location:

trunk

Files:

• LibPortaudio-32.dll (added)
• LibPortaudio-64.dll (added)
• LibSndFile-32.dll (added)
• LibSndFile-64.dll (added)
• Music.pas (modified) (6 diffs)
• Packages/Common/Languages/PixelPointer.cs.po (modified) (1 diff)
• Packages/Common/Languages/Table.cs.po (modified) (1 diff)
• Packages/uos (modified) (1 prop)
• Packages/uos/uos.pas (modified) (8 diffs)
• Packages/uos/uos_cdrom.pas (modified) (1 diff)
• Packages/uos/uos_flat.pas (modified) (5 diffs)
• libxmp-32.dll (added)
• libxmp-64.dll (added)

trunk/Music.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Dialogs, uos_flat;
+  Classes, SysUtils, Dialogs, uos_flat, ctypes;
 
 type
@@ -19 +19 @@
     AutoPlayNext: Boolean;
     procedure Initialize;
-    procedure EndPlay;
-    procedure LoopEndProc;
+    procedure EndPlay(PlayerIndex: cint32);
     function GetNextPlaylistItem: string;
     procedure PlayNext(Data: PtrInt);
@@ -46 +45 @@
 procedure TMusicPlayer.Initialize;
 var
-  res: Integer;
   SndFileFileName: string;
   PortAudioFileName: string;
@@ -53 +51 @@
   if Initialized then Exit;
 
+  {$IFDEF UNIX}
   SndFileFileName := 'libsndfile.so.1';
   PortAudioFileName := 'libportaudio.so';
   XmpFileName := 'libxmp.so.4';
+  {$ELSE}
+    {$if defined(cpu64)}
+    SndFileFileName := 'LibSndFile-64.dll';
+    PortAudioFileName := 'LibPortaudio-64.dll';
+    XmpFileName := 'libxmp-64.dll';
+    {$ELSE}
+    SndFileFileName := 'LibSndFile-32.dll';
+    PortAudioFileName := 'LibPortaudio-32.dll';
+    XmpFileName := 'libxmp-32.dll';
+    {$ENDIF}
+  {$ENDIF}
 
   if (SndFileFileName <> 'system') and  (SndFileFileName <> '') then
@@ -61 +71 @@
    SndFileFileName := SndFileFileName + '.2';
 
-  res := uos_LoadLib(PChar(PortAudioFileName), PChar(SndFileFileName), Nil, Nil,
-    Nil, Nil, PChar(XmpFileName));
+  if uos_LoadLib(PChar(PortAudioFileName), PChar(SndFileFileName), Nil, Nil,
+    Nil, Nil, PChar(XmpFileName)) <> 0 then
+    raise Exception.Create('Error while loading audio libraries.');
 
   Initialized := True;
 end;
 
-procedure TMusicPlayer.EndPlay;
-begin
-  if AutoPlayNext then Application.QueueAsyncCall(PlayNext, 0);
-end;
-
-procedure TMusicPlayer.LoopEndProc;
-var
-  Position: Integer;
-begin
-  Position := uos_InputPosition(PlayerIndex1, InputIndex1);
-  if Position >= InputLength then
-    Play;
+procedure TMusicPlayer.EndPlay(PlayerIndex: cint32);
+begin
+  if AutoPlayNext and (PlayerIndex = PlayerIndex1) then Application.QueueAsyncCall(PlayNext, 0);
 end;
 
@@ -152 +154 @@
 
   AutoPlayNext := False;
-  //uos_Stop(PlayerIndex1);
-  uos_StopAndWait(PlayerIndex1);
-
-  //Inc(PlayerIndex1);
+  uos_Stop(PlayerIndex1);
+
+  Inc(PlayerIndex1);
 
   uos_CreatePlayer(PlayerIndex1);

trunk/Packages/Common/Languages/PixelPointer.cs.po

@@ -21 +21 @@
 msgid "Wrong bitmap size [width: %d, height: %d]"
 msgstr "Špatná velikost bitové mapy [šířka: %d, výška: %d]"
+

trunk/Packages/Common/Languages/Table.cs.po

@@ -15 +15 @@
 msgid "Unsupported format"
 msgstr "Nepodporovaný formát"
+

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