Skip to content

Commit 30639d6

Browse files
committed
Revert "update BASS libraries (#2377)"
Attempt 1 to fix mod not found issue. This reverts commit fe93f94.
1 parent 8d800eb commit 30639d6

File tree

6 files changed

+4
-16
lines changed

6 files changed

+4
-16
lines changed

Client/loader/MainFunctions.cpp

Lines changed: 3 additions & 3 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[] = {{"B5375C189939F366CC79ECA57A915615", "bass.dll"},
835+
} integrityCheckList[] = {{"7B9496FAB92A79476343DDEDD4C76BAD", "bass.dll"},
836836
{"E48EA82D7A87853FA4F09F19C4E7A2C1", "bass_aac.dll"},
837837
{"BD43C88917D6234FF962B6E88B648B8C", "bass_ac3.dll"},
838838
{"03FB421991634C85D7AA7A914506381E", "bass_fx.dll"},
839839
{"E2A26F0C195B75D520D39EAC4E4C804B", "bassflac.dll"},
840840
{"2DF21511EB488D860BC43C904679D4AA", "bassmidi.dll"},
841-
{"7508CACD7EDC4749228BA0FB9A0BE296", "bassmix.dll"},
842-
{"26C74F5E9DF6C59DED3B09335E5D82AD", "bassopus.dll"},
841+
{"01D4265D2E8F36677822833306F8D9F0", "bassmix.dll"},
842+
{"5E309F265D9A4769EB93D80B2A268A6B", "bassopus.dll"},
843843
{"476BDA1EE12C760A29E4EE43F593F878", "basswma.dll"},
844844
{"6E2C5DCF4EE973E69ECA39288D20C436", "tags.dll"},
845845
{"309D860FC8137E5FE9E7056C33B4B8BE", "vea.dll"},
-56 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

vendor/bass/bassmix.h

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
#error conflicting BASS and BASSmix versions
1515
#endif
1616

17-
#ifdef __OBJC__
18-
typedef int BOOL32;
19-
#define BOOL BOOL32 // override objc's BOOL
20-
#endif
21-
2217
#ifdef __cplusplus
2318
extern "C" {
2419
#endif
@@ -88,14 +83,11 @@ typedef struct {
8883
// Additional BASS_Mixer_ChannelSetPosition flag
8984
#define BASS_POS_MIXER_RESET 0x10000 // flag: clear mixer's playback buffer
9085

91-
// Additional BASS_Mixer_ChannelGetPosition mode
92-
#define BASS_POS_MIXER_DELAY 5
93-
9486
// BASS_CHANNELINFO types
9587
#define BASS_CTYPE_STREAM_MIXER 0x10800
9688
#define BASS_CTYPE_STREAM_SPLIT 0x10801
9789

98-
DWORD BASSMIXDEF(BASS_Mixer_GetVersion)(void);
90+
DWORD BASSMIXDEF(BASS_Mixer_GetVersion)();
9991

10092
HSTREAM BASSMIXDEF(BASS_Mixer_StreamCreate)(DWORD freq, DWORD chans, DWORD flags);
10193
BOOL BASSMIXDEF(BASS_Mixer_StreamAddChannel)(HSTREAM handle, DWORD channel, DWORD flags);
@@ -132,8 +124,4 @@ DWORD BASSMIXDEF(BASS_Split_StreamGetAvailable)(DWORD handle);
132124
}
133125
#endif
134126

135-
#ifdef __OBJC__
136-
#undef BOOL
137-
#endif
138-
139127
#endif

vendor/bass/lib/bassmix.lib

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)