Skip to content

Commit 4d50d5d

Browse files
committed
Update fmod to current v2.2.20, add arm64 Linux version
1 parent 6ed5e0a commit 4d50d5d

File tree

17 files changed

+23
-6
lines changed

17 files changed

+23
-6
lines changed

external/include/fmod-2.2.13/fmod/fmod_common.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ typedef struct FMOD_ASYNCREADINFO FMOD_ASYNCREADINFO;
5656
/*
5757
FMOD constants
5858
*/
59-
#define FMOD_VERSION 0x00020213 /* 0xaaaabbcc -> aaaa = product version, bb = major version, cc = minor version.*/
59+
#define FMOD_VERSION 0x00020220 /* 0xaaaabbcc -> aaaa = product version, bb = major version, cc = minor version.*/
6060

6161
typedef unsigned int FMOD_DEBUG_FLAGS;
6262
#define FMOD_DEBUG_LEVEL_NONE 0x00000000
@@ -439,6 +439,7 @@ typedef enum FMOD_OUTPUTTYPE
439439
FMOD_OUTPUTTYPE_AAUDIO,
440440
FMOD_OUTPUTTYPE_AUDIOWORKLET,
441441
FMOD_OUTPUTTYPE_PHASE,
442+
FMOD_OUTPUTTYPE_OHAUDIO,
442443

443444
FMOD_OUTPUTTYPE_MAX,
444445
FMOD_OUTPUTTYPE_FORCEINT = 65536
@@ -795,6 +796,7 @@ typedef struct FMOD_ADVANCEDSETTINGS
795796
unsigned int randomSeed;
796797
int maxConvolutionThreads;
797798
int maxOpusCodecs;
799+
int maxSpatialObjects;
798800
} FMOD_ADVANCEDSETTINGS;
799801

800802
typedef struct FMOD_TAG

external/include/fmod-2.2.13/fmod/fmod_errors.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static const char *FMOD_ErrorString(FMOD_RESULT errcode)
4949
case FMOD_ERR_HTTP_TIMEOUT: return "The HTTP request timed out.";
5050
case FMOD_ERR_INITIALIZATION: return "FMOD was not initialized correctly to support this function.";
5151
case FMOD_ERR_INITIALIZED: return "Cannot call this command after System::init.";
52-
case FMOD_ERR_INTERNAL: return "An error occurred that wasn't supposed to. Contact support.";
52+
case FMOD_ERR_INTERNAL: return "An error occured in the FMOD system. Use the logging version of FMOD for more information.";
5353
case FMOD_ERR_INVALID_FLOAT: return "Value passed in was a NaN, Inf or denormalized float.";
5454
case FMOD_ERR_INVALID_HANDLE: return "An invalid object handle was used.";
5555
case FMOD_ERR_INVALID_PARAM: return "An invalid parameter was passed to this function.";
@@ -87,7 +87,7 @@ static const char *FMOD_ErrorString(FMOD_RESULT errcode)
8787
case FMOD_ERR_TAGNOTFOUND: return "The specified tag could not be found or there are no tags.";
8888
case FMOD_ERR_TOOMANYCHANNELS: return "The sound created exceeds the allowable input channel count. This can be increased using the 'maxinputchannels' parameter in System::setSoftwareFormat.";
8989
case FMOD_ERR_TRUNCATED: return "The retrieved string is too long to fit in the supplied buffer and has been truncated.";
90-
case FMOD_ERR_UNIMPLEMENTED: return "Something in FMOD hasn't been implemented when it should be! contact support!";
90+
case FMOD_ERR_UNIMPLEMENTED: return "Something in FMOD hasn't been implemented when it should be. Contact support.";
9191
case FMOD_ERR_UNINITIALIZED: return "This command failed because System::init or System::setDriver was not called.";
9292
case FMOD_ERR_UNSUPPORTED: return "A command issued was not supported by this object. Possibly a plugin without certain callbacks specified.";
9393
case FMOD_ERR_VERSION: return "The version number of this file format is not supported.";

external/lib/linux/arm64/libfmod.so

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libfmod.so.13.20
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libfmod.so.13.20
1.2 MB
Binary file not shown.

external/lib/linux/arm64/meson.build

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
cp = find_program('cp')
2+
fmod_so = files('libfmod.so.13.20', 'libfmod.so.13', 'libfmod.so')
3+
if get_option('install_fmod')
4+
install_data(fmod_so, install_dir:get_option('fmod_dir'), install_mode:'rwxr-xr-x')
5+
endif
6+
7+
fmod = compiler.find_library('fmod', dirs: meson.current_source_dir())
8+
9+
deps += fmod

external/lib/linux/meson.build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
subdir('x86_64')
1+
if host_machine.cpu_family() == 'aarch64'
2+
subdir('arm64')
3+
elif host_machine.cpu_family() == 'x86_64'
4+
subdir('x86_64')
5+
endif

external/lib/linux/x86_64/libfmod.so

-1.59 MB
Binary file not shown.

external/lib/linux/x86_64/libfmod.so

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libfmod.so.13.20
-1.59 MB
Binary file not shown.

0 commit comments

Comments
 (0)