Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-06 14:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix FSB with CELT disabled

Browse Source
This commit is contained in:
bnnm 2018-08-12 23:12:09 +02:00
parent c1e7e3b1f9
commit fa848c2ccd
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/meta/fsb.c
View File

@ -103,7 +103,9 @@ typedef struct {
/* ********************************************************************************** */ /* ********************************************************************************** */
#ifdef VGM_USE_CELT
static layered_layout_data* build_layered_fsb_celt(STREAMFILE *streamFile, fsb_header* fsb, celt_lib_t version); static layered_layout_data* build_layered_fsb_celt(STREAMFILE *streamFile, fsb_header* fsb, celt_lib_t version);
#endif
/* FSB1~4 - from games using FMOD audio middleware */ /* FSB1~4 - from games using FMOD audio middleware */
VGMSTREAM * init_vgmstream_fsb(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_fsb(STREAMFILE *streamFile) {
@ -452,6 +454,7 @@ fail:
return NULL; return NULL;
} }
#ifdef VGM_USE_CELT
static layered_layout_data* build_layered_fsb_celt(STREAMFILE *streamFile, fsb_header* fsb, celt_lib_t version) { static layered_layout_data* build_layered_fsb_celt(STREAMFILE *streamFile, fsb_header* fsb, celt_lib_t version) {
layered_layout_data* data = NULL; layered_layout_data* data = NULL;
STREAMFILE* temp_streamFile = NULL; STREAMFILE* temp_streamFile = NULL;
@ -504,6 +507,7 @@ fail:
free_layout_layered(data); free_layout_layered(data);
return NULL; return NULL;
} }
#endif
/* ****************************************** */ /* ****************************************** */

4
src/meta/fsb5.c
View File

@ -33,7 +33,9 @@ typedef struct {
/* ********************************************************************************** */ /* ********************************************************************************** */
#ifdef VGM_USE_CELT
static layered_layout_data* build_layered_fsb5_celt(STREAMFILE *streamFile, fsb5_header* fsb5, celt_lib_t version); static layered_layout_data* build_layered_fsb5_celt(STREAMFILE *streamFile, fsb5_header* fsb5, celt_lib_t version);
#endif
static layered_layout_data* build_layered_fsb5_atrac9(STREAMFILE *streamFile, fsb5_header* fsb5, off_t configs_offset, size_t configs_size); static layered_layout_data* build_layered_fsb5_atrac9(STREAMFILE *streamFile, fsb5_header* fsb5, off_t configs_offset, size_t configs_size);
/* FSB5 - FMOD Studio multiplatform format */ /* FSB5 - FMOD Studio multiplatform format */
@ -454,6 +456,7 @@ fail:
return NULL; return NULL;
} }
#ifdef VGM_USE_CELT
static layered_layout_data* build_layered_fsb5_celt(STREAMFILE *streamFile, fsb5_header* fsb5, celt_lib_t version) { static layered_layout_data* build_layered_fsb5_celt(STREAMFILE *streamFile, fsb5_header* fsb5, celt_lib_t version) {
layered_layout_data* data = NULL; layered_layout_data* data = NULL;
STREAMFILE* temp_streamFile = NULL; STREAMFILE* temp_streamFile = NULL;
@ -517,6 +520,7 @@ fail:
free_layout_layered(data); free_layout_layered(data);
return NULL; return NULL;
} }
#endif
static layered_layout_data* build_layered_fsb5_atrac9(STREAMFILE *streamFile, fsb5_header* fsb5, off_t configs_offset, size_t configs_size) { static layered_layout_data* build_layered_fsb5_atrac9(STREAMFILE *streamFile, fsb5_header* fsb5, off_t configs_offset, size_t configs_size) {
layered_layout_data* data = NULL; layered_layout_data* data = NULL;