diff --git a/src/media/UAudioDecoder_Bass.pas b/src/media/UAudioDecoder_Bass.pas
deleted file mode 100644
index 443e30222..000000000
--- a/src/media/UAudioDecoder_Bass.pas
+++ /dev/null
@@ -1,301 +0,0 @@
-{* UltraStar Deluxe - Karaoke Game
- *
- * UltraStar Deluxe is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * $URL: svn://basisbit@svn.code.sf.net/p/ultrastardx/svn/trunk/src/media/UAudioDecoder_Bass.pas $
- * $Id: UAudioDecoder_Bass.pas 2475 2010-06-10 18:27:53Z brunzelchen $
- *}
-
-unit UAudioDecoder_Bass;
-
-interface
-
-{$IFDEF FPC}
- {$MODE Delphi}
-{$ENDIF}
-
-{$I switches.inc}
-
-implementation
-
-uses
- Classes,
- SysUtils,
- BASS,
- UMain,
- UMusic,
- UAudioCore_Bass,
- ULog,
- UPath;
-
-type
- TBassDecodeStream = class(TAudioDecodeStream)
- private
- Handle: HSTREAM;
- FormatInfo : TAudioFormatInfo;
- Error: boolean;
- public
- constructor Create(Handle: HSTREAM);
- destructor Destroy(); override;
-
- procedure Close(); override;
-
- function GetLength(): real; override;
- function GetAudioFormatInfo(): TAudioFormatInfo; override;
- function GetPosition: real; override;
- procedure SetPosition(Time: real); override;
- function GetLoop(): boolean; override;
- procedure SetLoop(Enabled: boolean); override;
- function IsEOF(): boolean; override;
- function IsError(): boolean; override;
-
- function ReadData(Buffer: PByte; BufSize: integer): integer; override;
- end;
-
-type
- TAudioDecoder_Bass = class( TInterfacedObject, IAudioDecoder )
- public
- function GetName: string;
-
- function InitializeDecoder(): boolean;
- function FinalizeDecoder(): boolean;
- function Open(const Filename: IPath): TAudioDecodeStream;
- end;
-
-var
- BassCore: TAudioCore_Bass;
-
-
-{ TBassDecodeStream }
-
-constructor TBassDecodeStream.Create(Handle: HSTREAM);
-var
- ChannelInfo: BASS_CHANNELINFO;
- Format: TAudioSampleFormat;
-begin
- inherited Create();
- Self.Handle := Handle;
-
- // setup format info
- if (not BASS_ChannelGetInfo(Handle, ChannelInfo)) then
- begin
- raise Exception.Create('Failed to open decode-stream');
- end;
- BassCore.ConvertBASSFlagsToAudioFormat(ChannelInfo.flags, Format);
- FormatInfo := TAudioFormatInfo.Create(ChannelInfo.chans, ChannelInfo.freq, format);
-
- Error := false;
-end;
-
-destructor TBassDecodeStream.Destroy();
-begin
- Close();
- inherited;
-end;
-
-procedure TBassDecodeStream.Close();
-begin
- if (Handle <> 0) then
- begin
- BASS_StreamFree(Handle);
- Handle := 0;
- end;
- PerformOnClose();
- FreeAndNil(FormatInfo);
- Error := false;
-end;
-
-function TBassDecodeStream.GetAudioFormatInfo(): TAudioFormatInfo;
-begin
- Result := FormatInfo;
-end;
-
-function TBassDecodeStream.GetLength(): real;
-var
- bytes: QWORD;
-begin
- bytes := BASS_ChannelGetLength(Handle, BASS_POS_BYTE);
- Result := BASS_ChannelBytes2Seconds(Handle, bytes);
-end;
-
-function TBassDecodeStream.GetPosition: real;
-var
- bytes: QWORD;
-begin
- bytes := BASS_ChannelGetPosition(Handle, BASS_POS_BYTE);
- Result := BASS_ChannelBytes2Seconds(Handle, bytes);
-end;
-
-procedure TBassDecodeStream.SetPosition(Time: real);
-var
- bytes: QWORD;
-begin
- bytes := BASS_ChannelSeconds2Bytes(Handle, Time);
- BASS_ChannelSetPosition(Handle, bytes, BASS_POS_BYTE);
-end;
-
-function TBassDecodeStream.GetLoop(): boolean;
-var
- flags: DWORD;
-begin
- // retrieve channel flags
- flags := BASS_ChannelFlags(Handle, 0, 0);
- if (flags = DWORD(-1)) then
- begin
- Log.LogError('BASS_ChannelFlags: ' + BassCore.ErrorGetString(), 'TBassDecodeStream.GetLoop');
- Result := false;
- Exit;
- end;
- Result := (flags and BASS_SAMPLE_LOOP) <> 0;
-end;
-
-procedure TBassDecodeStream.SetLoop(Enabled: boolean);
-var
- flags: DWORD;
-begin
- // set/unset loop-flag
- if (Enabled) then
- flags := BASS_SAMPLE_LOOP
- else
- flags := 0;
-
- // set new flag-bits
- if (BASS_ChannelFlags(Handle, flags, BASS_SAMPLE_LOOP) = DWORD(-1)) then
- begin
- Log.LogError('BASS_ChannelFlags: ' + BassCore.ErrorGetString(), 'TBassDecodeStream.SetLoop');
- Exit;
- end;
-end;
-
-function TBassDecodeStream.IsEOF(): boolean;
-begin
- Result := (BASS_ChannelIsActive(Handle) = BASS_ACTIVE_STOPPED);
-end;
-
-function TBassDecodeStream.IsError(): boolean;
-begin
- Result := Error;
-end;
-
-function TBassDecodeStream.ReadData(Buffer: PByte; BufSize: integer): integer;
-var
- Report: string;
- I: Integer;
-begin
- Result := -1;
- try
- Result := BASS_ChannelGetData(Handle, Buffer, BufSize);
- except
- on E : Exception do
- begin
- Report := 'Reading decoded audio data from the BASS library failed. Faulty audio file?' + LineEnding +
- 'Stacktrace:' + LineEnding;
- if E <> nil then
- begin
- Report := Report + 'Exception class: ' + E.ClassName + LineEnding +
- 'Message: ' + E.Message + LineEnding;
- end;
- Report := Report + BackTraceStrFunc(ExceptAddr);
- for I := 0 to ExceptFrameCount - 1 do
- begin
- Report := Report + LineEnding + BackTraceStrFunc(ExceptFrames[I]);
- end;
- Log.LogWarn(Report, 'UAudioDecoder_Bass.ReadData');
- end;
- end;
- // check error state (do not handle EOF as error)
- if ((Result = -1) and (BASS_ErrorGetCode() <> BASS_ERROR_ENDED)) then
- Error := true
- else
- Error := false;
-end;
-
-
-{ TAudioDecoder_Bass }
-
-function TAudioDecoder_Bass.GetName: String;
-begin
- result := 'BASS_Decoder';
-end;
-
-function TAudioDecoder_Bass.InitializeDecoder(): boolean;
-begin
- Result := false;
- BassCore := TAudioCore_Bass.GetInstance();
- if not BassCore.CheckVersion then
- Exit;
- Result := true;
-end;
-
-function TAudioDecoder_Bass.FinalizeDecoder(): boolean;
-begin
- Result := true;
-end;
-
-function TAudioDecoder_Bass.Open(const Filename: IPath): TAudioDecodeStream;
-var
- Stream: HSTREAM;
- ChannelInfo: BASS_CHANNELINFO;
- FileExt: string;
-begin
- Result := nil;
-
- // check if BASS was initialized
- // in case the decoder is not used with BASS playback, init the NO_SOUND device
- if ((integer(BASS_GetDevice) = -1) and (BASS_ErrorGetCode() = BASS_ERROR_INIT)) then
- BASS_Init(0, 44100, 0, 0, nil);
-
- // TODO: use BASS_STREAM_PRESCAN for accurate seeking in VBR-files?
- // disadvantage: seeking will slow down.
-
- {$IFDEF MSWINDOWS}
- // Windows: Use UTF-16 version
- Stream := BASS_StreamCreateFile(False, PWideChar(Filename.ToWide), 0, 0, BASS_STREAM_DECODE or BASS_UNICODE);
- {$ELSE}
- // Mac OS X: Use UTF8/ANSI version
- Stream := BASS_StreamCreateFile(False, PAnsiChar(Filename.ToNative), 0, 0, BASS_STREAM_DECODE);
- {$ENDIF}
- if (Stream = 0) then
- begin
- //Log.LogError(BassCore.ErrorGetString(), 'TAudioDecoder_Bass.Open');
- Exit;
- end;
-
- // check if BASS opened some erroneously recognized file-formats
- if BASS_ChannelGetInfo(Stream, channelInfo) then
- begin
- fileExt := Filename.GetExtension.ToUTF8;
- // BASS opens FLV-files (maybe others too) although it cannot handle them.
- // Setting BASS_CONFIG_VERIFY to the max. value (100000) does not help.
- if ((fileExt = '.flv') and (channelInfo.ctype = BASS_CTYPE_STREAM_MP1)) then
- begin
- BASS_StreamFree(Stream);
- Exit;
- end;
- end;
-
- Result := TBassDecodeStream.Create(Stream);
-end;
-
-
-initialization
- MediaManager.Add(TAudioDecoder_Bass.Create);
-
-end.
diff --git a/src/switches.inc b/src/switches.inc
index aa2e4e9b3..77a31ecce 100644
--- a/src/switches.inc
+++ b/src/switches.inc
@@ -81,7 +81,6 @@
// audio config
{$IF Defined(HaveBASS)}
{$DEFINE UseBASSPlayback}
- {$DEFINE UseBASSDecoder}
{$DEFINE UseBASSInput}
{$ELSEIF Defined(HavePortaudio)}
{$DEFINE UseSDLPlayback}
@@ -112,7 +111,7 @@
{$DEFINE UseFFmpeg}
{$IFEND}
-{$IF Defined(UseBASSInput) or Defined(UseBASSPlayback) or Defined(UseBASSDecoder)}
+{$IF Defined(UseBASSInput) or Defined(UseBASSPlayback)}
{$DEFINE UseBASS}
{$IFEND}
diff --git a/src/ultrastardx-travis.lpi b/src/ultrastardx-travis.lpi
index 99ae450e2..d125cfdda 100644
--- a/src/ultrastardx-travis.lpi
+++ b/src/ultrastardx-travis.lpi
@@ -44,7 +44,7 @@
-
+
@@ -410,7 +410,7 @@
-
+
@@ -560,10 +560,6 @@
-
-
-
-
diff --git a/src/ultrastardx-unix.lpi b/src/ultrastardx-unix.lpi
index 649279c62..d39535621 100644
--- a/src/ultrastardx-unix.lpi
+++ b/src/ultrastardx-unix.lpi
@@ -29,7 +29,7 @@
-
+
@@ -437,8 +437,9 @@
-
+
+
@@ -546,11 +547,6 @@
-
-
-
-
-
diff --git a/src/ultrastardx-win.lpi b/src/ultrastardx-win.lpi
index 6f1da647b..8914afd58 100644
--- a/src/ultrastardx-win.lpi
+++ b/src/ultrastardx-win.lpi
@@ -44,7 +44,7 @@
-
+
@@ -406,7 +406,7 @@
-
+
@@ -564,10 +564,6 @@
-
-
-
-
diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr
index ea0022e0f..4ba634f06 100644
--- a/src/ultrastardx.dpr
+++ b/src/ultrastardx.dpr
@@ -267,10 +267,6 @@ uses
{$IFDEF UseBASSInput}
UAudioInput_Bass in 'media\UAudioInput_Bass.pas',
{$ENDIF}
-{$IFDEF UseBASSDecoder}
- // prefer Bass to FFmpeg if possible
- UAudioDecoder_Bass in 'media\UAudioDecoder_Bass.pas',
-{$ENDIF}
{$IFDEF UseBASSPlayback}
UAudioPlayback_Bass in 'media\UAudioPlayback_Bass.pas',
{$ENDIF}