Changeset 353 for CoolAudio/Systems

Timestamp:

Apr 23, 2012, 2:57:12 PM (12 years ago)

Author:

chronos

Message:

• Modified: TPlayList is now registred as component in group CoolAudio in Component pallete.
• Added: Created placeholder component TMediaPlayer which can be switched to different audio systems in runtime without destruction/construction.

Location:

CoolAudio/Systems

Files:

• DSP/UAudioSystemDSP.pas (modified) (2 diffs)
• FMOD/UAudioSystemFMOD.pas (modified) (3 diffs)
• MAD/UAudioSystemMAD.pas (modified) (2 diffs)
• UAudioSystem.pas (modified) (15 diffs)
• WinAPI/UAudioSystemWindows.pas (modified) (7 diffs)
• mplayer/UAudioSystemMPlayer.pas (modified) (5 diffs)

CoolAudio/Systems/DSP/UAudioSystemDSP.pas

@@ -21 +21 @@
     SampleRate: Integer; // Hz
     BitsPerSample: Integer;
+    function GetMediaPlayerDriverClass: TMediaPlayerDriverClass; override;
     procedure OpenDevice;
     procedure CloseDevice;
@@ -74 +75 @@
 
 { TAudioSystemDSP }
+
+function TAudioSystemDSP.GetMediaPlayerDriverClass: TMediaPlayerDriverClass;
+begin
+  Result := TPlayerDSP;
+end;
 
 procedure TAudioSystemDSP.OpenDevice;

CoolAudio/Systems/FMOD/UAudioSystemFMOD.pas

@@ -18 +18 @@
     procedure SetOutputMode(AValue: TOutputDriver); override;
   public
+    function GetMediaPlayerDriverClass: TMediaPlayerDriverClass; override;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -24 +25 @@
   { TPlayerFMOD }
 
-  TPlayerFMOD = class(TPlayer)
+  TPlayerFMOD = class(TMediaPlayerDriver)
   private
     FHandle: PFSoundStream;
@@ -61 +62 @@
     end else raise EOpenOutputFailed.Create(SOpenOutputFailed);
   {$endif}
+end;
+
+function TAudioSystemFMOD.GetMediaPlayerDriverClass: TMediaPlayerDriverClass;
+begin
+  Result := TPlayerFMOD;
 end;
 

CoolAudio/Systems/MAD/UAudioSystemMAD.pas

@@ -13 +13 @@
   TAudioSystemMAD = class(TAudioSystem)
   public
+    function GetMediaPlayerDriverClass: TMediaPlayerDriverClass; override;
   end;
 
@@ -29 +30 @@
 
 {$IFDEF AudioSystemMAD}
+
+{ TAudioSystemMAD }
+
+function TAudioSystemMAD.GetMediaPlayerDriverClass: TMediaPlayerDriverClass;
+begin
+  Result := TPlayerMAD;
+end;
 
 { TPlayerMAD }

CoolAudio/Systems/UAudioSystem.pas

@@ -9 +9 @@
 
 type
+  TMediaPlayerDriverClass = class of TMediaPlayerDriver;
   TOutputDriver = (omAlsa, omOSS, omDirectX, omWin32);
 
@@ -22 +23 @@
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
+    function GetMediaPlayerDriverClass: TMediaPlayerDriverClass; virtual;
     property OutputMode: TOutputDriver read FOutputDriver write SetOutputMode;
   end;
@@ -27 +29 @@
   TAudioSystemClass = class of TAudioSystem;
 
-  { TPlayer }
-
-  TPlayer = class(TComponent)
+  { TMediaPlayerDriver }
+
+  TMediaPlayerDriver = class
   private
   protected
@@ -60 +62 @@
     property Playing: Boolean read FPlaying write SetPlaying;
     property Active: Boolean read FActive write SetActive;
