Skip to content

Commit 6bedaae

Browse files
committed
Update BASS libraries
1 parent 776c27c commit 6bedaae

File tree

8 files changed

+15
-9
lines changed

8 files changed

+15
-9
lines changed

Client/loader/MainFunctions.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -863,11 +863,11 @@ void CheckDataFiles()
863863
{
864864
const char* expected;
865865
const char* fileName;
866-
} integrityCheckList[] = {{"24F61A108D285381A67CE643ABBF589C", "bass.dll"}, {"5F9352A9D36E12E1E167E28040EADA83", "bass_aac.dll"},
867-
{"F0D770E77C5A5816D9E2323CC683BA32", "bass_ac3.dll"}, {"D6669FA6DFD548E60CC20503ABCF2FF8", "bass_fx.dll"},
868-
{"F47DCE69DAFAA06A55A4BC1F07F80C8A", "bassflac.dll"}, {"CD9B45DFE7D8B4D547F8B0193C6CF30B", "bassmidi.dll"},
869-
{"F1F587B6515530634AD489CE507BC957", "bassmix.dll"}, {"9CFA31A873FF89C2CC491B9974FC5C65", "bassopus.dll"},
870-
{"0F1B2FC6C0C703A43A24DC05352E7ADA", "basswebm.dll"}, {"1507C60C02E159B5FB247FEC6B209B09", "basswma.dll"},
866+
} integrityCheckList[] = {{"DE5C08577EAA65309974F9860E303F53", "bass.dll"}, {"5F9352A9D36E12E1E167E28040EADA83", "bass_aac.dll"},
867+
{"F0D770E77C5A5816D9E2323CC683BA32", "bass_ac3.dll"}, {"C0D54294423E88290AAD561F4E72B7D4", "bass_fx.dll"},
868+
{"F47DCE69DAFAA06A55A4BC1F07F80C8A", "bassflac.dll"}, {"49A603ED114982787FC0A301C0E93FDB", "bassmidi.dll"},
869+
{"064398B1A74B4EF35902F0C218142133", "bassmix.dll"}, {"9CFA31A873FF89C2CC491B9974FC5C65", "bassopus.dll"},
870+
{"B35714019BBFF0D0CEE0AFA2637A77A7", "basswebm.dll"}, {"1507C60C02E159B5FB247FEC6B209B09", "basswma.dll"},
871871
{"C6A44FC3CF2F5801561804272217B14D", "D3DX9_42.dll"}, {"D439E8EDD8C93D7ADE9C04BCFE9197C6", "sa.dat"},
872872
{"B33B21DB610116262D906305CE65C354", "D3DCompiler_42.dll"}, {"4B3932359373F11CBC542CC96D9A9285", "tags.dll"},
873873
{"0B3DD892007FB366D1F52F2247C046F5", "d3dcompiler_43.dll"}, {"D5D8C8561C6DDA7EF0D7D6ABB0D772F4", "xinput1_3_mta.dll"},
512 Bytes
Binary file not shown.
-10.4 KB
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
336 Bytes
Binary file not shown.

vendor/bass/bass_fx.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,9 @@ typedef struct {
308308
float fPitchShift; // A factor value which is between 0.5 (one octave down) and 2 (one octave up) (1 won't change the pitch) [1 default]
309309
// (fSemitones is not in use, fPitchShift has a priority over fSemitones)
310310
float fSemitones; // Semitones (0 won't change the pitch) [0 default]
311-
long lFFTsize; // Defines the FFT frame size used for the processing. Typical values are 1024, 2048 and 4096 [2048 default]
311+
int lFFTsize; // Defines the FFT frame size used for the processing. Typical values are 1024, 2048 and 4096 [2048 default]
312312
// It may be any value <= 8192 but it MUST be a power of 2
313-
long lOsamp; // Is the STFT oversampling factor which also determines the overlap between adjacent STFT frames [8 default]
313+
int lOsamp; // Is the STFT oversampling factor which also determines the overlap between adjacent STFT frames [8 default]
314314
// It should at least be 4 for moderate scaling ratios. A value of 32 is recommended for best quality (better quality = higher CPU usage)
315315
int lChannel; // BASS_BFX_CHANxxx flag/s
316316
} BASS_BFX_PITCHSHIFT;
@@ -357,7 +357,8 @@ enum {
357357
BASS_ATTRIB_TEMPO_OPTION_SEQUENCE_MS, // 82 default, 0 = automatic
358358
BASS_ATTRIB_TEMPO_OPTION_SEEKWINDOW_MS, // 28 default, 0 = automatic
359359
BASS_ATTRIB_TEMPO_OPTION_OVERLAP_MS, // 8 default
360-
BASS_ATTRIB_TEMPO_OPTION_PREVENT_CLICK // TRUE / FALSE (default)
360+
BASS_ATTRIB_TEMPO_OPTION_PREVENT_CLICK, // TRUE / FALSE (default)
361+
BASS_ATTRIB_TEMPO_OPTION_OLDPOS
361362
};
362363

363364
// tempo algorithm flags

vendor/bass/bassmix.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
BASSmix 2.4 C/C++ header file
3-
Copyright (c) 2005-2022 Un4seen Developments Ltd.
3+
Copyright (c) 2005-2025 Un4seen Developments Ltd.
44
55
See the BASSMIX.CHM file for more detailed documentation
66
*/
@@ -46,6 +46,8 @@ extern "C" {
4646
#define BASS_MIXER_CHAN_LIMIT 0x4000 // limit mixer processing to the amount available from this source
4747
#define BASS_MIXER_CHAN_MATRIX 0x10000 // matrix mixing
4848
#define BASS_MIXER_CHAN_PAUSE 0x20000 // don't process the source
49+
#define BASS_MIXER_CHAN_AUTOFREE 0x40000 // automatically free the source when it ends
50+
#define BASS_MIXER_CHAN_RAMPOUT 0x80000 // ramp-out when pausing
4951
#define BASS_MIXER_CHAN_DOWNMIX 0x400000 // downmix to stereo/mono
5052
#define BASS_MIXER_CHAN_NORAMPIN 0x800000 // don't ramp-in the start
5153
#define BASS_MIXER_BUFFER BASS_MIXER_CHAN_BUFFER
@@ -89,6 +91,8 @@ typedef struct {
8991
#define BASS_SYNC_MIXER_ENVELOPE 0x10200
9092
#define BASS_SYNC_MIXER_ENVELOPE_NODE 0x10201
9193
#define BASS_SYNC_MIXER_QUEUE 0x10202
94+
#define BASS_SYNC_MIXER_STALL 0x10203
95+
#define BASS_SYNC_MIXER_RESUME 0x10204
9296

9397
// Additional BASS_Mixer_ChannelSetPosition flag
9498
#define BASS_POS_MIXER_RESET 0x10000 // flag: clear mixer's playback buffer
@@ -119,6 +123,7 @@ BOOL BASSMIXDEF(BASS_Mixer_ChannelGetLevelEx)(DWORD handle, float *levels, float
119123
DWORD BASSMIXDEF(BASS_Mixer_ChannelGetData)(DWORD handle, void *buffer, DWORD length);
120124
HSYNC BASSMIXDEF(BASS_Mixer_ChannelSetSync)(DWORD handle, DWORD type, QWORD param, SYNCPROC *proc, void *user);
121125
BOOL BASSMIXDEF(BASS_Mixer_ChannelRemoveSync)(DWORD channel, HSYNC sync);
126+
BOOL BASSMIXDEF(BASS_Mixer_ChannelSetMap)(DWORD handle, int *chanmap);
122127
BOOL BASSMIXDEF(BASS_Mixer_ChannelSetMatrix)(DWORD handle, const void *matrix);
123128
BOOL BASSMIXDEF(BASS_Mixer_ChannelSetMatrixEx)(DWORD handle, const void *matrix, float time);
124129
BOOL BASSMIXDEF(BASS_Mixer_ChannelGetMatrix)(DWORD handle, void *matrix);

0 commit comments

Comments
 (0)