zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-04-22 07:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed some endian related bugs in fluid_defsfont.c which were introduced when the real glib.h was included.

Browse source 
Some changes of "sound font" to SoundFont in fluid_defsfont.c.
Added FLUID_IS_BIG_ENDIAN macro to fluid_sys.h.
This commit is contained in:
Josh Green 2009-10-13 03:41:19 +00:00
parent e86df648a9
commit 220337916e
2 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
fluidsynth/src/fluid_defsfont.c
View file

@ -1667,66 +1667,74 @@ fluid_sample_import_sfont(fluid_sample_t* sample, SFSample* sfsample, fluid_defs
equivalent to the matching ID list in memory regardless of LE/BE machine
*/
#ifdef WORDS_BIGENDIAN
#if FLUID_IS_BIG_ENDIAN
#define READCHUNK(var,fd) G_STMT_START { \
if (!safe_fread(var, 8, fd)) \
return(FAIL); \
((SFChunk *)(var))->size = GUINT32_FROM_BE(((SFChunk *)(var))->size); \
return(FAIL); \
((SFChunk *)(var))->size = GUINT32_FROM_LE(((SFChunk *)(var))->size); \
} G_STMT_END
#define READD(var,fd) G_STMT_START { \
unsigned int _temp; \
if (!safe_fread(&_temp, 4, fd)) \
return(FAIL); \
var = GINT32_FROM_LE(_temp); \
} G_STMT_END
#define READW(var,fd) G_STMT_START { \
unsigned short _temp; \
if (!safe_fread(&_temp, 2, fd)) \
return(FAIL); \
var = GINT16_FROM_LE(_temp); \
} G_STMT_END
#else
#define READCHUNK(var,fd) G_STMT_START { \
if (!safe_fread(var, 8, fd)) \
return(FAIL); \
((SFChunk *)(var))->size = GUINT32_FROM_LE(((SFChunk *)(var))->size); \
} G_STMT_END
#endif
#define READID(var,fd) G_STMT_START { \
if (!safe_fread(var, 4, fd)) \
return(FAIL); \
} G_STMT_END
#define READSTR(var,fd) G_STMT_START { \
if (!safe_fread(var, 20, fd)) \
return(FAIL); \
(*var)[20] = '\0'; \
} G_STMT_END
#ifdef WORDS_BIGENDIAN
#define READD(var,fd) G_STMT_START { \
unsigned int _temp; \
if (!safe_fread(&_temp, 4, fd)) \
return(FAIL); \
var = GINT32_FROM_BE(_temp); \
} G_STMT_END
#else
#define READD(var,fd) G_STMT_START { \
unsigned int _temp; \
if (!safe_fread(&_temp, 4, fd)) \
return(FAIL); \
var = GINT32_FROM_LE(_temp); \
} G_STMT_END
#endif
#ifdef WORDS_BIGENDIAN
#define READW(var,fd) G_STMT_START { \
unsigned short _temp; \
if (!safe_fread(&_temp, 2, fd)) \
return(FAIL); \
var = GINT16_FROM_BE(_temp); \
} G_STMT_END
#else
#define READW(var,fd) G_STMT_START { \
unsigned short _temp; \
if (!safe_fread(&_temp, 2, fd)) \
return(FAIL); \
var = GINT16_FROM_LE(_temp); \
} G_STMT_END
#endif
#define READID(var,fd) G_STMT_START { \
if (!safe_fread(var, 4, fd)) \
return(FAIL); \
} G_STMT_END
#define READSTR(var,fd) G_STMT_START { \
if (!safe_fread(var, 20, fd)) \
return(FAIL); \
(*var)[20] = '\0'; \
} G_STMT_END
#define READB(var,fd) G_STMT_START { \
if (!safe_fread(&var, 1, fd)) \
return(FAIL); \
} G_STMT_END
#define FSKIP(size,fd) G_STMT_START { \
if (!safe_fseek(fd, size, SEEK_CUR)) \
return(FAIL); \
} G_STMT_END
#define FSKIPW(fd) G_STMT_START { \
if (!safe_fseek(fd, 2, SEEK_CUR)) \
return(FAIL); \
@ -1850,12 +1858,12 @@ load_body (unsigned int size, SFData * sf, FILE * fd)
READID (&chunk.id, fd); /* load file ID */
if (chunkid (chunk.id) != SFBK_ID) { /* error if not SFBK_ID */
FLUID_LOG (FLUID_ERR, _("Not a sound font file"));
FLUID_LOG (FLUID_ERR, _("Not a SoundFont file"));
return (FAIL);
}
if (chunk.size != size - 8) {
gerr (ErrCorr, _("Sound font file size mismatch"));
gerr (ErrCorr, _("SoundFont file size mismatch"));
return (FAIL);
}

1
fluidsynth/src/fluid_sys.h
View file

@ -65,6 +65,7 @@ void fluid_time_config(void);
#define FLUID_INT_TO_POINTER GINT_TO_POINTER
#define FLUID_N_ELEMENTS(struct) (sizeof (struct) / sizeof (struct[0]))
#define FLUID_IS_BIG_ENDIAN (G_BYTE_ORDER == G_BIG_ENDIAN)
/*
* Utility functions