From 7c402fd3ad326fe356467412f75541e4912b5087 Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Mon, 25 Apr 2011 12:07:15 +0000 Subject: update to BASS v2.4.7.1; enabled BASS_CONFIG_DEV_DEFAULT git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2830 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UMusic.pas | 2 + Game/Code/lib/bass/bass.chm | Bin 219326 -> 228212 bytes Game/Code/lib/bass/bass.txt | 46 +++++++++++++++++++---- Game/Code/lib/bass/delphi/bass.bpg | 73 ------------------------------------- Game/Code/lib/bass/delphi/bass.pas | 10 ++++- Game/Output/bass.dll | Bin 99896 -> 100408 bytes 6 files changed, 49 insertions(+), 82 deletions(-) delete mode 100644 Game/Code/lib/bass/delphi/bass.bpg diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas index 1ce421b8..f6a57fda 100644 --- a/Game/Code/Classes/UMusic.pas +++ b/Game/Code/Classes/UMusic.pas @@ -360,6 +360,8 @@ begin Loop := false; fHWND := Classes.AllocateHWND( nil); + BASS_SetConfig(BASS_CONFIG_DEV_DEFAULT, 1); + if BASS_Init(-1, 44100, 0, fHWND, nil) = false then begin Application.MessageBox ('Could not initialize BASS', 'Error'); diff --git a/Game/Code/lib/bass/bass.chm b/Game/Code/lib/bass/bass.chm index 66bda199..68e0bab8 100644 Binary files a/Game/Code/lib/bass/bass.chm and b/Game/Code/lib/bass/bass.chm differ diff --git a/Game/Code/lib/bass/bass.txt b/Game/Code/lib/bass/bass.txt index d21085dd..06854c34 100644 --- a/Game/Code/lib/bass/bass.txt +++ b/Game/Code/lib/bass/bass.txt @@ -82,7 +82,7 @@ C\ C/C++ API and examples... SPECTRUM.C SPECTRUM.DSP MAKEFILE - SYNTH\ Synth example + SYNTH\ Low latency custom streaming example SYNTH.C SYNTH.DSP MAKEFILE @@ -157,7 +157,7 @@ VB\ Visual Basic API and examples... PRJSPECTRUM.VBP FRMSPECTRUM.FRM MODSPECTRUM.BAS - SYNTH\ Synth example + SYNTH\ Low latency custom streaming example PRJSYNTH.VBP FRMSYNTH.FRM MODSYNTH.BAS @@ -269,6 +269,7 @@ CHMOX.APP CHM file viewer BASS.H BASS C/C++ header file MAKEFILE Makefile for all examples MAKEFILE.IN Makefile helper macros +BASS.XCODEPROJ Xcode project for examples MP3-FREE LIBBASS.DYLIB BASS module using the OSX MP3 decoder 3DTEST\ 3D example @@ -319,6 +320,10 @@ SPEAKERS\ Multi-speaker example SPECTRUM\ Spectrum analyser example SPECTRUM.C MAKEFILE +SYNTH\ Low latency custom streaming example + SYNTH.C + MAKEFILE + SYNTH.NIB WRITEWAV\ WAVE writer example WRITEWAV.C MAKEFILE @@ -396,20 +401,20 @@ Main Features * High precision synchronization synchronize events in your software to the streams and MOD musics -* DirectX 8 effects +* Effects chorus/compressor/distortion/echo/flanger/gargle/parameq/reverb * User defined DSP functions custom effects may be applied to musics and streams * 32 bit floating-point decoding and processing - floating-point stream/music decoding, DSP, FX, and recording + floating-point stream/music decoding, DSP/FX, and recording * 3D sound - play samples/streams/musics in any 3D position, with EAX support + play samples/streams/musics in any 3D position * Small - BASS is under 100KB (on Windows), so won't bloat your distribution + BASS (Win32 version) is under 100KB, so won't bloat your distribution Using BASS @@ -466,7 +471,7 @@ string. MacOSX version -------------- -A separate "LIB" file is not required for OSX. Using XCode, you can simply +A separate "LIB" file is not required for OSX. Using Xcode, you can simply add the DYLIB file to the project. Or using a makefile, you can build your programs like this, for example: @@ -576,6 +581,33 @@ There are of course bug fixes and other little improvements made along the way too! To make upgrading simpler, all functions affected by a change to the BASS interface are listed. +2.4.7 - 30/11/2010 +------------------ +* Decode-to-position seeking + BASS_POS_DECODETO (BASS_ChannelSetPosition flag) +* Support for RIFF "DISP" text tags + BASS_TAG_RIFF_DISP (BASS_ChannelGetTags type) +* Support for APEv1 tags + BASS_TAG_APE (BASS_ChannelGetTags type) + BASS_TAG_APE_BINARY (BASS_ChannelGetTags type) +* 16384 sample FFT + BASS_DATA_FFT16384 (BASS_ChannelGetData flag) +* Support for AIFF files larger than 4GB + BASS_StreamCreateFile/User/Url +* Acceptance of self-signed and invalid certificates + BASS_StreamCreateURL +* Internet stream reading timeout + BASS_CONFIG_NET_READTIMEOUT +* Support for removing a DSP within its DSPPROC + BASS_ChannelRemoveDSP +* Buffer-bypassing for lower latency output (not available on Windows) + BASS_ATTRIB_NOBUFFER (BASS_ChannelSetAttribute option) + SYNTH example added (OSX) +* A "Default" device that follows default device changes on Windows 7 + BASS_CONFIG_DEV_DEFAULT (BASS_SetConfig option) +* Xcode examples project added for OSX +* Documentation updated with platform-specific info for iOS/Linux/WinCE + 2.4.6 - 17/6/2010 ----------------- * Support for APEv2 tags, including binary diff --git a/Game/Code/lib/bass/delphi/bass.bpg b/Game/Code/lib/bass/delphi/bass.bpg deleted file mode 100644 index da3e524f..00000000 --- a/Game/Code/lib/bass/delphi/bass.bpg +++ /dev/null @@ -1,73 +0,0 @@ -#------------------------------------------------------------------------------ -VERSION = BWS.01 -#------------------------------------------------------------------------------ -!ifndef ROOT -ROOT = $(MAKEDIR)\.. -!endif -#------------------------------------------------------------------------------ -MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** -DCC = $(ROOT)\bin\dcc32.exe $** -BRCC = $(ROOT)\bin\brcc32.exe $** -#------------------------------------------------------------------------------ -PROJECTS = D3Test.exe BassTest.exe ConTest.exe custloop.exe DspTest.exe \ - FXtest.exe livefx.exe Multi.exe netradio.exe plugins.exe RecordTest.exe \ - samplevis.exe Speakers.exe StreamTest.exe writewav.exe -#------------------------------------------------------------------------------ -default: $(PROJECTS) -#------------------------------------------------------------------------------ - -D3Test.exe: 3dTest\D3Test.dpr - $(DCC) - -BassTest.exe: BassTest\BassTest.dpr - $(DCC) - -ConTest.exe: ConTest\ConTest.dpr - $(DCC) - -custloop.exe: custloop\custloop.dpr - $(DCC) - -DspTest.exe: DspTest\DspTest.dpr - $(DCC) - -FXtest.exe: fxtest\FXtest.dpr - $(DCC) - -livefx.exe: livefx\livefx.dpr - $(DCC) - -livespec.exe: livespec\livespec.dpr - $(DCC) - -Multi.exe: multi\Multi.dpr - $(DCC) - -netradio.exe: netradio\netradio.dpr - $(DCC) - -plugins.exe: plugins\plugins.dpr - $(DCC) - -RecordTest.exe: RecordTest\RecordTest.dpr - $(DCC) - -samplevis.exe: SampleVis\samplevis.dpr - $(DCC) - -Speakers.exe: Speakers\Speakers.dpr - $(DCC) - -spectrum.exe: spectrum\spectrum.dpr - $(DCC) - -StreamTest.exe: StreamTest\StreamTest.dpr - $(DCC) - -synth.exe: synth\synth.dpr - $(DCC) - -writewav.exe: writewav\writewav.dpr - $(DCC) - - diff --git a/Game/Code/lib/bass/delphi/bass.pas b/Game/Code/lib/bass/delphi/bass.pas index bdcd5900..2c7f1395 100644 --- a/Game/Code/lib/bass/delphi/bass.pas +++ b/Game/Code/lib/bass/delphi/bass.pas @@ -11,7 +11,7 @@ NOTE: Delphi 2009 users should use the BASS_UNICODE flag where possible } -unit BASS; +unit Bass; interface @@ -84,6 +84,9 @@ const BASS_CONFIG_MUSIC_VIRTUAL = 22; BASS_CONFIG_VERIFY = 23; BASS_CONFIG_UPDATETHREADS = 24; + BASS_CONFIG_DEV_BUFFER = 27; + BASS_CONFIG_DEV_DEFAULT = 36; + BASS_CONFIG_NET_READTIMEOUT = 37; // BASS_SetConfigPtr options BASS_CONFIG_NET_AGENT = 16; @@ -266,7 +269,6 @@ const BASS_STREAMPROC_END = $80000000; // end of user stream flag - // BASS_StreamCreateFileUser file systems STREAMFILE_NOBUFFER = 0; STREAMFILE_BUFFER = 1; @@ -311,6 +313,7 @@ const BASS_ATTRIB_VOL = 2; BASS_ATTRIB_PAN = 3; BASS_ATTRIB_EAXMIX = 4; + BASS_ATTRIB_NOBUFFER = 5; BASS_ATTRIB_MUSIC_AMPLIFY = $100; BASS_ATTRIB_MUSIC_PANSEP = $101; BASS_ATTRIB_MUSIC_PSCALER = $102; @@ -329,6 +332,7 @@ const BASS_DATA_FFT2048 = $80000003; // 2048 FFT BASS_DATA_FFT4096 = $80000004; // 4096 FFT BASS_DATA_FFT8192 = $80000005; // 8192 FFT + BASS_DATA_FFT16384 = $80000006; // 16384 FFT BASS_DATA_FFT_INDIVIDUAL = $10; // FFT flag: FFT for each channel, else all combined BASS_DATA_FFT_NOWINDOW = $20; // FFT flag: no Hanning window BASS_DATA_FFT_REMOVEDC = $40; // FFT flag: pre-remove DC bias @@ -346,6 +350,7 @@ const BASS_TAG_RIFF_INFO = $100; // RIFF "INFO" tags : series of null-terminated ANSI strings BASS_TAG_RIFF_BEXT = $101; // RIFF/BWF "bext" tags : TAG_BEXT structure BASS_TAG_RIFF_CART = $102; // RIFF/BWF "cart" tags : TAG_CART structure + BASS_TAG_RIFF_DISP = $103; // RIFF "DISP" text tag : ANSI string BASS_TAG_APE_BINARY = $1000; // + index #, binary APEv2 tag : TAG_APE_BINARY structure BASS_TAG_MUSIC_NAME = $10000; // MOD music name : ANSI string BASS_TAG_MUSIC_MESSAGE = $10001; // MOD message : ANSI string @@ -357,6 +362,7 @@ const BASS_POS_BYTE = 0; // byte position BASS_POS_MUSIC_ORDER = 1; // order.row position, MAKELONG(order,row) BASS_POS_DECODE = $10000000; // flag: get the decoding (not playing) position + BASS_POS_DECODETO = $20000000; // flag: decode to the position instead of seeking // BASS_RecordSetInput flags BASS_INPUT_OFF = $10000; diff --git a/Game/Output/bass.dll b/Game/Output/bass.dll index e4bd7d4c..dad8437b 100644 Binary files a/Game/Output/bass.dll and b/Game/Output/bass.dll differ -- cgit v1.2.3