Merge pull request #787 from UltraStar-Deluxe/fix-audio-playback-buffer

Fix audio playback buffer
UltraStar-Deluxe · Dec 24, 2023 · 37c066c · 37c066c
2 parents 474b5b3 + 15564f4
commit 37c066c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/src/base/UMusic.pas b/src/base/UMusic.pas
@@ -285,7 +285,7 @@   TAudioSourceStream = class(TAudioProcessingStream)
       function IsEOF(): boolean;            virtual; abstract;
       function IsError(): boolean;          virtual; abstract;
     public
-      function ReadData(Buffer: PByteArray; BufferSize: integer): integer; virtual; abstract;
+      function ReadData(Buffer: PByte; BufferSize: integer): integer; virtual; abstract;
 
       property EOF: boolean read IsEOF;
       property Error: boolean read IsError;
@@ -790,7 +790,7 @@ procedure InitializeSound;
     CurrentAudioDecoder := InterfaceList[i] as IAudioDecoder;
     if (not CurrentAudioDecoder.InitializeDecoder()) then
     begin
-      Log.LogError('Initialize failed, Removing - '+ CurrentAudioDecoder.GetName);
+      Log.LogError('Initialize failed, Removing decoder: '+ CurrentAudioDecoder.GetName);
       MediaManager.Remove(CurrentAudioDecoder);
     end;
   end;
@@ -810,7 +810,7 @@ procedure InitializeSound;
       DefaultAudioPlayback := CurrentAudioPlayback;
       break;
     end;
-    Log.LogError('Initialize failed, Removing - '+ CurrentAudioPlayback.GetName);
+    Log.LogError('Initialize failed, Removing playback: '+ CurrentAudioPlayback.GetName);
     MediaManager.Remove(CurrentAudioPlayback);
   end;
 
@@ -825,7 +825,7 @@ procedure InitializeSound;
       DefaultAudioInput := CurrentAudioInput;
       break;
     end;
-    Log.LogError('Initialize failed, Removing - '+ CurrentAudioInput.GetName);
+    Log.LogError('Initialize failed, Removing input: '+ CurrentAudioInput.GetName);
     MediaManager.Remove(CurrentAudioInput);
   end;
 

diff --git a/src/base/URingBuffer.pas b/src/base/URingBuffer.pas
@@ -47,7 +47,7 @@   TRingBuffer = class
     public
       constructor Create(Size: integer);
       destructor Destroy; override;
-      function Read(Buffer: PByteArray; Count: integer): integer;
+      function Read(Buffer: PByte; Count: integer): integer;
       function Write(Buffer: PByteArray; Count: integer): integer;
       function Size(): integer;
       function Available(): integer;
@@ -73,7 +73,7 @@ destructor TRingBuffer.Destroy;
   FreeMem(RingBuffer);
 end;
 
-function TRingBuffer.Read(Buffer: PByteArray; Count: integer): integer;
+function TRingBuffer.Read(Buffer: PByte; Count: integer): integer;
 var
   PartCount: integer;
 begin

diff --git a/src/media/UAudioDecoder_Bass.pas b/src/media/UAudioDecoder_Bass.pas
@@ -66,7 +66,7 @@   TBassDecodeStream = class(TAudioDecodeStream)
       function IsEOF(): boolean;             override;
       function IsError(): boolean;           override;
 
-      function ReadData(Buffer: PByteArray; BufSize: integer): integer; override;
+      function ReadData(Buffer: PByte; BufSize: integer): integer; override;
   end;
 
 type
@@ -194,7 +194,7 @@ function TBassDecodeStream.IsError(): boolean;
   Result := Error;
 end;
 
-function TBassDecodeStream.ReadData(Buffer: PByteArray; BufSize: integer): integer;
+function TBassDecodeStream.ReadData(Buffer: PByte; BufSize: integer): integer;
 var
   Report: string;
   I: Integer;

diff --git a/src/media/UAudioDecoder_FFmpeg.pas b/src/media/UAudioDecoder_FFmpeg.pas
@@ -204,7 +204,7 @@   TFFmpegDecodeStream = class(TAudioDecodeStream)
       function IsEOF(): boolean;             override;
       function IsError(): boolean;           override;
 
-      function ReadData(Buffer: PByteArray; BufferSize: integer): integer; override;
+      function ReadData(Buffer: PByte; BufferSize: integer): integer; override;
   end;
 
 type
@@ -1302,7 +1302,7 @@ function TFFmpegDecodeStream.DecodeFrame(): integer;
   end;
 end;
 
