Changeset 457 for CoolStreaming/UStreamHelper.pas

Timestamp:

Nov 28, 2012, 7:49:20 AM (12 years ago)

Author:

chronos

Message:

• Modified: CoolStreaming TStreamHelper can own stream.
• Added: TVarBlockSerializer support Double and Buffer type.

File:

• CoolStreaming/UStreamHelper.pas (modified) (16 diffs)

CoolStreaming/UStreamHelper.pas

@@ -6 +6 @@
 
 uses
-  Classes, DateUtils, syncobjs, SysUtils;
+  Classes, DateUtils, SysUtils;
 
 type
@@ -22 +22 @@
     procedure SetEndianness(const AValue: TEndianness);
     procedure SetItem(Index: Integer; const AValue: Byte);
+    procedure SetStream(AValue: TStream);
   public
     procedure Assign(Source: TStreamHelper);
@@ -62 +63 @@
     function Write(const Buffer; Count: Longint): Longint; override;
     property Endianness: TEndianness read FEndianness write SetEndianness;
-    property Stream: TStream read FStream write FStream;
+    property Stream: TStream read FStream write SetStream;
     property Items[Index: Integer]: Byte read GetItem write SetItem; default;
+    property OwnStream: Boolean read FOwnStream write FOwnStream;
   end;
 
@@ -74 +76 @@
   StringLength: Longint;
 begin
+  StringLength := 0;
   FStream.ReadBuffer(StringLength, SizeOf(StringLength));
   Result := ReadString(StringLength);
@@ -103 +106 @@
 function TStreamHelper.ReadByte: Byte;
 begin
+  Result := 0;
   FStream.ReadBuffer(Result, SizeOf(Byte));
 end;
@@ -108 +112 @@
 function TStreamHelper.ReadCardinal: Cardinal;
 begin
+  Result := 0;
   FStream.ReadBuffer(Result, SizeOf(Cardinal));
   if SwapData then Result := Swap(Result);
@@ -114 +119 @@
 function TStreamHelper.ReadInt64: Int64;
 begin
+  Result := 0;
   FStream.ReadBuffer(Result, SizeOf(Int64));
   if SwapData then Result := Swap(Result);
@@ -130 +136 @@
   Count: Byte;
 begin
+  Count := 0;
   FStream.ReadBuffer(Count, 1);
   Result := ReadString(Count);
@@ -135 +142 @@
 
 procedure TStreamHelper.ReadStream(AStream: TStream; Count: Integer);
-var
-  Buffer: array of Byte;
-begin
-  if Count > 0 then begin
+//var
+//  Buffer: array of Byte;
+begin
+  AStream.Position := 0;
+  AStream.CopyFrom(Self, Count);
+  (*if Count > 0 then begin
     SetLength(Buffer, Count);
     FStream.ReadBuffer(Buffer[0], Count);
@@ -144 +153 @@
     AStream.Position := 0;
     AStream.Write(Buffer[0], Count);
-  end;
+  end;*)
 end;
 
@@ -259 +268 @@
 function TStreamHelper.ReadDouble: Double;
 begin
+  Result := 0;
   FStream.ReadBuffer(Result, SizeOf(Double));
 end;
@@ -264 +274 @@
 function TStreamHelper.ReadSingle: Single;
 begin
+  Result := 0;
   FStream.ReadBuffer(Result, SizeOf(Single));
 end;
@@ -285 +296 @@
 function TStreamHelper.ReadWord: Word;
 begin
+  Result := 0;
   FStream.ReadBuffer(Result, SizeOf(Word));
   if SwapData then Result := Swap(Result);
@@ -311 +323 @@
 end;
 
+procedure TStreamHelper.SetStream(AValue: TStream);
+begin
+  if FStream = AValue then Exit;
+  if FOwnStream and Assigned(FStream) then FStream.Free;
+  FStream := AValue;
+  FOwnStream := False;
+end;
+
 procedure TStreamHelper.Assign(Source: TStreamHelper);
 var
@@ -361 +381 @@
 
 procedure TStreamHelper.WriteStream(AStream: TStream; Count: Integer);
-var
-  Buffer: array of Byte;
-begin
-  if Count > AStream.Size then Count := AStream.Size; // Limit max. stream size
+//var
+//  Buffer: array of Byte;
+begin
+  AStream.Position := 0;
+  CopyFrom(AStream, Count);
+  (*if Count > AStream.Size then Count := AStream.Size; // Limit max. stream size
   AStream.Position := 0;
   if Count > 0 then begin
@@ -370 +392 @@
     AStream.Read(Buffer[0], Count);
     FStream.Write(Buffer[0], Count);
-  end;
+  end;*)
 end;