zdoom
/
fluidsynth
mirror of https://github.com/ZDoom/fluidsynth.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

continue file callback implementation

This commit is contained in:
derselbst 2017-11-25 21:43:13 +01:00
parent 09c084e776
commit d02eaf6585
4 changed files with 91 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/fluidsynth/sfont.h
View File

@ -78,7 +78,7 @@ struct _fluid_sfloader_t {
void* data; /**< User defined data pointer */ void* data; /**< User defined data pointer */
/** File operation callbacks to allow custom loading, such as from memory */ /** File operation callbacks to allow custom loading, such as from memory */
fluid_file_callbacks_t* file_callbacks; const fluid_file_callbacks_t* file_callbacks;
/** /**
* The free method should free the memory allocated for the loader in * The free method should free the memory allocated for the loader in
@ -99,16 +99,21 @@ struct _fluid_sfloader_t {
}; };
struct _fluid_file_callbacks_t { struct _fluid_file_callbacks_t {
/** Accepts UTF-8 encoding, returns file handle */ /**
void * (* fopen )(const char *); * Opens the file indicated by \c path in binary read mode.
* Accepts UTF-8 encoding
*
* @return returns a file handle on success, NULL otherwise
*/
void * (* fopen )(const char * path);
/** Reads to specified buffer, returns count of size bytes read */ /** Reads to specified buffer, returns count of size bytes read */
size_t (* fread )(void *, size_t size, size_t count, void * handle); int (* fread )(void *, int count, void * handle);
/** Returns zero on success, -1 on error */ /** Returns zero on success, #FLUID_FAILED on error */
int (* fseek )(void * handle, long, int); int (* fseek )(void * handle, long, int);
/** Returns zero on success, -1 on error */ /** Returns zero on success, #FLUID_FAILED on error */
int (* fclose)(void * handle); int (* fclose)(void * handle);
/** Returns current file offset */ /** Returns current file offset */

164
src/sfloader/fluid_defsfont.c
View File

@ -35,38 +35,48 @@
* SFONT LOADER * SFONT LOADER
*/ */
void * default_fopen(const char * path) static void * default_fopen(const char * path)
{ {
return fopen(path, "rb"); return FLUID_FOPEN(path, "rb");
} }
size_t default_fread(void * buffer, size_t size, size_t count, void * handle) static int default_fclose(void * handle)
{ {
return fread(buffer, size, count, (FILE *)handle); return FLUID_FCLOSE((FILE *)handle);
} }
int default_fseek(void * handle, long offset, int whence) static long default_ftell(void * handle)
{ {
return fseek((FILE *)handle, offset, whence); return FLUID_FTELL((FILE *)handle);
} }
int default_fclose(void * handle) static int safe_fread (void *buf, int count, void * fd)
{ {
fclose((FILE *)handle); if (FLUID_FREAD(buf, count, 1, (FILE *)fd) != 1)
{
return 0; if (feof ((FILE *)fd))
gerr (ErrEof, _("EOF while attemping to read %d bytes"), count);
else
FLUID_LOG (FLUID_ERR, _("File read failed"));
return (FAIL);
}
return (OK);
} }
long default_ftell(void * handle) static int safe_fseek (void * fd, long ofs, int whence)
{ {
return ftell((FILE *)handle); if (FLUID_FSEEK((FILE *)fd, ofs, whence) == -1) {
FLUID_LOG (FLUID_ERR, _("File seek failed with offset = %ld and whence = %d"), ofs, whence);
return (FAIL);
}
return (OK);
} }
static fluid_file_callbacks_t def_file_callbacks = static const fluid_file_callbacks_t def_file_callbacks =
{ {
default_fopen, default_fopen,
default_fread, safe_fread,
default_fseek, safe_fseek,
default_fclose, default_fclose,
default_ftell default_ftell
}; };
@ -280,7 +290,7 @@ static int fluid_get_file_modification_time(char *filename, time_t *modification
} }
static int fluid_cached_sampledata_load(char *filename, unsigned int samplepos, static int fluid_cached_sampledata_load(char *filename, unsigned int samplepos,
unsigned int samplesize, short **sampledata, int try_mlock) unsigned int samplesize, short **sampledata, int try_mlock, const fluid_file_callbacks_t* fcbs)
{ {
fluid_file fd = NULL; fluid_file fd = NULL;
short *loaded_sampledata = NULL; short *loaded_sampledata = NULL;
@ -317,12 +327,12 @@ static int fluid_cached_sampledata_load(char *filename, unsigned int samplepos,
goto success_exit; goto success_exit;
} }
fd = FLUID_FOPEN(filename, "rb"); fd = fcbs->fopen(filename);
if (fd == NULL) { if (fd == NULL) {
FLUID_LOG(FLUID_ERR, "Can't open soundfont file"); FLUID_LOG(FLUID_ERR, "Can't open soundfont file");
goto error_exit; goto error_exit;
} }
if (FLUID_FSEEK(fd, samplepos, SEEK_SET) == -1) { if (fcbs->fseek(fd, samplepos, SEEK_SET) == -1) {
perror("error"); perror("error");
FLUID_LOG(FLUID_ERR, "Failed to seek position in data file"); FLUID_LOG(FLUID_ERR, "Failed to seek position in data file");
goto error_exit; goto error_exit;
@ -334,12 +344,12 @@ static int fluid_cached_sampledata_load(char *filename, unsigned int samplepos,
FLUID_LOG(FLUID_ERR, "Out of memory"); FLUID_LOG(FLUID_ERR, "Out of memory");
goto error_exit; goto error_exit;
} }
if (FLUID_FREAD(loaded_sampledata, 1, samplesize, fd) < samplesize) { if (fcbs->fread(loaded_sampledata, samplesize, fd) != FLUID_OK) {
FLUID_LOG(FLUID_ERR, "Failed to read sample data"); FLUID_LOG(FLUID_ERR, "Failed to read sample data");
goto error_exit; goto error_exit;
} }
FLUID_FCLOSE(fd); fcbs->fclose(fd);
fd = NULL; fd = NULL;
@ -397,7 +407,7 @@ static int fluid_cached_sampledata_load(char *filename, unsigned int samplepos,
error_exit: error_exit:
if (fd != NULL) { if (fd != NULL) {
FLUID_FCLOSE(fd); fcbs->fclose(fd);
} }
if (loaded_sampledata != NULL) { if (loaded_sampledata != NULL) {
FLUID_FREE(loaded_sampledata); FLUID_FREE(loaded_sampledata);
@ -580,7 +590,7 @@ const char* fluid_defsfont_get_name(fluid_defsfont_t* sfont)
/* /*
* fluid_defsfont_load * fluid_defsfont_load
*/ */
int fluid_defsfont_load(fluid_defsfont_t* sfont, fluid_file_callbacks_t* fcbs, const char* file) int fluid_defsfont_load(fluid_defsfont_t* sfont, const fluid_file_callbacks_t* fcbs, const char* file)
{ {
SFData* sfdata; SFData* sfdata;
fluid_list_t *p; fluid_list_t *p;
@ -703,10 +713,10 @@ int fluid_defsfont_add_preset(fluid_defsfont_t* sfont, fluid_defpreset_t* preset
* fluid_defsfont_load_sampledata * fluid_defsfont_load_sampledata
*/ */
int int
fluid_defsfont_load_sampledata(fluid_defsfont_t* sfont, fluid_file_callbacks_t* fcbs) fluid_defsfont_load_sampledata(fluid_defsfont_t* sfont, const fluid_file_callbacks_t* fcbs)
{ {
return fluid_cached_sampledata_load(sfont->filename, sfont->samplepos, return fluid_cached_sampledata_load(sfont->filename, sfont->samplepos,
sfont->samplesize, &sfont->sampledata, sfont->mlock); sfont->samplesize, &sfont->sampledata, sfont->mlock, fcbs);
} }
/* /*
@ -2059,48 +2069,48 @@ fluid_sample_import_sfont(fluid_sample_t* sample, SFSample* sfsample, fluid_defs
*/ */
#define READCHUNK(var,fd, fcbs) do { \ #define READCHUNK(var,fd, fcbs) do { \
if (!safe_fread(var, 8, fd, fcbs)) \ if (!fcbs->fread(var, 8, fd)) \
return(FAIL); \ return(FAIL); \
((SFChunk *)(var))->size = FLUID_LE32TOH(((SFChunk *)(var))->size); \ ((SFChunk *)(var))->size = FLUID_LE32TOH(((SFChunk *)(var))->size); \
} while(0) } while(0)
#define READD(var,fd, fcbs) do { \ #define READD(var,fd, fcbs) do { \
uint32_t _temp; \ uint32_t _temp; \
if (!safe_fread(&_temp, 4, fd, fcbs)) \ if (!fcbs->fread(&_temp, 4, fd)) \
return(FAIL); \ return(FAIL); \
var = FLUID_LE32TOH(_temp); \ var = FLUID_LE32TOH(_temp); \
} while(0) } while(0)
#define READW(var,fd, fcbs) do { \ #define READW(var,fd, fcbs) do { \
uint16_t _temp; \ uint16_t _temp; \
if (!safe_fread(&_temp, 2, fd, fcbs)) \ if (!fcbs->fread(&_temp, 2, fd)) \
return(FAIL); \ return(FAIL); \
var = FLUID_LE16TOH(_temp); \ var = FLUID_LE16TOH(_temp); \
} while(0) } while(0)
#define READID(var,fd, fcbs) do { \ #define READID(var,fd, fcbs) do { \
if (!safe_fread(var, 4, fd, fcbs)) \ if (!fcbs->fread(var, 4, fd)) \
return(FAIL); \ return(FAIL); \
} while(0) } while(0)
#define READSTR(var,fd, fcbs) do { \ #define READSTR(var,fd, fcbs) do { \
if (!safe_fread(var, 20, fd, fcbs)) \ if (!fcbs->fread(var, 20, fd)) \
return(FAIL); \ return(FAIL); \
(*var)[20] = '\0'; \ (*var)[20] = '\0'; \
} while(0) } while(0)
#define READB(var,fd, fcbs) do { \ #define READB(var,fd, fcbs) do { \
if (!safe_fread(&var, 1, fd, fcbs)) \ if (!fcbs->fread(&var, 1, fd)) \
return(FAIL); \ return(FAIL); \
} while(0) } while(0)
#define FSKIP(size,fd, fcbs) do { \ #define FSKIP(size,fd, fcbs) do { \
if (!safe_fseek(fd, size, SEEK_CUR, fcbs)) \ if (!fcbs->fseek(fd, size, SEEK_CUR)) \
return(FAIL); \ return(FAIL); \
} while(0) } while(0)
#define FSKIPW(fd, fcbs) do { \ #define FSKIPW(fd, fcbs) do { \
if (!safe_fseek(fd, 2, SEEK_CUR, fcbs)) \ if (!fcbs->fseek(fd, 2, SEEK_CUR)) \
return(FAIL); \ return(FAIL); \
} while(0) } while(0)
@ -2113,22 +2123,22 @@ fluid_sample_import_sfont(fluid_sample_t* sample, SFSample* sfsample, fluid_defs
} while(0) } while(0)
static int chunkid (unsigned int id); static int chunkid (unsigned int id);
static int load_body (unsigned int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int load_body (unsigned int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int read_listchunk (SFChunk * chunk, void * fd, fluid_file_callbacks_t* fcbs); static int read_listchunk (SFChunk * chunk, void * fd, const fluid_file_callbacks_t* fcbs);
static int process_info (int size, SFData * sf, void* fd, fluid_file_callbacks_t* fcbs); static int process_info (int size, SFData * sf, void* fd, const fluid_file_callbacks_t* fcbs);
static int process_sdta (unsigned int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int process_sdta (unsigned int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int pdtahelper (unsigned int expid, unsigned int reclen, SFChunk * chunk, static int pdtahelper (unsigned int expid, unsigned int reclen, SFChunk * chunk,
int * size, void * fd, fluid_file_callbacks_t* fcbs); int * size, void * fd, const fluid_file_callbacks_t* fcbs);
static int process_pdta (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int process_pdta (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int load_phdr (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int load_phdr (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int load_pbag (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int load_pbag (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int load_pmod (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int load_pmod (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int load_pgen (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int load_pgen (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int load_ihdr (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int load_ihdr (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int load_ibag (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int load_ibag (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int load_imod (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int load_imod (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int load_igen (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int load_igen (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int load_shdr (unsigned int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs); static int load_shdr (unsigned int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs);
static int fixup_pgen (SFData * sf); static int fixup_pgen (SFData * sf);
static int fixup_igen (SFData * sf); static int fixup_igen (SFData * sf);
static int fixup_sample (SFData * sf); static int fixup_sample (SFData * sf);
@ -2156,7 +2166,7 @@ chunkid (unsigned int id)
} }
SFData * SFData *
sfload_file (const char * fname, fluid_file_callbacks_t* fcbs) sfload_file (const char * fname, const fluid_file_callbacks_t* fcbs)
{ {
SFData *sf = NULL; SFData *sf = NULL;
void *fd; void *fd;
@ -2211,7 +2221,7 @@ sfload_file (const char * fname, fluid_file_callbacks_t* fcbs)
} }
static int static int
load_body (unsigned int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) load_body (unsigned int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
SFChunk chunk; SFChunk chunk;
@ -2272,7 +2282,7 @@ load_body (unsigned int size, SFData * sf, void * fd, fluid_file_callbacks_t* fc
} }
static int static int
read_listchunk (SFChunk * chunk, void * fd, fluid_file_callbacks_t* fcbs) read_listchunk (SFChunk * chunk, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
READCHUNK (chunk, fd, fcbs); /* read list chunk */ READCHUNK (chunk, fd, fcbs); /* read list chunk */
if (chunkid (chunk->id) != LIST_ID) /* error if ! list chunk */ if (chunkid (chunk->id) != LIST_ID) /* error if ! list chunk */
@ -2283,7 +2293,7 @@ read_listchunk (SFChunk * chunk, void * fd, fluid_file_callbacks_t* fcbs)
} }
static int static int
process_info (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) process_info (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
SFChunk chunk; SFChunk chunk;
unsigned char id; unsigned char id;
@ -2366,7 +2376,7 @@ process_info (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
sf->info = fluid_list_append (sf->info, item); sf->info = fluid_list_append (sf->info, item);
*(unsigned char *) item = id; *(unsigned char *) item = id;
if (!safe_fread (&item[1], chunk.size, fd, fcbs)) if (!fcbs->fread(&item[1], chunk.size, fd))
return (FAIL); return (FAIL);
/* force terminate info item (don't forget uint8 info ID) */ /* force terminate info item (don't forget uint8 info ID) */
@ -2384,7 +2394,7 @@ process_info (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
} }
static int static int
process_sdta (unsigned int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) process_sdta (unsigned int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
SFChunk chunk; SFChunk chunk;
@ -2419,7 +2429,7 @@ process_sdta (unsigned int size, SFData * sf, void * fd, fluid_file_callbacks_t*
static int static int
pdtahelper (unsigned int expid, unsigned int reclen, SFChunk * chunk, pdtahelper (unsigned int expid, unsigned int reclen, SFChunk * chunk,
int * size, void * fd, fluid_file_callbacks_t* fcbs) int * size, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
unsigned int id; unsigned int id;
const char *expstr; const char *expstr;
@ -2444,7 +2454,7 @@ pdtahelper (unsigned int expid, unsigned int reclen, SFChunk * chunk,
} }
static int static int
process_pdta (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) process_pdta (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
SFChunk chunk; SFChunk chunk;
@ -2498,7 +2508,7 @@ process_pdta (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
/* preset header loader */ /* preset header loader */
static int static int
load_phdr (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) load_phdr (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
int i, i2; int i, i2;
SFPreset *p, *pr = NULL; /* ptr to current & previous preset */ SFPreset *p, *pr = NULL; /* ptr to current & previous preset */
@ -2561,7 +2571,7 @@ load_phdr (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
/* preset bag loader */ /* preset bag loader */
static int static int
load_pbag (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) load_pbag (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
fluid_list_t *p, *p2; fluid_list_t *p, *p2;
SFZone *z, *pz = NULL; SFZone *z, *pz = NULL;
@ -2643,7 +2653,7 @@ load_pbag (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
/* preset modulator loader */ /* preset modulator loader */
static int static int
load_pmod (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) load_pmod (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
fluid_list_t *p, *p2, *p3; fluid_list_t *p, *p2, *p3;
SFMod *m; SFMod *m;
@ -2702,7 +2712,7 @@ load_pmod (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
* if a duplicate generator exists replace previous one * if a duplicate generator exists replace previous one
* ------------------------------------------------------------------- */ * ------------------------------------------------------------------- */
static int static int
load_pgen (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) load_pgen (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
fluid_list_t *p, *p2, *p3, *dup, **hz = NULL; fluid_list_t *p, *p2, *p3, *dup, **hz = NULL;
SFZone *z; SFZone *z;
@ -2867,7 +2877,7 @@ load_pgen (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
/* instrument header loader */ /* instrument header loader */
static int static int
load_ihdr (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) load_ihdr (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
int i, i2; int i, i2;
SFInst *p, *pr = NULL; /* ptr to current & previous instrument */ SFInst *p, *pr = NULL; /* ptr to current & previous instrument */
@ -2922,7 +2932,7 @@ load_ihdr (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
/* instrument bag loader */ /* instrument bag loader */
static int static int
load_ibag (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) load_ibag (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
fluid_list_t *p, *p2; fluid_list_t *p, *p2;
SFZone *z, *pz = NULL; SFZone *z, *pz = NULL;
@ -3005,7 +3015,7 @@ load_ibag (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
/* instrument modulator loader */ /* instrument modulator loader */
static int static int
load_imod (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) load_imod (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
fluid_list_t *p, *p2, *p3; fluid_list_t *p, *p2, *p3;
SFMod *m; SFMod *m;
@ -3053,7 +3063,7 @@ load_imod (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
/* load instrument generators (see load_pgen for loading rules) */ /* load instrument generators (see load_pgen for loading rules) */
static int static int
load_igen (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) load_igen (int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
fluid_list_t *p, *p2, *p3, *dup, **hz = NULL; fluid_list_t *p, *p2, *p3, *dup, **hz = NULL;
SFZone *z; SFZone *z;
@ -3217,7 +3227,7 @@ load_igen (int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs)
/* sample header loader */ /* sample header loader */
static int static int
load_shdr (unsigned int size, SFData * sf, void * fd, fluid_file_callbacks_t* fcbs) load_shdr (unsigned int size, SFData * sf, void * fd, const fluid_file_callbacks_t* fcbs)
{ {
unsigned int i; unsigned int i;
SFSample *p; SFSample *p;
@ -3445,7 +3455,7 @@ static const unsigned short badpgen[] = {
/* close SoundFont file and delete a SoundFont structure */ /* close SoundFont file and delete a SoundFont structure */
void void
sfont_close (SFData * sf, fluid_file_callbacks_t* fcbs) sfont_close (SFData * sf, const fluid_file_callbacks_t* fcbs)
{ {
fluid_list_t *p, *p2; fluid_list_t *p, *p2;
@ -3618,27 +3628,3 @@ gerr (int ev, char * fmt, ...)
return (FAIL); return (FAIL);
} }
int
safe_fread (void *buf, int count, void * fd, fluid_file_callbacks_t* fcbs)
{
if (fcbs->fread (buf, count, 1, fd) != 1)
{ /* size_t = count, nmemb = 1 */
if (feof (fd))
gerr (ErrEof, _("EOF while attemping to read %d bytes"), count);
else
FLUID_LOG (FLUID_ERR, _("File read failed"));
return (FAIL);
}
return (OK);
}
int
safe_fseek (void * fd, long ofs, int whence, fluid_file_callbacks_t* fcbs)
{
if (fcbs->fseek (fd, ofs, whence) == -1) {
FLUID_LOG (FLUID_ERR, _("File seek failed with offset = %ld and whence = %d"), ofs, whence);
return (FAIL);
}
return (OK);
}

11
src/sfloader/fluid_defsfont.h
View File

@ -215,7 +215,7 @@ Gen_Unit;
/* functions */ /* functions */
void sfont_init_chunks (void); void sfont_init_chunks (void);
void sfont_close (SFData * sf, fluid_file_callbacks_t* cbs); void sfont_close (SFData * sf, const fluid_file_callbacks_t* fcbs);
void sfont_free_zone (SFZone * zone); void sfont_free_zone (SFZone * zone);
int sfont_preset_compare_func (void* a, void* b); int sfont_preset_compare_func (void* a, void* b);
@ -291,7 +291,7 @@ typedef struct _SFShdr
SFShdr; SFShdr;
/* functions */ /* functions */
SFData *sfload_file (const char * fname, fluid_file_callbacks_t* cbs); SFData *sfload_file (const char * fname, const fluid_file_callbacks_t* fcbs);
@ -319,9 +319,6 @@ enum
#define ErrnoEnd ErrWrite #define ErrnoEnd ErrWrite
int gerr (int ev, char * fmt, ...); int gerr (int ev, char * fmt, ...);
int safe_fread (void *buf, int count, void * fd, fluid_file_callbacks_t* fcbs);
int safe_fwrite (void *buf, int count, void * fd, fluid_file_callbacks_t* fcbs);
int safe_fseek (void * fd, long ofs, int whence, fluid_file_callbacks_t* fcbs);
/********************************************************************************/ /********************************************************************************/
@ -391,12 +388,12 @@ struct _fluid_defsfont_t
fluid_defsfont_t* new_fluid_defsfont(fluid_settings_t* settings); fluid_defsfont_t* new_fluid_defsfont(fluid_settings_t* settings);
int delete_fluid_defsfont(fluid_defsfont_t* sfont); int delete_fluid_defsfont(fluid_defsfont_t* sfont);
int fluid_defsfont_load(fluid_defsfont_t* sfont, fluid_file_callbacks_t* file_callbacks, const char* file); int fluid_defsfont_load(fluid_defsfont_t* sfont, const fluid_file_callbacks_t* file_callbacks, const char* file);
const char* fluid_defsfont_get_name(fluid_defsfont_t* sfont); const char* fluid_defsfont_get_name(fluid_defsfont_t* sfont);
fluid_defpreset_t* fluid_defsfont_get_preset(fluid_defsfont_t* sfont, unsigned int bank, unsigned int prenum); fluid_defpreset_t* fluid_defsfont_get_preset(fluid_defsfont_t* sfont, unsigned int bank, unsigned int prenum);
void fluid_defsfont_iteration_start(fluid_defsfont_t* sfont); void fluid_defsfont_iteration_start(fluid_defsfont_t* sfont);
int fluid_defsfont_iteration_next(fluid_defsfont_t* sfont, fluid_preset_t* preset); int fluid_defsfont_iteration_next(fluid_defsfont_t* sfont, fluid_preset_t* preset);
int fluid_defsfont_load_sampledata(fluid_defsfont_t* sfont, fluid_file_callbacks_t* file_callbacks); int fluid_defsfont_load_sampledata(fluid_defsfont_t* sfont, const fluid_file_callbacks_t* file_callbacks);
int fluid_defsfont_add_sample(fluid_defsfont_t* sfont, fluid_sample_t* sample); int fluid_defsfont_add_sample(fluid_defsfont_t* sfont, fluid_sample_t* sample);
int fluid_defsfont_add_preset(fluid_defsfont_t* sfont, fluid_defpreset_t* preset); int fluid_defsfont_add_preset(fluid_defsfont_t* sfont, fluid_defpreset_t* preset);

1
src/utils/fluidsynth_priv.h
View File

@ -232,6 +232,7 @@ typedef FILE* fluid_file;
#define FLUID_FCLOSE(_f) fclose(_f) #define FLUID_FCLOSE(_f) fclose(_f)
#define FLUID_FREAD(_p,_s,_n,_f) fread(_p,_s,_n,_f) #define FLUID_FREAD(_p,_s,_n,_f) fread(_p,_s,_n,_f)
#define FLUID_FSEEK(_f,_n,_set) fseek(_f,_n,_set) #define FLUID_FSEEK(_f,_n,_set) fseek(_f,_n,_set)
#define FLUID_FTELL(_f) ftell(_f)
#define FLUID_MEMCPY(_dst,_src,_n) memcpy(_dst,_src,_n) #define FLUID_MEMCPY(_dst,_src,_n) memcpy(_dst,_src,_n)
#define FLUID_MEMSET(_s,_c,_n) memset(_s,_c,_n) #define FLUID_MEMSET(_s,_c,_n) memset(_s,_c,_n)
#define FLUID_STRLEN(_s) strlen(_s) #define FLUID_STRLEN(_s) strlen(_s)