Changeset 347

Timestamp:

Apr 20, 2012, 12:14:51 PM (13 years ago)

Author:

chronos

Message:

• Modified: CoolAudio will be used as components in component palette.

Location:

CoolAudio

Files:

• Systems/UAudioSystem.pas (modified) (8 diffs)
• Systems/UAudioSystemFMOD.pas (modified) (2 diffs)
• Systems/UAudioSystemMPlayer.pas (modified) (4 diffs)
• Systems/UAudioSystemWindows.pas (modified) (2 diffs)
• UCoolAudio.pas (modified) (1 diff)
• UPlaylist.pas (modified) (3 diffs)

CoolAudio/Systems/UAudioSystem.pas

@@ -1 +1 @@
 unit UAudioSystem;
 
-{$mode objfpc}{$H+}
+{$mode delphi}{$H+}
 
 interface
@@ -20 +20 @@
     procedure SetOutputMode(AValue: TOutputDriver); virtual;
   public
-    constructor Create; virtual;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     property OutputMode: TOutputDriver read FOutputDriver write SetOutputMode;
@@ -60 +60 @@
     property Playing: Boolean read FPlaying write SetPlaying;
     property Active: Boolean read FActive write SetActive;
-    constructor Create; virtual;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   end;
@@ -76 +76 @@
   { TAudioSystemManager }
 
-  TAudioSystemManager = class
+  TAudioSystemManager = class(TComponent)
     Systems: TObjectList; // TListObject<TAudioSystem>
     procedure Register(Name: string; SystemClass: TAudioSystemClass;
       PlayerClass: TPlayerClass);
     procedure FillStringList(StringList: TStrings);
-    constructor Create;
+    function SearchByName(Name: string): TAudioSystemManagerItem;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   end;
@@ -104 +105 @@
   with TAudioSystemManagerItem(Systems[I]) do
     StringList.AddObject(Name, Systems[I]);
+end;
+
+function TAudioSystemManager.SearchByName(Name: string): TAudioSystemManagerItem;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Systems.Count) and (TAudioSystemManagerItem(Systems[I]).Name <> Name) do Inc(I);
+  if I < Systems.Count then Result := TAudioSystemManagerItem(Systems[I])
+    else Result := nil;
 end;
 
@@ -118 +129 @@
 end;
 
-constructor TAudioSystemManager.Create;
-begin
+constructor TAudioSystemManager.Create(AOwner: TComponent);
+begin
+  inherited;
   Systems := TObjectList.Create;
 end;
@@ -205 +217 @@
 end;
 
-constructor TPlayer.Create;
-begin
+constructor TPlayer.Create(AOwner: TComponent);
+begin
+  inherited;
 end;
 
@@ -223 +236 @@
 end;
 
-constructor TAudioSystem.Create;
-begin
+constructor TAudioSystem.Create(AOwner: TComponent);
+begin
+  inherited;
   {$IFDEF Windows}
   FOutputDriver := omWin32;

CoolAudio/Systems/UAudioSystemFMOD.pas

@@ -16 +16 @@
     procedure SetOutputMode(AValue: TOutputDriver); override;
   public
-    constructor Create; override;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   end;
@@ -56 +56 @@
 end;
 
-constructor TAudioSystemFMOD.Create;
+constructor TAudioSystemFMOD.Create(AOwner: TComponent);
 begin
-  inherited Create;
+  inherited;
   fmod_load('');
   OutputMode := omALSA;

CoolAudio/Systems/UAudioSystemMPlayer.pas

@@ -27 +27 @@
   public
     function FindPath: string;
-    constructor Create; override;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     property Path: string read FPath write FPath;
@@ -52 +52 @@
     procedure Pause; override;
     procedure Stop; override;
-    constructor Create; override;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   end;
@@ -115 +115 @@
 end;
 
-constructor TAudioSystemMPlayer.Create;
-begin
-  inherited Create;
+constructor TAudioSystemMPlayer.Create(AOwner: TComponent);
+begin
+  inherited;
   FPath := FindPath;
 end;
@@ -290 +290 @@
 end;
 
-constructor TPlayerMPlayer.Create;
-begin
-  inherited Create;
+constructor TPlayerMPlayer.Create(AOwner: TComponent);
+begin
+  inherited;
   FProcess := TProcess.Create(nil);
 end;

CoolAudio/Systems/UAudioSystemWindows.pas

@@ -46 +46 @@
     procedure Pause; override;
     procedure Stop; override;
-    constructor Create; override;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     property DeviceType: TMPDeviceTypes read FDeviceType write SetDeviceType;
@@ -202 +202 @@
 end;
 
-constructor TPlayerWindows.Create;
-begin
-  inherited Create;
+constructor TPlayerWindows.Create(AOwner: TComponent);
+begin
+  inherited;
 end;
 

CoolAudio/UCoolAudio.pas

@@ -31 +31 @@
 initialization
 
-AudioSystemManager := TAudioSystemManager.Create;
+AudioSystemManager := TAudioSystemManager.Create(nil);
 {$IFDEF AudioSystemWindows}
 AudioSystemManager.Register('Windows', TAudioSystemWindows, TPlayerWindows);

CoolAudio/UPlaylist.pas

@@ -1 +1 @@
 unit UPlaylist;
 
-{$mode objfpc}{$H+}
+{$mode delphi}{$H+}
 
 interface
@@ -15 +15 @@
   { TPlaylist }
 
-  TPlaylist = class
+  TPlaylist = class(TComponent)
     Items: TObjectList; // TObjectList<TPlaylistItem>
-    constructor Create;
+    constructor Create(AOwner: TComponent);
     destructor Destroy; override;
   end;
@@ -26 +26 @@
 { TPlaylist }
 
-constructor TPlaylist.Create;
+constructor TPlaylist.Create(AOwner: TComponent);
 begin
+  inherited;
   Items := TObjectList.Create;
 end;