Skip to content

Commit a4e36bc

Browse files
authored
Update BASS libraries (#1697)
* Updated BASS libraries
1 parent ccc375e commit a4e36bc

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

Client/loader/MainFunctions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -832,12 +832,12 @@ void CheckDataFiles()
832832
{
833833
const char* szMd5;
834834
const char* szFilename;
835-
} integrityCheckList[] = {{"5B94D8E034A90032062ABEE2F6F8C2B9", "bass.dll"},
835+
} integrityCheckList[] = {{"DF51D99AFA46AE359FDFCE18966F0078", "bass.dll"},
836836
{"1427B642B1E10B15E84C10FF43B1D8A5", "bass_aac.dll"},
837837
{"BD43C88917D6234FF962B6E88B648B8C", "bass_ac3.dll"},
838838
{"27D2069B89AA55C21DB23C835AA90730", "bass_fx.dll"},
839839
{"FFC2CA817B012FECE4CF62BB85162E68", "bassflac.dll"},
840-
{"AFF8A753E795DF59C9285324124B9132", "bassmidi.dll"},
840+
{"0140838049533F988D8845AE522589FA", "bassmidi.dll"},
841841
{"7B00E76ABC6128AE2B29B2B7F77F49FC", "bassmix.dll"},
842842
{"4E35BA785CD3B37A3702E577510F39E3", "bassopus.dll"},
843843
{"0CE7A9F1930591C51B35BF6AA5EC7424", "basswma.dll"},
2 KB
Binary file not shown.
Binary file not shown.

vendor/bass/bass.h

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ typedef DWORD HPLUGIN; // Plugin handle
151151
#define BASS_CONFIG_WASAPI_PERSIST 65
152152
#define BASS_CONFIG_REC_WASAPI 66
153153
#define BASS_CONFIG_ANDROID_AAUDIO 67
154+
#define BASS_CONFIG_SAMPLE_ONEHANDLE 69
154155

155156
// BASS_SetConfigPtr options
156157
#define BASS_CONFIG_NET_AGENT 16
@@ -400,6 +401,7 @@ typedef struct {
400401
#define BASS_CTYPE_STREAM_CA 0x10007
401402
#define BASS_CTYPE_STREAM_MF 0x10008
402403
#define BASS_CTYPE_STREAM_AM 0x10009
404+
#define BASS_CTYPE_STREAM_SAMPLE 0x1000a
403405
#define BASS_CTYPE_STREAM_DUMMY 0x18000
404406
#define BASS_CTYPE_STREAM_DEVICE 0x18001
405407
#define BASS_CTYPE_STREAM_WAV 0x40000 // WAVE flag, LOWORD=codec
@@ -512,6 +514,10 @@ enum
512514
#define EAX_PRESET_DIZZY EAX_ENVIRONMENT_DIZZY,0.139F,17.234F,0.666F
513515
#define EAX_PRESET_PSYCHOTIC EAX_ENVIRONMENT_PSYCHOTIC,0.486F,7.563F,0.806F
514516

517+
// BASS_SampleGetChannel flags
518+
#define BASS_SAMCHAN_NEW 1
519+
#define BASS_SAMCHAN_STREAM 2
520+
515521
typedef DWORD (CALLBACK STREAMPROC)(HSTREAM handle, void *buffer, DWORD length, void *user);
516522
/* User stream callback function.
517523
handle : The stream that needs writing
@@ -633,6 +639,7 @@ RETURN : TRUE = continue recording, FALSE = stop */
633639
#define BASS_ATTRIB_BUFFER 13
634640
#define BASS_ATTRIB_GRANULE 14
635641
#define BASS_ATTRIB_USER 15
642+
#define BASS_ATTRIB_TAIL 16
636643
#define BASS_ATTRIB_MUSIC_AMPLIFY 0x100
637644
#define BASS_ATTRIB_MUSIC_PANSEP 0x101
638645
#define BASS_ATTRIB_MUSIC_PSCALER 0x102
@@ -1011,29 +1018,29 @@ BOOL BASSDEF(BASS_SetConfig)(DWORD option, DWORD value);
10111018
DWORD BASSDEF(BASS_GetConfig)(DWORD option);
10121019
BOOL BASSDEF(BASS_SetConfigPtr)(DWORD option, const void *value);
10131020
const void *BASSDEF(BASS_GetConfigPtr)(DWORD option);
1014-
DWORD BASSDEF(BASS_GetVersion)();
1015-
int BASSDEF(BASS_ErrorGetCode)();
1021+
DWORD BASSDEF(BASS_GetVersion)(void);
1022+
int BASSDEF(BASS_ErrorGetCode)(void);
10161023
BOOL BASSDEF(BASS_GetDeviceInfo)(DWORD device, BASS_DEVICEINFO *info);
10171024
#if defined(_WIN32) && !defined(_WIN32_WCE) && !(WINAPI_FAMILY && WINAPI_FAMILY!=WINAPI_FAMILY_DESKTOP_APP)
10181025
BOOL BASSDEF(BASS_Init)(int device, DWORD freq, DWORD flags, HWND win, const GUID *dsguid);
10191026
#else
10201027
BOOL BASSDEF(BASS_Init)(int device, DWORD freq, DWORD flags, void *win, void *dsguid);
10211028
#endif
10221029
BOOL BASSDEF(BASS_SetDevice)(DWORD device);
1023-
DWORD BASSDEF(BASS_GetDevice)();
1024-
BOOL BASSDEF(BASS_Free)();
1030+
DWORD BASSDEF(BASS_GetDevice)(void);
1031+
BOOL BASSDEF(BASS_Free)(void);
10251032
#if defined(_WIN32) && !defined(_WIN32_WCE) && !(WINAPI_FAMILY && WINAPI_FAMILY!=WINAPI_FAMILY_DESKTOP_APP)
10261033
void *BASSDEF(BASS_GetDSoundObject)(DWORD object);
10271034
#endif
10281035
BOOL BASSDEF(BASS_GetInfo)(BASS_INFO *info);
10291036
BOOL BASSDEF(BASS_Update)(DWORD length);
1030-
float BASSDEF(BASS_GetCPU)();
1031-
BOOL BASSDEF(BASS_Start)();
1032-
BOOL BASSDEF(BASS_Stop)();
1033-
BOOL BASSDEF(BASS_Pause)();
1034-
BOOL BASSDEF(BASS_IsStarted)();
1037+
float BASSDEF(BASS_GetCPU)(void);
1038+
BOOL BASSDEF(BASS_Start)(void);
1039+
BOOL BASSDEF(BASS_Stop)(void);
1040+
BOOL BASSDEF(BASS_Pause)(void);
1041+
BOOL BASSDEF(BASS_IsStarted)(void);
10351042
BOOL BASSDEF(BASS_SetVolume)(float volume);
1036-
float BASSDEF(BASS_GetVolume)();
1043+
float BASSDEF(BASS_GetVolume)(void);
10371044

10381045
HPLUGIN BASSDEF(BASS_PluginLoad)(const char *file, DWORD flags);
10391046
BOOL BASSDEF(BASS_PluginFree)(HPLUGIN handle);
@@ -1044,7 +1051,7 @@ BOOL BASSDEF(BASS_Set3DFactors)(float distf, float rollf, float doppf);
10441051
BOOL BASSDEF(BASS_Get3DFactors)(float *distf, float *rollf, float *doppf);
10451052
BOOL BASSDEF(BASS_Set3DPosition)(const BASS_3DVECTOR *pos, const BASS_3DVECTOR *vel, const BASS_3DVECTOR *front, const BASS_3DVECTOR *top);
10461053
BOOL BASSDEF(BASS_Get3DPosition)(BASS_3DVECTOR *pos, BASS_3DVECTOR *vel, BASS_3DVECTOR *front, BASS_3DVECTOR *top);
1047-
void BASSDEF(BASS_Apply3D)();
1054+
void BASSDEF(BASS_Apply3D)(void);
10481055
#if defined(_WIN32) && !defined(_WIN32_WCE) && !(WINAPI_FAMILY && WINAPI_FAMILY!=WINAPI_FAMILY_DESKTOP_APP)
10491056
BOOL BASSDEF(BASS_SetEAXParameters)(int env, float vol, float decay, float damp);
10501057
BOOL BASSDEF(BASS_GetEAXParameters)(DWORD *env, float *vol, float *decay, float *damp);
@@ -1060,7 +1067,7 @@ BOOL BASSDEF(BASS_SampleSetData)(HSAMPLE handle, const void *buffer);
10601067
BOOL BASSDEF(BASS_SampleGetData)(HSAMPLE handle, void *buffer);
10611068
BOOL BASSDEF(BASS_SampleGetInfo)(HSAMPLE handle, BASS_SAMPLE *info);
10621069
BOOL BASSDEF(BASS_SampleSetInfo)(HSAMPLE handle, const BASS_SAMPLE *info);
1063-
HCHANNEL BASSDEF(BASS_SampleGetChannel)(HSAMPLE handle, BOOL onlynew);
1070+
DWORD BASSDEF(BASS_SampleGetChannel)(HSAMPLE handle, DWORD flags);
10641071
DWORD BASSDEF(BASS_SampleGetChannels)(HSAMPLE handle, HCHANNEL *channels);
10651072
BOOL BASSDEF(BASS_SampleStop)(HSAMPLE handle);
10661073

@@ -1076,8 +1083,8 @@ DWORD BASSDEF(BASS_StreamPutFileData)(HSTREAM handle, const void *buffer, DWORD
10761083
BOOL BASSDEF(BASS_RecordGetDeviceInfo)(DWORD device, BASS_DEVICEINFO *info);
10771084
BOOL BASSDEF(BASS_RecordInit)(int device);
10781085
BOOL BASSDEF(BASS_RecordSetDevice)(DWORD device);
1079-
DWORD BASSDEF(BASS_RecordGetDevice)();
1080-
BOOL BASSDEF(BASS_RecordFree)();
1086+
DWORD BASSDEF(BASS_RecordGetDevice)(void);
1087+
BOOL BASSDEF(BASS_RecordFree)(void);
10811088
BOOL BASSDEF(BASS_RecordGetInfo)(BASS_RECORDINFO *info);
10821089
const char *BASSDEF(BASS_RecordGetInputName)(int input);
10831090
BOOL BASSDEF(BASS_RecordSetInput)(int input, DWORD flags, float volume);

0 commit comments

Comments
 (0)