merge with current trunk revision 1827

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1855 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 2 insertions, 4 deletions

diff --git a/unicode/src/media/UAudioPlayback_SoftMixer.pas b/unicode/src/media/UAudioPlayback_SoftMixer.pas
index c8da6bcd..c87e461d 100644
--- a/unicode/src/media/UAudioPlayback_SoftMixer.pas
+++ b/unicode/src/media/UAudioPlayback_SoftMixer.pas
@@ -51,7 +51,7 @@ type
       SampleBuffer:      PByteArray;
       SampleBufferSize:  integer;
       SampleBufferCount: integer; // number of available bytes in SampleBuffer
-      SampleBufferPos:   cardinal;
+      SampleBufferPos:   integer;
 
       SourceBuffer:      PByteArray;
       SourceBufferSize:  integer;
@@ -564,9 +564,8 @@ var
   ConversionOutputSize: integer;   // max. number of converted data (= buffer size)
   ConversionOutputCount: integer;  // actual number of converted data
   SourceSize: integer;
-  RequestedSourceSize: integer;
   NeededSampleBufferSize: integer;
-  BytesNeeded, BytesAvail: integer;
+  BytesNeeded: integer;
   SourceFormatInfo, OutputFormatInfo: TAudioFormatInfo;
   SourceFrameSize, OutputFrameSize: integer;
   SkipOutputCount: integer;  // number of output-data bytes to skip
@@ -574,7 +573,6 @@ var
   FillCount: integer;  // number of bytes to fill with padding data
   CopyCount: integer;
   PadFrame: PByteArray;
-  i: integer;
 begin
   Result := -1;