+    constructor Create; virtual;
+    destructor Destroy; override;
+  end;
+
+  TMediaPlayer = class(TComponent)
+  private
+    procedure CheckDriver;
+    function GetActive: Boolean;
+    function GetAudioSystem: TAudioSystem;
+    function GetFileName: string;
+    function GetLength: TDateTime;
+    function GetMuted: Boolean;
+    function GetPlaying: Boolean;
+    function GetPosition: TDateTime;
+    function GetVolume: Real;
+    procedure SetActive(AValue: Boolean);
+    procedure SetAudioSystem(AValue: TAudioSystem);
+    procedure SetFileName(AValue: string);
+    procedure SetMuted(AValue: Boolean);
+    procedure SetPlaying(AValue: Boolean);
+    procedure SetPosition(AValue: TDateTime);
+    procedure SetVolume(AValue: Real);
+  public
+    Driver: TMediaPlayerDriver;
+    procedure Play;
+    procedure Pause;
+    procedure Stop;
+    procedure Open;
+    procedure Close;
+    property Position: TDateTime read GetPosition write SetPosition;
+    property Length: TDateTime read GetLength;
+    property Playing: Boolean read GetPlaying write SetPlaying;
+  published
+    property Volume: Real read GetVolume write SetVolume; // 0..1
+    property Muted: Boolean read GetMuted write SetMuted;
+    property AudioSystem: TAudioSystem read GetAudioSystem write SetAudioSystem;
+    property FileName: string read GetFileName write SetFileName;
+    property Active: Boolean read GetActive write SetActive;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   end;
 
-  TPlayerClass = class of TPlayer;
+  TPlayerClass = class of TMediaPlayerDriver;
 
   { TAudioSystemManagerItem }
@@ -71 +111 @@
     Name: string;
     SystemClass: TAudioSystemClass;
-    PlayerClass: TPlayerClass;
+    Supported: Boolean;
   end;
 
@@ -78 +118 @@
   TAudioSystemManager = class(TComponent)
     Systems: TObjectList; // TListObject<TAudioSystem>
-    procedure Register(Name: string; SystemClass: TAudioSystemClass;
-      PlayerClass: TPlayerClass);
+    procedure Register(Name: string; SystemClass: TAudioSystemClass);
     procedure FillStringList(StringList: TStrings);
-    function SearchByName(Name: string): TAudioSystemManagerItem;
+    function SearchByName(Name: string; SupportedOnly: Boolean = True): TAudioSystemManagerItem;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -90 +129 @@
   Mp3FileExt = '.mp3';
 
+var
+  DefaultAudioSystem: TAudioSystem;
+
 resourcestring
   SOpenOutputFailed = 'Failed opening audio output';
+  SDefaultAudioSystemNotSet = 'Default audio system not set';
+  SMediaPlayerDriverNotAssigned = 'Media player driver not assigned';
 
 
 implementation
+
+{ TMediaPlayer }
+
+function TMediaPlayer.GetLength: TDateTime;
+begin
+  CheckDriver;
+  Result := Driver.Length;
+end;
+
+procedure TMediaPlayer.CheckDriver;
+begin
+  if not Assigned(Driver) then
+    raise Exception.Create(SMediaPlayerDriverNotAssigned);
+end;
+
+function TMediaPlayer.GetActive: Boolean;
+begin
+  CheckDriver;
+  Result := Driver.Active;
+end;
+
+function TMediaPlayer.GetAudioSystem: TAudioSystem;
+begin
+  CheckDriver;
+  Result := Driver.AudioSystem;
+end;
+
+function TMediaPlayer.GetFileName: string;
+begin
+  CheckDriver;
+  Result := Driver.FileName;
+end;
+
+function TMediaPlayer.GetMuted: Boolean;
+begin
+  CheckDriver;
+  Result := Driver.Muted;
+end;
+
+function TMediaPlayer.GetPlaying: Boolean;
+begin
+  CheckDriver;
+  Result := Driver.Playing;
+end;
+
+function TMediaPlayer.GetPosition: TDateTime;
+begin
+  CheckDriver;
+  Result := Driver.Position;
+end;
+
+function TMediaPlayer.GetVolume: Real;
+begin
+  CheckDriver;
+  Result := Driver.Volume;
+end;
+
+procedure TMediaPlayer.SetActive(AValue: Boolean);
+begin
+  CheckDriver;
+  Driver.Active := True;
+end;
+
+procedure TMediaPlayer.SetAudioSystem(AValue: TAudioSystem);
+var
+  DriverClass: TMediaPlayerDriverClass;
+begin
+  FreeAndNil(Driver);
+  DriverClass := AValue.GetMediaPlayerDriverClass;
+  Driver := DriverClass.Create;
+  Driver.AudioSystem := DefaultAudioSystem;
+end;
+
+procedure TMediaPlayer.SetFileName(AValue: string);
+begin
+  CheckDriver;
+  Driver.FileName := AValue;
+end;
+
+procedure TMediaPlayer.SetMuted(AValue: Boolean);
+begin
+  CheckDriver;
+  Driver.Muted := AValue;
+end;
+
+procedure TMediaPlayer.SetPlaying(AValue: Boolean);
+begin
+  CheckDriver;
+  Driver.Playing := AValue;
+end;
+
+procedure TMediaPlayer.SetPosition(AValue: TDateTime);
+begin
+  CheckDriver;
+  Driver.Position := AValue;
+end;
+
+procedure TMediaPlayer.SetVolume(AValue: Real);
+begin
+  CheckDriver;
+  Driver.Volume := AValue;
+end;
+
+procedure TMediaPlayer.Play;
+begin
+  CheckDriver;
+  Driver.Play;
+end;
+
+procedure TMediaPlayer.Pause;
+begin
+  CheckDriver;
+  Driver.Pause;
+end;
+
+procedure TMediaPlayer.Stop;
+begin
+  CheckDriver;
+  Driver.Stop;
+end;
+
+procedure TMediaPlayer.Open;
+begin
+  CheckDriver;
+  Driver.Open;
+end;
+
+procedure TMediaPlayer.Close;
+begin
+  CheckDriver;
+  Driver.Close;
+end;
+
+constructor TMediaPlayer.Create(AOwner: TComponent);
+begin
+  inherited Create(AOwner);
+  if not Assigned(DefaultAudioSystem) then
+    raise Exception.Create(SDefaultAudioSystemNotSet);
+  AudioSystem := DefaultAudioSystem;
+end;
+
+destructor TMediaPlayer.Destroy;
+begin
+  FreeAndNil(Driver);
+  inherited Destroy;
+end;
 
 { TAudioSystemManagerItem }
