Skip to content

Commit

Permalink
Updated BASS libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
Dutchman101 committed Apr 8, 2020
1 parent ec2b11a commit 2d0c127
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 23 deletions.
6 changes: 3 additions & 3 deletions Client/loader/MainFunctions.cpp
Expand Up @@ -844,13 +844,13 @@ void CheckDataFiles()
{
const char* szMd5;
const char* szFilename;
} integrityCheckList[] = {{"B15F1875F447DBB2A849050E5FD6125D", "bass.dll"},
} integrityCheckList[] = {{"07387638905CF786BA12433F97782EE1", "bass.dll"},
{"853933A2518EBF8E966C04C2EAA95391", "bass_aac.dll"},
{"BD43C88917D6234FF962B6E88B648B8C", "bass_ac3.dll"},
{"C176D670BF5440A6C704B55A21B01FEF", "bass_fx.dll"},
{"FFC2CA817B012FECE4CF62BB85162E68", "bassflac.dll"},
{"8BF45CFAC7219673DEC8BB0ED54D0365", "bassmidi.dll"},
{"5387D7484E6CAA959144DFE524BB3B05", "bassmix.dll"},
{"5C2A325EC18952945F07C881CB7E44CC", "bassmidi.dll"},
{"6CBD7A375E98420DC8CC2475B62C895B", "bassmix.dll"},
{"4E35BA785CD3B37A3702E577510F39E3", "bassopus.dll"},
{"0CE7A9F1930591C51B35BF6AA5EC7424", "basswma.dll"},
{"6E2C5DCF4EE973E69ECA39288D20C436", "tags.dll"},
Expand Down
Binary file modified Shared/data/MTA San Andreas/MTA/bass.dll
Binary file not shown.
Binary file modified Shared/data/MTA San Andreas/MTA/bassmidi.dll
Binary file not shown.
Binary file modified Shared/data/MTA San Andreas/MTA/bassmix.dll
Binary file not shown.
6 changes: 4 additions & 2 deletions vendor/bass/bass.h
@@ -1,6 +1,6 @@
/*
BASS 2.4 C/C++ header file
Copyright (c) 1999-2019 Un4seen Developments Ltd.
Copyright (c) 1999-2020 Un4seen Developments Ltd.
See the BASS.CHM file for more detailed documentation
*/
Expand Down Expand Up @@ -521,7 +521,7 @@ RETURN : Number of bytes written. Set the BASS_STREAMPROC_END flag to end the st

#define BASS_STREAMPROC_END 0x80000000 // end of user stream flag

// special STREAMPROCs
// Special STREAMPROCs
#define STREAMPROC_DUMMY (STREAMPROC*)0 // "dummy" stream
#define STREAMPROC_PUSH (STREAMPROC*)-1 // push stream
#define STREAMPROC_DEVICE (STREAMPROC*)-2 // device mix stream
Expand Down Expand Up @@ -631,6 +631,7 @@ RETURN : TRUE = continue recording, FALSE = stop */
#define BASS_ATTRIB_BITRATE 12
#define BASS_ATTRIB_BUFFER 13
#define BASS_ATTRIB_GRANULE 14
#define BASS_ATTRIB_USER 15
#define BASS_ATTRIB_MUSIC_AMPLIFY 0x100
#define BASS_ATTRIB_MUSIC_PANSEP 0x101
#define BASS_ATTRIB_MUSIC_PSCALER 0x102
Expand Down Expand Up @@ -1032,6 +1033,7 @@ float BASSDEF(BASS_GetVolume)();

HPLUGIN BASSDEF(BASS_PluginLoad)(const char *file, DWORD flags);
BOOL BASSDEF(BASS_PluginFree)(HPLUGIN handle);
BOOL BASSDEF(BASS_PluginEnable)(HPLUGIN handle, BOOL enable);
const BASS_PLUGININFO *BASSDEF(BASS_PluginGetInfo)(HPLUGIN handle);

BOOL BASSDEF(BASS_Set3DFactors)(float distf, float rollf, float doppf);
Expand Down
44 changes: 26 additions & 18 deletions vendor/bass/bassmix.h
@@ -1,6 +1,6 @@
/*
BASSmix 2.4 C/C++ header file
Copyright (c) 2005-2017 Un4seen Developments Ltd.
Copyright (c) 2005-2020 Un4seen Developments Ltd.
See the BASSMIX.CHM file for more detailed documentation
*/
Expand All @@ -22,7 +22,7 @@ extern "C" {
#define BASSMIXDEF(f) WINAPI f
#endif

// additional BASS_SetConfig option
// Additional BASS_SetConfig options
#define BASS_CONFIG_MIXER_BUFFER 0x10601
#define BASS_CONFIG_MIXER_POSEX 0x10602
#define BASS_CONFIG_SPLIT_BUFFER 0x10610
Expand All @@ -33,45 +33,53 @@ extern "C" {
#define BASS_MIXER_RESUME 0x1000 // resume stalled immediately upon new/unpaused source
#define BASS_MIXER_POSEX 0x2000 // enable BASS_Mixer_ChannelGetPositionEx support

// source flags
#define BASS_MIXER_BUFFER 0x2000 // buffer data for BASS_Mixer_ChannelGetData/Level
#define BASS_MIXER_LIMIT 0x4000 // limit mixer processing to the amount available from this source
#define BASS_MIXER_MATRIX 0x10000 // matrix mixing
#define BASS_MIXER_PAUSE 0x20000 // don't process the source
#define BASS_MIXER_DOWNMIX 0x400000 // downmix to stereo/mono
#define BASS_MIXER_NORAMPIN 0x800000 // don't ramp-in the start

// mixer attributes
// BASS_Mixer_StreamAddChannel/Ex flags
#define BASS_MIXER_CHAN_ABSOLUTE 0x1000 // start is an absolute position
#define BASS_MIXER_CHAN_BUFFER 0x2000 // buffer data for BASS_Mixer_ChannelGetData/Level
#define BASS_MIXER_CHAN_LIMIT 0x4000 // limit mixer processing to the amount available from this source
#define BASS_MIXER_CHAN_MATRIX 0x10000 // matrix mixing
#define BASS_MIXER_CHAN_PAUSE 0x20000 // don't process the source
#define BASS_MIXER_CHAN_DOWNMIX 0x400000 // downmix to stereo/mono
#define BASS_MIXER_CHAN_NORAMPIN 0x800000 // don't ramp-in the start
#define BASS_MIXER_BUFFER BASS_MIXER_CHAN_BUFFER
#define BASS_MIXER_LIMIT BASS_MIXER_CHAN_LIMIT
#define BASS_MIXER_MATRIX BASS_MIXER_CHAN_MATRIX
#define BASS_MIXER_PAUSE BASS_MIXER_CHAN_PAUSE
#define BASS_MIXER_DOWNMIX BASS_MIXER_CHAN_DOWNMIX
#define BASS_MIXER_NORAMPIN BASS_MIXER_CHAN_NORAMPIN

// Mixer attributes
#define BASS_ATTRIB_MIXER_LATENCY 0x15000

// splitter flags
// BASS_Split_StreamCreate flags
#define BASS_SPLIT_SLAVE 0x1000 // only read buffered data
#define BASS_SPLIT_POS 0x2000

// splitter attributes
// Splitter attributes
#define BASS_ATTRIB_SPLIT_ASYNCBUFFER 0x15010
#define BASS_ATTRIB_SPLIT_ASYNCPERIOD 0x15011

// envelope node
// Envelope node
typedef struct {
QWORD pos;
float value;
} BASS_MIXER_NODE;

// envelope types
// Envelope types
#define BASS_MIXER_ENV_FREQ 1
#define BASS_MIXER_ENV_VOL 2
#define BASS_MIXER_ENV_PAN 3
#define BASS_MIXER_ENV_LOOP 0x10000 // flag: loop
#define BASS_MIXER_ENV_REMOVE 0x20000 // flag: remove at end

// additional sync type
// Additional sync types
#define BASS_SYNC_MIXER_ENVELOPE 0x10200
#define BASS_SYNC_MIXER_ENVELOPE_NODE 0x10201

// additional BASS_Mixer_ChannelSetPosition flag
// Additional BASS_Mixer_ChannelSetPosition flag
#define BASS_POS_MIXER_RESET 0x10000 // flag: clear mixer's playback buffer

// BASS_CHANNELINFO type
// BASS_CHANNELINFO types
#define BASS_CTYPE_STREAM_MIXER 0x10800
#define BASS_CTYPE_STREAM_SPLIT 0x10801

Expand Down
Binary file modified vendor/bass/lib/bass.lib
Binary file not shown.

0 comments on commit 2d0c127

Please sign in to comment.