Skip to content

Commit 52aed9b

Browse files
authored
update BASS libraries (#2811)
1 parent 6069980 commit 52aed9b

File tree

6 files changed

+27
-20
lines changed

6 files changed

+27
-20
lines changed

Client/loader/MainFunctions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,9 +835,9 @@ void CheckDataFiles()
835835
{
836836
const char* szMd5;
837837
const char* szFilename;
838-
} integrityCheckList[] = {{"F3B64CBF7DE8DBB7793EE211374BDF76", "bass.dll"}, {"285A668CB793F5A5CA134DE9682A6064", "bass_aac.dll"},
838+
} integrityCheckList[] = {{"8E58FCC0672A66C827C6F90FA4B58538", "bass.dll"}, {"285A668CB793F5A5CA134DE9682A6064", "bass_aac.dll"},
839839
{"07C11F7D8058F350ADF6FC9AB81B38AC", "bass_ac3.dll"}, {"D8CCB4B8235F31A3C73485FDE18B0187", "bass_fx.dll"},
840-
{"9FF783BB73F8868FA6599CDE65ED21D7", "bassflac.dll"}, {"19CB1A88E49B8C7D126ACC8ABC574119", "bassmidi.dll"},
840+
{"ACA5F6C422F4FCA0E87AC9835C047E43", "bassflac.dll"}, {"154F9323D8C7F7C7755D9276E4084D6E", "bassmidi.dll"},
841841
{"D31DA7583083C1370F3C6B9C15F363CC", "bassmix.dll"}, {"26C74F5E9DF6C59DED3B09335E5D82AD", "bassopus.dll"},
842842
{"1A78628A8AB4B8DB0E336610A3ACF153", "basswebm.dll"}, {"893113C6C49DC1E1EF288310E68DB306", "basswma.dll"},
843843
{"6E2C5DCF4EE973E69ECA39288D20C436", "tags.dll"}, {"309D860FC8137E5FE9E7056C33B4B8BE", "vea.dll"},
24 Bytes
Binary file not shown.
2.45 KB
Binary file not shown.
0 Bytes
Binary file not shown.

vendor/bass/bass.h

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ typedef DWORD HPLUGIN; // plugin handle
169169
#define BASS_CONFIG_NET_PROXY 17
170170
#define BASS_CONFIG_IOS_NOTIFY 46
171171
#define BASS_CONFIG_LIBSSL 64
172+
#define BASS_CONFIG_FILENAME 75
172173

173174
#define BASS_CONFIG_THREAD 0x40000000 // flag: thread-specific setting
174175

@@ -360,21 +361,24 @@ typedef struct {
360361
#define BASS_MUSIC_NOSAMPLE 0x100000 // don't load the samples
361362

362363
// Speaker assignment flags
363-
#define BASS_SPEAKER_FRONT 0x1000000 // front speakers
364-
#define BASS_SPEAKER_REAR 0x2000000 // rear/side speakers
365-
#define BASS_SPEAKER_CENLFE 0x3000000 // center & LFE speakers (5.1)
366-
#define BASS_SPEAKER_REAR2 0x4000000 // rear center speakers (7.1)
367-
#define BASS_SPEAKER_N(n) ((n)<<24) // n'th pair of speakers (max 15)
368-
#define BASS_SPEAKER_LEFT 0x10000000 // modifier: left
369-
#define BASS_SPEAKER_RIGHT 0x20000000 // modifier: right
370-
#define BASS_SPEAKER_FRONTLEFT BASS_SPEAKER_FRONT|BASS_SPEAKER_LEFT
371-
#define BASS_SPEAKER_FRONTRIGHT BASS_SPEAKER_FRONT|BASS_SPEAKER_RIGHT
372-
#define BASS_SPEAKER_REARLEFT BASS_SPEAKER_REAR|BASS_SPEAKER_LEFT
373-
#define BASS_SPEAKER_REARRIGHT BASS_SPEAKER_REAR|BASS_SPEAKER_RIGHT
374-
#define BASS_SPEAKER_CENTER BASS_SPEAKER_CENLFE|BASS_SPEAKER_LEFT
375-
#define BASS_SPEAKER_LFE BASS_SPEAKER_CENLFE|BASS_SPEAKER_RIGHT
376-
#define BASS_SPEAKER_REAR2LEFT BASS_SPEAKER_REAR2|BASS_SPEAKER_LEFT
377-
#define BASS_SPEAKER_REAR2RIGHT BASS_SPEAKER_REAR2|BASS_SPEAKER_RIGHT
364+
#define BASS_SPEAKER_FRONT 0x1000000 // front speakers
365+
#define BASS_SPEAKER_REAR 0x2000000 // rear speakers
366+
#define BASS_SPEAKER_CENLFE 0x3000000 // center & LFE speakers (5.1)
367+
#define BASS_SPEAKER_SIDE 0x4000000 // side speakers (7.1)
368+
#define BASS_SPEAKER_N(n) ((n)<<24) // n'th pair of speakers (max 15)
369+
#define BASS_SPEAKER_LEFT 0x10000000 // modifier: left
370+
#define BASS_SPEAKER_RIGHT 0x20000000 // modifier: right
371+
#define BASS_SPEAKER_FRONTLEFT BASS_SPEAKER_FRONT | BASS_SPEAKER_LEFT
372+
#define BASS_SPEAKER_FRONTRIGHT BASS_SPEAKER_FRONT | BASS_SPEAKER_RIGHT
373+
#define BASS_SPEAKER_REARLEFT BASS_SPEAKER_REAR | BASS_SPEAKER_LEFT
374+
#define BASS_SPEAKER_REARRIGHT BASS_SPEAKER_REAR | BASS_SPEAKER_RIGHT
375+
#define BASS_SPEAKER_CENTER BASS_SPEAKER_CENLFE | BASS_SPEAKER_LEFT
376+
#define BASS_SPEAKER_LFE BASS_SPEAKER_CENLFE | BASS_SPEAKER_RIGHT
377+
#define BASS_SPEAKER_SIDELEFT BASS_SPEAKER_SIDE | BASS_SPEAKER_LEFT
378+
#define BASS_SPEAKER_SIDERIGHT BASS_SPEAKER_SIDE | BASS_SPEAKER_RIGHT
379+
#define BASS_SPEAKER_REAR2 BASS_SPEAKER_SIDE
380+
#define BASS_SPEAKER_REAR2LEFT BASS_SPEAKER_SIDELEFT
381+
#define BASS_SPEAKER_REAR2RIGHT BASS_SPEAKER_SIDERIGHT
378382

379383
#define BASS_ASYNCFILE 0x40000000 // read file asynchronously
380384
#define BASS_UNICODE 0x80000000 // UTF-16
@@ -453,8 +457,8 @@ typedef struct {
453457
// 3D vector (for 3D positions/velocities/orientations)
454458
typedef struct BASS_3DVECTOR {
455459
#ifdef __cplusplus
456-
BASS_3DVECTOR() {};
457-
BASS_3DVECTOR(float _x, float _y, float _z) : x(_x), y(_y), z(_z) {};
460+
BASS_3DVECTOR() {}
461+
BASS_3DVECTOR(float _x, float _y, float _z) : x(_x), y(_y), z(_z) {}
458462
#endif
459463
float x; // +=right, -=left
460464
float y; // +=up, -=down
@@ -601,6 +605,8 @@ RETURN : TRUE = continue recording, FALSE = stop */
601605
#define BASS_ATTRIB_TAIL 16
602606
#define BASS_ATTRIB_PUSH_LIMIT 17
603607
#define BASS_ATTRIB_DOWNLOADPROC 18
608+
#define BASS_ATTRIB_VOLDSP 19
609+
#define BASS_ATTRIB_VOLDSP_PRIORITY 20
604610
#define BASS_ATTRIB_MUSIC_AMPLIFY 0x100
605611
#define BASS_ATTRIB_MUSIC_PANSEP 0x101
606612
#define BASS_ATTRIB_MUSIC_PSCALER 0x102
@@ -617,7 +623,7 @@ RETURN : TRUE = continue recording, FALSE = stop */
617623
// BASS_ChannelGetData flags
618624
#define BASS_DATA_AVAILABLE 0 // query how much data is buffered
619625
#define BASS_DATA_NOREMOVE 0x10000000 // flag: don't remove data from recording buffer
620-
#define BASS_DATA_FIXED 0x20000000 // flag: return 8.24 fixed-point data
626+
#define BASS_DATA_FIXED 0x20000000 // unused
621627
#define BASS_DATA_FLOAT 0x40000000 // flag: return floating-point sample data
622628
#define BASS_DATA_FFT256 0x80000000 // 256 sample FFT
623629
#define BASS_DATA_FFT512 0x80000001 // 512 FFT
@@ -1065,6 +1071,7 @@ DWORD BASSDEF(BASS_ChannelFlags)(DWORD handle, DWORD flags, DWORD mask);
10651071
BOOL BASSDEF(BASS_ChannelLock)(DWORD handle, BOOL lock);
10661072
BOOL BASSDEF(BASS_ChannelFree)(DWORD handle);
10671073
BOOL BASSDEF(BASS_ChannelPlay)(DWORD handle, BOOL restart);
1074+
BOOL BASSDEF(BASS_ChannelStart)(DWORD handle);
10681075
BOOL BASSDEF(BASS_ChannelStop)(DWORD handle);
10691076
BOOL BASSDEF(BASS_ChannelPause)(DWORD handle);
10701077
BOOL BASSDEF(BASS_ChannelUpdate)(DWORD handle, DWORD length);

vendor/bass/lib/bass.lib

222 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)