@@ -111 +301 @@
 end;
 
-function TAudioSystemManager.SearchByName(Name: string): TAudioSystemManagerItem;
+function TAudioSystemManager.SearchByName(Name: string; SupportedOnly: Boolean = True):
+  TAudioSystemManagerItem;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < Systems.Count) and (TAudioSystemManagerItem(Systems[I]).Name <> Name) do Inc(I);
+  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])
     else Result := nil;
@@ -122 +315 @@
 
 procedure TAudioSystemManager.Register(Name: string;
-  SystemClass: TAudioSystemClass; PlayerClass: TPlayerClass);
+  SystemClass: TAudioSystemClass);
 var
   NewItem: TAudioSystemManagerItem;
@@ -129 +322 @@
   NewItem.Name := Name;
   NewItem.SystemClass := SystemClass;
-  NewItem.PlayerClass := PlayerClass;
   Systems.Add(NewItem);
 end;
@@ -145 +337 @@
 end;
 
-{ TPlayer }
-
-procedure TPlayer.SetActive(AValue: Boolean);
+{ TMediaPlayerDriver }
+
+procedure TMediaPlayerDriver.SetActive(AValue: Boolean);
 begin
   if FActive = AValue then Exit;
@@ -153 +345 @@
 end;
 
-procedure TPlayer.SetPlaying(AValue: Boolean);
+procedure TMediaPlayerDriver.SetPlaying(AValue: Boolean);
 begin
   if FPlaying = AValue then Exit;
@@ -159 +351 @@
 end;
 
-function TPlayer.GetMuted: Boolean;
+function TMediaPlayerDriver.GetMuted: Boolean;
 begin
   Result := False;
 end;
 
-procedure TPlayer.SetMuted(AValue: Boolean);
-begin
-end;
-
-function TPlayer.GetLength: TDateTime;
+procedure TMediaPlayerDriver.SetMuted(AValue: Boolean);
+begin
+end;
+
+function TMediaPlayerDriver.GetLength: TDateTime;
 begin
   Result := 0;
 end;
 
-function TPlayer.GetPosition: TDateTime;
+function TMediaPlayerDriver.GetPosition: TDateTime;
 begin
   Result := 0;
 end;
 
-function TPlayer.GetVolume: Real;
+function TMediaPlayerDriver.GetVolume: Real;
 begin
   Result := 0;
 end;
 
-procedure TPlayer.SetPosition(AValue: TDateTime);
-begin
-end;
-
-procedure TPlayer.SetVolume(AValue: Real);
-begin
-end;
-
-procedure TPlayer.SetFileName(AValue: string);
+procedure TMediaPlayerDriver.SetPosition(AValue: TDateTime);
+begin
+end;
+
+procedure TMediaPlayerDriver.SetVolume(AValue: Real);
+begin
+end;
+
+procedure TMediaPlayerDriver.SetFileName(AValue: string);
 begin
   if AValue = FFileName then Exit;
@@ -199 +391 @@
 end;
 
-procedure TPlayer.Play;
-begin
-end;
-
-procedure TPlayer.Pause;
-begin
-end;
-
-procedure TPlayer.Stop;
-begin
-end;
-
-procedure TPlayer.Open;
+procedure TMediaPlayerDriver.Play;
+begin
+end;
+
+procedure TMediaPlayerDriver.Pause;
+begin
+end;
+
+procedure TMediaPlayerDriver.Stop;
+begin
+end;
+
+procedure TMediaPlayerDriver.Open;
 begin
   Active := True;
 end;
 
