Changeset 277 for CoolAudio/Systems

Timestamp:

Oct 4, 2011, 1:52:48 PM (13 years ago)

Author:

george

Message:

• Fixed: Start/stop playback control.
• Added: Track position and Length handling.

Location:

CoolAudio/Systems

Files:

• UAudioSystem.pas (modified) (3 diffs)
• UAudioSystemMPlayer.pas (modified) (7 diffs)

CoolAudio/Systems/UAudioSystem.pas

@@ -29 +29 @@
   TPlayer = class(TComponent)
   private
+    procedure SetPlaying(AValue: Boolean);
   protected
     FFileName: string;
@@ -51 +52 @@
     property AudioSystem: TAudioSystem read FAudioSystem write FAudioSystem;
     property FileName: string read FFileName write SetFileName;
+    property Playing: Boolean read FPlaying write SetPlaying;
     constructor Create; virtual;
   end;
@@ -61 +63 @@
 
 { TPlayer }
+
+procedure TPlayer.SetPlaying(AValue: Boolean);
+begin
+  if FPlaying = AValue then Exit;
+  if AValue then Play else Stop;
+end;
 
 procedure TPlayer.SetFileName(AValue: string);

CoolAudio/Systems/UAudioSystemMPlayer.pas

@@ +1 @@
+// MPlayer slave command list: http://www.mplayerhq.hu/DOCS/tech/slave.txt
+
 unit UAudioSystemMPlayer;
 
@@ -6 +8 @@
 
 uses
-  Classes, SysUtils, UAudioSystem, Process, Math, Dialogs;
+  Classes, SysUtils, UAudioSystem, Process, Math, Dialogs, DateUtils;
 
 const
@@ -35 +37 @@
   private
     FProcess: TProcess;
-    FProcessActive: Boolean;
-    FPlaying: Boolean;
     FVolume: Real;
     function GetProcessOutput: string;
@@ -108 +108 @@
 procedure TPlayerMPlayer.SendCommand(Command: string);
 begin
-  Command := Command + LineEnding;// #10; // MPLayer always needs #10 as Lineending, no matter if win32 or linux
+  Command := Command + #10; // MPLayer always needs #10 as Lineending, no matter if win32 or linux
   try
-    if FProcessActive then FProcess.Input.Write(Command[1], System.Length(Command));
+    if FProcess.Running then FProcess.Input.Write(Command[1], System.Length(Command));
   except
     raise Exception.Create(SSendCommandException);
@@ -117 +117 @@
 
 function TPlayerMPlayer.GetLength: TDateTime;
-begin
+var
+  tmps: string;
+  I: Integer;
+  Time: Real;
+begin
+  if FPlaying and fProcess.Running then begin
+    repeat
+      SendCommand('get_time_length');
+      Sleep(5);
+      tmps := GetProcessOutput;
+    until Pos('LENGTH', tmps) > 0;
+    I := LastDelimiter('=', tmps);
+    if I > 0 then begin
+      Tmps := StringReplace(Tmps, '.', ',', [rfReplaceAll]);
+      Time := StrToFloat(Copy(tmps, I + 1, System.Length(tmps)));
+      Result := Time * OneSecond;
+    end;
+  end;
 end;
 
@@ -136 +153 @@
     I := LastDelimiter('=', tmps);
     if I > 0 then begin
+      Tmps := StringReplace(Tmps, '.', ',', [rfReplaceAll]);
       Time := StrToFloat(Copy(tmps, I + 1, System.Length(tmps)));
-      Time := Time * 1000;
-      Result := Round(Time);
+      Result := Time * OneSecond;
     end else Result := -1;
   end else Result := -1;
@@ -168 +185 @@
 procedure TPlayerMPlayer.SetPosition(AValue: TDateTime);
 begin
+  if FPlaying and FProcess.Running then begin
+    SendCommand('set_property time_pos ' + StringReplace(FloatToStr(AValue / OneSecond), ',', '.', [rfReplaceAll]));
+  end;
 end;