Changeset 279 for CoolAudio/Systems

Timestamp:

Oct 4, 2011, 6:55:54 PM (13 years ago)

Author:

george

Message:

• Fixed: Do not use Windows MMSystem unit under Linux.
• Fixed: Floating point/comma decimal separator error.

Location:

CoolAudio/Systems

Files:

• UAudioSystemMPlayer.pas (modified) (5 diffs)
• UAudioSystemWindows.pas (modified) (3 diffs)

CoolAudio/Systems/UAudioSystemMPlayer.pas

@@ -25 +25 @@
     FPath: string;
     procedure SetOutputMode(AValue: TOutputDriver); override;
+  public
     function FindPath: string;
-  public
     constructor Create; override;
     destructor Destroy; override;
@@ -64 +64 @@
 implementation
 
+function StrToFloatPoint(Value: string): Extended;
+var
+  FPointSeparator: TFormatSettings;
+begin
+  // Format seetings to convert a string to a float
+  FPointSeparator := DefaultFormatSettings;
+  FPointSeparator.DecimalSeparator := '.';
+  FPointSeparator.ThousandSeparator := '#';// disable the thousand separator
+  Result := StrToFloat(Value, FPointSeparator);
+end;
+
+function FloatPointToStr(Value: Extended): string;
+var
+  FPointSeparator: TFormatSettings;
+begin
+  // Format seetings to convert a string to a float
+  FPointSeparator := DefaultFormatSettings;
+  FPointSeparator.DecimalSeparator := '.';
+  FPointSeparator.ThousandSeparator := '#';// disable the thousand separator
+  Result := FloatToStr(Value, FPointSeparator);
+end;
+
 { TAudioSystemMPlayer }
 
@@ -130 +152 @@
     I := LastDelimiter('=', tmps);
     if I > 0 then begin
-      Tmps := StringReplace(Tmps, '.', ',', [rfReplaceAll]);
-      Time := StrToFloat(Copy(tmps, I + 1, System.Length(tmps)));
+      Time := StrToFloatPoint(Copy(tmps, I + 1, System.Length(tmps)));
       Result := Time * OneSecond;
     end;
@@ -153 +174 @@
     I := LastDelimiter('=', tmps);
     if I > 0 then begin
-      Tmps := StringReplace(Tmps, '.', ',', [rfReplaceAll]);
-      Time := StrToFloat(Copy(tmps, I + 1, System.Length(tmps)));
+      Time := StrToFloatPoint(Copy(tmps, I + 1, System.Length(tmps)));
       Result := Time * OneSecond;
     end else Result := -1;
@@ -186 +206 @@
 begin
   if FPlaying and FProcess.Running then begin
-    SendCommand('set_property time_pos ' + StringReplace(FloatToStr(AValue / OneSecond), ',', '.', [rfReplaceAll]));
+    SendCommand('set_property time_pos ' + FloatPointToStr(AValue / OneSecond));
   end;
 end;

CoolAudio/Systems/UAudioSystemWindows.pas

@@ -5 +5 @@
 interface
 
+{$IFDEF Windows}
 uses
   Classes, SysUtils, UAudioSystem, MMSystem;
@@ -18 +19 @@
     procedure Stop; override;
   end;
+{$ENDIF}
 
 implementation
+
+{$IFDEF Windows}
 
 { TPlayerWindows }
@@ -39 +43 @@
 end;
 
+{$ENDIF}
+
 end.