Changeset 75 for trunk/Packages/CoolAudio/Systems

Timestamp:

Mar 26, 2024, 11:27:01 PM (9 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from CoolAudio package unit names.

Location:

trunk/Packages/CoolAudio/Systems

Files:

• AudioSystem.pas (moved) (moved from trunk/Packages/CoolAudio/Systems/UAudioSystem.pas ) (7 diffs)
• DSP/AudioSystemDSP.pas (moved) (moved from trunk/Packages/CoolAudio/Systems/DSP/UAudioSystemDSP.pas ) (4 diffs)
• FMOD/AudioSystemFMOD.pas (moved) (moved from trunk/Packages/CoolAudio/Systems/FMOD/UAudioSystemFMOD.pas ) (2 diffs)
• MAD/AudioSystemMAD.pas (moved) (moved from trunk/Packages/CoolAudio/Systems/MAD/UAudioSystemMAD.pas ) (3 diffs)
• WavFile.pas (moved) (moved from trunk/Packages/CoolAudio/Systems/UWavFile.pas ) (2 diffs)
• WinAPI/AudioSystemWindows.pas (moved) (moved from trunk/Packages/CoolAudio/Systems/WinAPI/UAudioSystemWindows.pas ) (2 diffs)
• mplayer/AudioSystemMPlayer.pas (moved) (moved from trunk/Packages/CoolAudio/Systems/mplayer/UAudioSystemMPlayer.pas ) (6 diffs)

trunk/Packages/CoolAudio/Systems/AudioSystem.pas

@@ -1 @@
-unit UAudioSystem;
-
-{$mode delphi}{$H+}
+unit AudioSystem;
 
 interface
 
 uses
-  Classes, SysUtils, Contnrs;
+  Classes, SysUtils, Generics.Collections;
 
 type
@@ -118 +116 @@
   TAudioSystemManager = class(TComponent)
   public
-    Systems: TObjectList; // TListObject<TAudioSystem>
+    Systems: TObjectList<TAudioSystemManagerItem>;
     procedure Register(Name: string; SystemClass: TAudioSystemClass);
     procedure FillStringList(StringList: TStrings);
@@ -298 +296 @@
   StringList.Clear;
   for I := 0 to Systems.Count - 1 do
-  with TAudioSystemManagerItem(Systems[I]) do
+  with Systems[I] do
     StringList.AddObject(Name, Systems[I]);
 end;
@@ -309 +307 @@
   I := 0;
   while (I < Systems.Count) and
-    ((TAudioSystemManagerItem(Systems[I]).Name <> Name) or
-    (not TAudioSystemManagerItem(Systems[I]).Supported and SupportedOnly)) do Inc(I);
-  if I < Systems.Count then Result := TAudioSystemManagerItem(Systems[I])
+    ((Systems[I].Name <> Name) or
+    (not Systems[I].Supported and SupportedOnly)) do Inc(I);
+  if I < Systems.Count then Result := Systems[I]
     else Result := nil;
 end;
@@ -330 +328 @@
 begin
   inherited;
-  Systems := TObjectList.Create;
+  Systems := TObjectList<TAudioSystemManagerItem>.Create;
 end;
 
 destructor TAudioSystemManager.Destroy;
 begin
-  Systems.Free;
-  inherited Destroy;
+  FreeAndNil(Systems);
+  inherited;
 end;
 
@@ -424 +422 @@
   Stop;
   Active := False;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -448 +446 @@
 destructor TAudioSystem.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 

trunk/Packages/CoolAudio/Systems/DSP/AudioSystemDSP.pas

@@ -1 @@
-unit UAudioSystemDSP;
+unit AudioSystemDSP;
 
-{$I UCoolAudioConfig.inc}
-{$mode delphi}{$H+}
+{$I CoolAudioConfig.inc}
 
 interface
@@ -8 +7 @@
 {$IFDEF AudioSystemDSP}
 uses
-  Classes, SysUtils, UAudioSystem, BaseUnix, UWavFile, StdCtrls, ExtCtrls;
+  Classes, SysUtils, AudioSystem, BaseUnix, WavFile, ExtCtrls;
 
 type
@@ -70 +69 @@
 {$ENDIF}
 
+
 implementation
 
@@ -83 +83 @@
 procedure TAudioSystemDSP.OpenDevice;
 var
-  Stereo, Error: Longint;
+  Stereo: Longint;
 begin
   Write('Openning /dev/dsp');

trunk/Packages/CoolAudio/Systems/FMOD/AudioSystemFMOD.pas

@@ -1 @@
-unit UAudioSystemFMOD;
+unit AudioSystemFMOD;
 
-{$I UCoolAudioConfig.inc}
-{$mode delphi}{$H+}
+{$I CoolAudioConfig.inc}
 
 interface
@@ -9 +8 @@
 {$IFDEF AudioSystemFMOD}
 uses
-  Classes, SysUtils, fmoddyn, fmodtypes, UAudioSystem, DateUtils;
+  Classes, SysUtils, fmoddyn, fmodtypes, AudioSystem, DateUtils;
 
 type

trunk/Packages/CoolAudio/Systems/MAD/AudioSystemMAD.pas

@@ -1 @@
-unit UAudioSystemMAD;
+unit AudioSystemMAD;
 
-{$I UCoolAudioConfig.inc}
-{$mode delphi}{$H+}
+{$I CoolAudioConfig.inc}
 
 interface
@@ -8 +7 @@
 {$IFDEF AudioSystemMAD}
 uses
-  Classes, SysUtils, mad, UAudioSystem;
+  Classes, SysUtils, mad, AudioSystem;
 
 type
@@ -26 +25 @@
 
 {$ENDIF}
+
 
 implementation

trunk/Packages/CoolAudio/Systems/WavFile.pas

@@ -13 +13 @@
 { *************************************************************************** }
 
-unit UWavFile;
+unit WavFile;
 
 interface
@@ -79 +79 @@
 
 implementation
-
 
 { ********************* Auxiliary functions & procedures ******************** }

trunk/Packages/CoolAudio/Systems/WinAPI/AudioSystemWindows.pas

@@ -1 @@
-unit UAudioSystemWindows;
-
-{$I UCoolAudioConfig.inc}
-{$mode delphi}{$H+}
+unit AudioSystemWindows;
+
+{$I CoolAudioConfig.inc}
 
 interface
@@ -8 +7 @@
 {$IFDEF Windows}
 uses
-  Windows, Classes, SysUtils, UAudioSystem, MMSystem, DateUtils;
+  Windows, Classes, SysUtils, AudioSystem, MMSystem, DateUtils;
 
 type

trunk/Packages/CoolAudio/Systems/mplayer/AudioSystemMPlayer.pas

@@ -1 +1 @@
 // MPlayer slave command list: http://www.mplayerhq.hu/DOCS/tech/slave.txt
 
-unit UAudioSystemMPlayer;
-
-{$I UCoolAudioConfig.inc}
-{$mode Delphi}{$H+}
+unit AudioSystemMPlayer;
+
+{$I CoolAudioConfig.inc}
 
 interface
 
 uses
-  Classes, SysUtils, UAudioSystem, Process, Math, Dialogs, DateUtils;
+  Classes, SysUtils, AudioSystem, Process, Math, Dialogs, DateUtils;
 
 const
@@ -64 +63 @@
   SCantStopProcess = 'Can''t stop Mplayer process';
 
+
 implementation
 
@@ -125 +125 @@
 destructor TAudioSystemMPlayer.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 
@@ -189 +189 @@
 function TPlayerMPlayer.GetVolume: Real;
 begin
+  Result := 0;
 end;
 
@@ -251 +252 @@
 var
   MPOptions: String;
-  Vol: Real;
 begin
   if FPlaying then Stop;
@@ -306 +306 @@
 begin
   Stop;
-  FProcess.Free;
-  inherited Destroy;
+  FreeAndNil(FProcess);
+  inherited;
 end;