-function TFFmpegDecodeStream.ReadData(Buffer: PByteArray; BufferSize: integer): integer;
+function TFFmpegDecodeStream.ReadData(Buffer: PByte; BufferSize: integer): integer;
 var
   CopyByteCount:   integer; // number of bytes to copy
   RemainByteCount: integer; // number of bytes left (remain) to read

diff --git a/src/media/UAudioPlaybackBase.pas b/src/media/UAudioPlaybackBase.pas
@@ -122,7 +122,7 @@   TAudioBufferSourceStream = class(TAudioSourceStream)
       procedure SetLoop(Enabled: boolean); override;
     public
       constructor Create(Buffer: TStream; Format: TAudioFormatInfo);
-      function ReadData(Buffer: PByteArray; BufferSize: integer): integer; override;
+      function ReadData(Buffer: PByte; BufferSize: integer): integer; override;
       function GetAudioFormatInfo(): TAudioFormatInfo; override;
       procedure Close(); override;
   end;
@@ -432,7 +432,7 @@ procedure TAudioBufferSourceStream.SetLoop(Enabled: boolean);
   fLoop := Enabled;
 end;
 
-function TAudioBufferSourceStream.ReadData(Buffer: PByteArray; BufferSize: integer): integer;
+function TAudioBufferSourceStream.ReadData(Buffer: PByte; BufferSize: integer): integer;
 var
   BufSizeLeft: integer;
   NumRead: integer;

diff --git a/src/media/UAudioPlayback_Bass.pas b/src/media/UAudioPlayback_Bass.pas
@@ -93,7 +93,7 @@   TBassPlaybackStream = class(TAudioPlaybackStream)
 
       function GetAudioFormatInfo(): TAudioFormatInfo; override;
 
-      function ReadData(Buffer: PByteArray; BufferSize: integer): integer;
+      function ReadData(Buffer: PByte; BufferSize: integer): integer;
 
       property EOF: boolean READ IsEOF;
   end;
@@ -110,7 +110,7 @@   TBassVoiceStream = class(TAudioVoiceStream)
       procedure Close(); override;
 
       procedure WriteData(Buffer: PByteArray; BufferSize: integer); override;
-      function ReadData(Buffer: PByteArray; BufferSize: integer): integer; override;
+      function ReadData(Buffer: PByte; BufferSize: integer): integer; override;
       function IsEOF(): boolean; override;
       function IsError(): boolean; override;
   end;
@@ -185,7 +185,7 @@ function PlaybackStreamHandler(handle: HSTREAM; buffer: Pointer; length: DWORD;
     Result := BytesRead;
 end;
 
-function TBassPlaybackStream.ReadData(Buffer: PByteArray; BufferSize: integer): integer;
+function TBassPlaybackStream.ReadData(Buffer: PByte; BufferSize: integer): integer;
 var
   AdjustedSize: integer;
   RequestedSourceSize, SourceSize: integer;
@@ -655,7 +655,7 @@ procedure TBassVoiceStream.WriteData(Buffer: PByteArray; BufferSize: integer);
 end;
 
 // Note: we do not need the read-function for the BASS implementation
-function TBassVoiceStream.ReadData(Buffer: PByteArray; BufferSize: integer): integer;
+function TBassVoiceStream.ReadData(Buffer: PByte; BufferSize: integer): integer;
 begin
   Result := -1;
 end;

diff --git a/src/media/UAudioPlayback_SoftMixer.pas b/src/media/UAudioPlayback_SoftMixer.pas
@@ -175,7 +175,7 @@   TGenericVoiceStream = class(TAudioVoiceStream)
       function Open(ChannelMap: integer; FormatInfo: TAudioFormatInfo): boolean; override;
       procedure Close(); override;
       procedure WriteData(Buffer: PByteArray; BufferSize: integer); override;
-      function ReadData(Buffer: PByteArray; BufferSize: integer): integer; override;
+      function ReadData(Buffer: PByte; BufferSize: integer): integer; override;
       function IsEOF(): boolean; override;
       function IsError(): boolean; override;
   end;
@@ -1026,7 +1026,7 @@ procedure TGenericVoiceStream.WriteData(Buffer: PByteArray; BufferSize: integer)
   end;
 end;
 
-function TGenericVoiceStream.ReadData(Buffer: PByteArray; BufferSize: integer): integer;
+function TGenericVoiceStream.ReadData(Buffer: PByte; BufferSize: integer): integer;
 begin
   Result := -1;