Changeset 668

Timestamp:

Jul 12, 2025, 10:49:00 PM (24 hours ago)

Author:

chronos

Message:

• Modified: Improved audio libraries detection and load error evaluation.

Location:

trunk

Files:

• Music.pas (modified) (2 diffs)
• Packages/uos/uos_flat.pas (modified) (2 diffs)

trunk/Music.pas

@@ -57 +57 @@
 
   {$IFDEF UNIX}
-  SndFileFileName := 'libsndfile.so.1';
+  SndFileFileName := 'libsndfile.so';
   PortAudioFileName := 'libportaudio.so';
   XmpFileName := 'libxmp.so.4';
@@ -72 +72 @@
   {$ENDIF}
 
-  if (SndFileFileName <> 'system') and  (SndFileFileName <> '') then
-  if uos_TestLoadLibrary(PChar(SndFileFileName)) = False then
-   SndFileFileName := SndFileFileName + '.2';
-
-  if uos_LoadLib(PChar(PortAudioFileName), PChar(SndFileFileName), Nil, Nil,
-    Nil, Nil, PChar(XmpFileName)) <> 0 then
-    raise Exception.Create('Error while loading audio libraries.');
+  if (PortAudioFileName <> 'system') and (PortAudioFileName <> '') then
+  if not uos_TestLoadLibrary(PChar(PortAudioFileName)) then begin
+    if uos_TestLoadLibrary(PChar(PortAudioFileName + '.1')) then
+      PortAudioFileName := PortAudioFileName + '.1'
+    else
+    if uos_TestLoadLibrary(PChar(PortAudioFileName + '.2')) then
+      PortAudioFileName := PortAudioFileName + '.2'
+    else PortAudioFileName := '';
+  end;
+
+  if (SndFileFileName <> 'system') and (SndFileFileName <> '') then
+  if not uos_TestLoadLibrary(PChar(SndFileFileName)) then begin
+    if uos_TestLoadLibrary(PChar(SndFileFileName + '.1')) then
+      SndFileFileName := SndFileFileName + '.1'
+    else
+    if uos_TestLoadLibrary(PChar(SndFileFileName + '.2')) then
+      SndFileFileName := SndFileFileName + '.2'
+    else SndFileFileName := '';
+  end;
+
+  if uos_LoadLib(PChar(PortAudioFileName), PChar(SndFileFileName), nil, nil,
+    nil, nil, PChar(XmpFileName)) <> 0 then begin
+      if uosLoadResult.PAloaderror = 1 then
+        raise Exception.Create(PortAudioFileName + ' not found.');
+      if uosLoadResult.PAloaderror = 2 then
+        raise Exception.Create(PortAudioFileName + ' can''t be loaded.');
+      if uosLoadResult.SFloaderror = 1 then
+        raise Exception.Create(SndFileFileName + ' not found.');
+      if uosLoadResult.SFloaderror = 2 then
+        raise Exception.Create(SndFileFileName + ' can''t be loaded.');
+      if uosLoadResult.XMloadError = 1 then
+        raise Exception.Create(XmpFileName + ' not found.');
+      if uosLoadResult.XMloadError = 2 then
+        raise Exception.Create(XmpFileName + ' can''t be loaded.');
+    end;
 
   Initialized := True;

trunk/Packages/uos/uos_flat.pas

@@ -2458 +2458 @@
 begin
   Result := uos.uos_loadlib(PortAudioFileName, SndFileFileName, Mpg123FileName, Mp4ffFileName, FaadFileName, opusfileFileName, nil, nil);
+  uosLoadResult := uos.uosLoadResult;
 end;
 
@@ -2463 +2464 @@
 begin
   Result := uos.uos_loadlib(PortAudioFileName, SndFileFileName, Mpg123FileName, Mp4ffFileName, FaadFileName, opusfileFileName, XMPFileName, nil);
+  uosLoadResult := uos.uosLoadResult;
 end;