Skip to content

Commit 6f153cc

Browse files
authored
update BASS libraries (#2260)
1 parent 2c75324 commit 6f153cc

File tree

10 files changed

+140
-180
lines changed

10 files changed

+140
-180
lines changed

Client/loader/MainFunctions.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -832,14 +832,14 @@ void CheckDataFiles()
832832
{
833833
const char* szMd5;
834834
const char* szFilename;
835-
} integrityCheckList[] = {{"99E6C7CBD3775EAA1A2A7860E90FCDEE", "bass.dll"},
836-
{"0867D67B8F5A822D20EDA6D55ADE0089", "bass_aac.dll"},
835+
} integrityCheckList[] = {{"ED3964A2AEFC227431CCCB63077BFAAC", "bass.dll"},
836+
{"A5FFF1BF0D50C7AB4737E7F729A449F6", "bass_aac.dll"},
837837
{"BD43C88917D6234FF962B6E88B648B8C", "bass_ac3.dll"},
838838
{"03FB421991634C85D7AA7A914506381E", "bass_fx.dll"},
839839
{"E2A26F0C195B75D520D39EAC4E4C804B", "bassflac.dll"},
840-
{"712EE5767116D0DF439C69FB8D52FC53", "bassmidi.dll"},
841-
{"3DEF1697D07960AB940E11EE48471D58", "bassmix.dll"},
842-
{"4E35BA785CD3B37A3702E577510F39E3", "bassopus.dll"},
840+
{"E930477525750B2FFD95C634449601D4", "bassmidi.dll"},
841+
{"01D4265D2E8F36677822833306F8D9F0", "bassmix.dll"},
842+
{"C5C56B1000868D7275BC74F8220A0862", "bassopus.dll"},
843843
{"0CE7A9F1930591C51B35BF6AA5EC7424", "basswma.dll"},
844844
{"6E2C5DCF4EE973E69ECA39288D20C436", "tags.dll"},
845845
{"309D860FC8137E5FE9E7056C33B4B8BE", "vea.dll"},
539 Bytes
Binary file not shown.
16 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
1.05 KB
Binary file not shown.
1.02 KB
Binary file not shown.

vendor/bass/bass.h

Lines changed: 129 additions & 174 deletions
Large diffs are not rendered by default.

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-2020 Un4seen Developments Ltd.
3+
Copyright (c) 2005-2021 Un4seen Developments Ltd.
44
55
See the BASSMIX.CHM file for more detailed documentation
66
*/
@@ -50,6 +50,10 @@ extern "C" {
5050

5151
// Mixer attributes
5252
#define BASS_ATTRIB_MIXER_LATENCY 0x15000
53+
#define BASS_ATTRIB_MIXER_THREADS 0x15001
54+
55+
// Additional BASS_Mixer_ChannelIsActive return values
56+
#define BASS_ACTIVE_WAITING 5
5357

5458
// BASS_Split_StreamCreate flags
5559
#define BASS_SPLIT_SLAVE 0x1000 // only read buffered data
@@ -91,6 +95,7 @@ BOOL BASSMIXDEF(BASS_Mixer_StreamAddChannelEx)(HSTREAM handle, DWORD channel, DW
9195
DWORD BASSMIXDEF(BASS_Mixer_StreamGetChannels)(HSTREAM handle, DWORD *channels, DWORD count);
9296

9397
HSTREAM BASSMIXDEF(BASS_Mixer_ChannelGetMixer)(DWORD handle);
98+
DWORD BASSMIXDEF(BASS_Mixer_ChannelIsActive)(DWORD handle);
9499
DWORD BASSMIXDEF(BASS_Mixer_ChannelFlags)(DWORD handle, DWORD flags, DWORD mask);
95100
BOOL BASSMIXDEF(BASS_Mixer_ChannelRemove)(DWORD handle);
96101
BOOL BASSMIXDEF(BASS_Mixer_ChannelSetPosition)(DWORD handle, QWORD pos, DWORD mode);

vendor/bass/lib/bass.lib

318 Bytes
Binary file not shown.

vendor/bass/lib/bassmix.lib

270 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)