-procedure TPlayer.Close;
+procedure TMediaPlayerDriver.Close;
 begin
   Active := False;
 end;
 
-constructor TPlayer.Create(AOwner: TComponent);
+constructor TMediaPlayerDriver.Create;
 begin
   inherited;
 end;
 
-destructor TPlayer.Destroy;
+destructor TMediaPlayerDriver.Destroy;
 begin
   Stop;
@@ -257 +449 @@
 end;
 
+function TAudioSystem.GetMediaPlayerDriverClass: TMediaPlayerDriverClass;
+begin
+  Result := TMediaPlayerDriver;
+end;
+
+initialization
+
+DefaultAudioSystem := TAudioSystem.Create(nil);
+
+finalization
+
+FreeAndNil(DefaultAudioSystem);
+
 end.
 

CoolAudio/Systems/WinAPI/UAudioSystemWindows.pas

@@ -11 +11 @@
 
 type
+
+  { TAudioSystemWindows }
+
   TAudioSystemWindows = class(TAudioSystem)
   public
     PlayerIndex: Integer;
+    function GetMediaPlayerDriverClass: TMediaPlayerDriverClass; override;
   end;
 
@@ -21 +25 @@
   { TPlayerWindows }
 
-  TPlayerWindows = class(TPlayer)
+  TPlayerWindows = class(TMediaPlayerDriver)
   private
     FHandle: HWND;
@@ -47 +51 @@
     procedure Pause; override;
     procedure Stop; override;
-    constructor Create(AOwner: TComponent); override;
+    constructor Create; override;
     destructor Destroy; override;
     property DeviceType: TMPDeviceTypes read FDeviceType write SetDeviceType;
@@ -60 +64 @@
 
 implementation
+
+{ TAudioSystemWindows }
+
+function TAudioSystemWindows.GetMediaPlayerDriverClass: TMediaPlayerDriverClass;
+begin
+  Result := TPlayerWindows;
+end;
 
 {$IFDEF Windows}
@@ -175 +186 @@
   Parm: TMCI_Generic_Parms;
 begin
-  if FPlaying then begin
-    CheckError(mciSendCommand(FDeviceID, mci_Pause, FFlags, Longint(@Parm)));
-    FPlaying := False;
-  end else begin
-    CheckError(mciSendCommand(FDeviceID, mci_Resume, FFlags, Longint(@Parm)));
-    FPlaying := True;
+  if FActive then  begin
+    if FPlaying then begin
+      CheckError(mciSendCommand(FDeviceID, mci_Pause, FFlags, Longint(@Parm)));
+      FPlaying := False;
+    end else begin
+      CheckError(mciSendCommand(FDeviceID, mci_Resume, FFlags, Longint(@Parm)));
+      FPlaying := True;
+    end;
   end;
 end;
@@ -188 +201 @@
   Parm: TMCI_Generic_Parms;
 begin
-  if FPlaying then begin
+  if FActive and FPlaying then begin
     FFlags := 0;
     if FUseNotify then
@@ -206 +219 @@
 end;
 
-constructor TPlayerWindows.Create(AOwner: TComponent);
+constructor TPlayerWindows.Create;
 begin
   inherited;

CoolAudio/Systems/mplayer/UAudioSystemMPlayer.pas

@@ -30 +30 @@
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
+    function GetMediaPlayerDriverClass: TMediaPlayerDriverClass; override;
     property Path: string read FPath write FPath;
   end;
@@ -35 +36 @@
   { TPlayerMPlayer }
 
-  TPlayerMPlayer = class(TPlayer)
+  TPlayerMPlayer = class(TMediaPlayerDriver)
   private
     FProcess: TProcess;
@@ -53 +54 @@
     procedure Pause; override;
     procedure Stop; override;
-    constructor Create(AOwner: TComponent); override;
+    constructor Create; override;
     destructor Destroy; override;
   end;
@@ -127 +128 @@
 end;
 
+function TAudioSystemMPlayer.GetMediaPlayerDriverClass: TMediaPlayerDriverClass;
+begin
+  Result := TPlayerMPlayer;
+end;
+
 { TPlayerMPlayer }
 
@@ -291 +297 @@
 end;
 
-constructor TPlayerMPlayer.Create(AOwner: TComponent);
+constructor TPlayerMPlayer.Create;
 begin
   inherited;