Changeset 665 for trunk/Music.pas

Timestamp:

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

Author:

chronos

Message:

• Fixed: Playing music on Windows.

File:

• trunk/Music.pas (modified) (6 diffs)

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);