zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 14:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update libxmp-lite

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8132 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-09-20 06:41:07 +00:00 committed by Christoph Oelckers
parent 225be48aca
commit 8de955053c
30 changed files with 257 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
GNUmakefile
View file

@ -75,6 +75,7 @@ libxmplite_objs := \
s3m_load.c \ s3m_load.c \
sample.c \ sample.c \
xm_load.c \ xm_load.c \
win32.c \
libxmplite_root := $(source)/$(libxmplite) libxmplite_root := $(source)/$(libxmplite)
libxmplite_src := $(libxmplite_root)/src libxmplite_src := $(libxmplite_root)/src

1
platform/Windows/libxmp-lite.vcxproj
View file

@ -66,6 +66,7 @@
<ClCompile Include="..\..\source\libxmp-lite\src\scan.c" /> <ClCompile Include="..\..\source\libxmp-lite\src\scan.c" />
<ClCompile Include="..\..\source\libxmp-lite\src\smix.c" /> <ClCompile Include="..\..\source\libxmp-lite\src\smix.c" />
<ClCompile Include="..\..\source\libxmp-lite\src\virtual.c" /> <ClCompile Include="..\..\source\libxmp-lite\src\virtual.c" />
<ClCompile Include="..\..\source\libxmp-lite\src\win32.c" />
<ClCompile Include="..\..\source\libxmp-lite\src\xm_load.c" /> <ClCompile Include="..\..\source\libxmp-lite\src\xm_load.c" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">

1
platform/Windows/libxmp-lite.vcxproj.filters
View file

@ -149,5 +149,6 @@
<ClCompile Include="..\..\source\libxmp-lite\src\xm_load.c"> <ClCompile Include="..\..\source\libxmp-lite\src\xm_load.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\libxmp-lite\src\win32.c" />
</ItemGroup> </ItemGroup>
</Project> </Project>

101
source/libxmp-lite/include/libxmp-lite/xmp.h
View file

@ -5,30 +5,30 @@
extern "C" { extern "C" {
#endif #endif
#define XMP_VERSION "4.4.2" #define XMP_VERSION "4.5.0"
#define XMP_VERCODE 0x040402 #define XMP_VERCODE 0x040500
#define XMP_VER_MAJOR 4 #define XMP_VER_MAJOR 4
#define XMP_VER_MINOR 4 #define XMP_VER_MINOR 5
#define XMP_VER_RELEASE 2 #define XMP_VER_RELEASE 0
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
# if defined(BUILDING_STATIC) # if defined(BUILDING_STATIC)
# define EXPORT # define LIBXMP_EXPORT
# elif defined(BUILDING_DLL) # elif defined(BUILDING_DLL)
# define EXPORT __declspec(dllexport) # define LIBXMP_EXPORT __declspec(dllexport)
# else # else
# define EXPORT __declspec(dllimport) # define LIBXMP_EXPORT __declspec(dllimport)
# endif # endif
#elif defined(__OS2__) && defined(__WATCOMC__) && defined(__SW_BD) #elif defined(__OS2__) && defined(__WATCOMC__) && defined(__SW_BD)
# define EXPORT __declspec(dllexport) # define LIBXMP_EXPORT __declspec(dllexport)
#elif (defined(__GNUC__) || defined(__clang__) || defined(__HP_cc)) && defined(XMP_SYM_VISIBILITY) #elif (defined(__GNUC__) || defined(__clang__) || defined(__HP_cc)) && defined(XMP_SYM_VISIBILITY)
# define EXPORT __attribute__((visibility ("default"))) # define LIBXMP_EXPORT __attribute__((visibility ("default")))
#elif defined(__SUNPRO_C) && defined(XMP_LDSCOPE_GLOBAL) #elif defined(__SUNPRO_C) && defined(XMP_LDSCOPE_GLOBAL)
# define EXPORT __global # define LIBXMP_EXPORT __global
#elif defined(EMSCRIPTEN) #elif defined(EMSCRIPTEN)
# define EXPORT EMSCRIPTEN_KEEPALIVE # define LIBXMP_EXPORT EMSCRIPTEN_KEEPALIVE
#else #else
# define EXPORT # define LIBXMP_EXPORT
#endif #endif
#define XMP_NAME_SIZE 64 /* Size of module name and type */ #define XMP_NAME_SIZE 64 /* Size of module name and type */
@ -201,6 +201,7 @@ struct xmp_subinstrument {
int ifr; /* Initial filter resonance */ int ifr; /* Initial filter resonance */
}; };
struct xmp_instrument { struct xmp_instrument {
char name[32]; /* Instrument name */ char name[32]; /* Instrument name */
int vol; /* Instrument volume */ int vol; /* Instrument volume */
@ -291,6 +292,7 @@ struct xmp_channel_info { /* Current channel information */
struct xmp_event event; /* Current track event */ struct xmp_event event; /* Current track event */
}; };
struct xmp_frame_info { /* Current frame information */ struct xmp_frame_info { /* Current frame information */
int pos; /* Current position */ int pos; /* Current position */
int pattern; /* Current pattern */ int pattern; /* Current pattern */
@ -317,51 +319,52 @@ struct xmp_frame_info { /* Current frame information */
typedef char *xmp_context; typedef char *xmp_context;
EXPORT extern const char *xmp_version; LIBXMP_EXPORT extern const char *xmp_version;
EXPORT extern const unsigned int xmp_vercode; LIBXMP_EXPORT extern const unsigned int xmp_vercode;
EXPORT xmp_context xmp_create_context (void); LIBXMP_EXPORT xmp_context xmp_create_context (void);
EXPORT void xmp_free_context (xmp_context); LIBXMP_EXPORT void xmp_free_context (xmp_context);
#ifdef EDUKE32_DISABLED #ifdef EDUKE32_DISABLED
EXPORT int xmp_test_module (char *, struct xmp_test_info *); LIBXMP_EXPORT int xmp_test_module (char *, struct xmp_test_info *);
EXPORT int xmp_load_module (xmp_context, char *); LIBXMP_EXPORT int xmp_load_module (xmp_context, char *);
#endif #endif
EXPORT void xmp_scan_module (xmp_context); LIBXMP_EXPORT void xmp_scan_module (xmp_context);
EXPORT void xmp_release_module (xmp_context); LIBXMP_EXPORT void xmp_release_module (xmp_context);
EXPORT int xmp_start_player (xmp_context, int, int); LIBXMP_EXPORT int xmp_start_player (xmp_context, int, int);
EXPORT int xmp_play_frame (xmp_context); LIBXMP_EXPORT int xmp_play_frame (xmp_context);
EXPORT int xmp_play_buffer (xmp_context, void *, int, int); LIBXMP_EXPORT int xmp_play_buffer (xmp_context, void *, int, int);
EXPORT void xmp_get_frame_info (xmp_context, struct xmp_frame_info *); LIBXMP_EXPORT void xmp_get_frame_info (xmp_context, struct xmp_frame_info *);
EXPORT void xmp_end_player (xmp_context); LIBXMP_EXPORT void xmp_end_player (xmp_context);
EXPORT void xmp_inject_event (xmp_context, int, struct xmp_event *); LIBXMP_EXPORT void xmp_inject_event (xmp_context, int, struct xmp_event *);
EXPORT void xmp_get_module_info (xmp_context, struct xmp_module_info *); LIBXMP_EXPORT void xmp_get_module_info (xmp_context, struct xmp_module_info *);
EXPORT const char**xmp_get_format_list (void); LIBXMP_EXPORT const char **xmp_get_format_list (void);
EXPORT int xmp_next_position (xmp_context); LIBXMP_EXPORT int xmp_next_position (xmp_context);
EXPORT int xmp_prev_position (xmp_context); LIBXMP_EXPORT int xmp_prev_position (xmp_context);
EXPORT int xmp_set_position (xmp_context, int); LIBXMP_EXPORT int xmp_set_position (xmp_context, int);
EXPORT void xmp_stop_module (xmp_context); LIBXMP_EXPORT int xmp_set_row (xmp_context, int);
EXPORT void xmp_restart_module (xmp_context); LIBXMP_EXPORT int xmp_set_tempo_factor(xmp_context, double);
EXPORT int xmp_seek_time (xmp_context, int); LIBXMP_EXPORT void xmp_stop_module (xmp_context);
EXPORT int xmp_channel_mute (xmp_context, int, int); LIBXMP_EXPORT void xmp_restart_module (xmp_context);
EXPORT int xmp_channel_vol (xmp_context, int, int); LIBXMP_EXPORT int xmp_seek_time (xmp_context, int);
EXPORT int xmp_set_player (xmp_context, int, int); LIBXMP_EXPORT int xmp_channel_mute (xmp_context, int, int);
EXPORT int xmp_get_player (xmp_context, int); LIBXMP_EXPORT int xmp_channel_vol (xmp_context, int, int);
EXPORT int xmp_set_instrument_path (xmp_context, char *); LIBXMP_EXPORT int xmp_set_player (xmp_context, int, int);
EXPORT int xmp_load_module_from_memory (xmp_context, void *, long); LIBXMP_EXPORT int xmp_get_player (xmp_context, int);
LIBXMP_EXPORT int xmp_set_instrument_path (xmp_context, char *);
LIBXMP_EXPORT int xmp_load_module_from_memory (xmp_context, void *, long);
#ifdef EDUKE32_DISABLED #ifdef EDUKE32_DISABLED
EXPORT int xmp_load_module_from_file (xmp_context, void *, long); LIBXMP_EXPORT int xmp_load_module_from_file (xmp_context, void *, long);
#endif #endif
/* External sample mixer API */ /* External sample mixer API */
EXPORT int xmp_start_smix (xmp_context, int, int); LIBXMP_EXPORT int xmp_start_smix (xmp_context, int, int);
EXPORT void xmp_end_smix (xmp_context); LIBXMP_EXPORT void xmp_end_smix (xmp_context);
EXPORT int xmp_smix_play_instrument(xmp_context, int, int, int, int); LIBXMP_EXPORT int xmp_smix_play_instrument(xmp_context, int, int, int, int);
EXPORT int xmp_smix_play_sample (xmp_context, int, int, int, int); LIBXMP_EXPORT int xmp_smix_play_sample (xmp_context, int, int, int, int);
EXPORT int xmp_smix_channel_pan (xmp_context, int, int); LIBXMP_EXPORT int xmp_smix_channel_pan (xmp_context, int, int);
#ifdef EDUKE32_DISABLED #ifdef EDUKE32_DISABLED
EXPORT int xmp_smix_load_sample (xmp_context, int, char *); LIBXMP_EXPORT int xmp_smix_load_sample (xmp_context, int, char *);
#endif #endif
EXPORT int xmp_smix_release_sample (xmp_context, int); LIBXMP_EXPORT int xmp_smix_release_sample (xmp_context, int);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
source/libxmp-lite/src/common.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

28
source/libxmp-lite/src/common.h
View file

@ -145,10 +145,7 @@ void __inline CLIB_DECL D_(const char *text, ...) { do {} while (0); }
#define close _close #define close _close
#define unlink _unlink #define unlink _unlink
#endif #endif
#if defined(_MSC_VER) #if defined(_WIN32) || defined(__WATCOMC__) /* in win32.c */
#define snprintf _snprintf
#define vsnprintf _vsnprintf
#elif defined(__WATCOMC__) /* in win32.c */
int libxmp_vsnprintf(char *, size_t, const char *, va_list); int libxmp_vsnprintf(char *, size_t, const char *, va_list);
int libxmp_snprintf (char *, size_t, const char *, ...); int libxmp_snprintf (char *, size_t, const char *, ...);
#define snprintf libxmp_snprintf #define snprintf libxmp_snprintf
@ -300,6 +297,7 @@ struct pattern_loop {
int count; int count;
}; };
struct flow_control { struct flow_control {
int pbreak; int pbreak;
int jump; int jump;
@ -320,6 +318,17 @@ struct virt_channel {
int map; int map;
}; };
struct virt_control {
int num_tracks; /* Number of tracks */
int virt_channels; /* Number of virtual channels */
int virt_used; /* Number of voices currently in use */
int maxvoc; /* Number of sound card voices */
struct virt_channel *virt_channel;
struct mixer_voice *voice_array;
};
struct player_data { struct player_data {
int ord; int ord;
int pos; int pos;
@ -356,16 +365,7 @@ struct player_data {
int channel_vol[XMP_MAX_CHANNELS]; int channel_vol[XMP_MAX_CHANNELS];
char channel_mute[XMP_MAX_CHANNELS]; char channel_mute[XMP_MAX_CHANNELS];
struct virt_control { struct virt_control virt;
int num_tracks; /* Number of tracks */
int virt_channels; /* Number of virtual channels */
int virt_used; /* Number of voices currently in use */
int maxvoc; /* Number of sound card voices */
struct virt_channel *virt_channel;
struct mixer_voice *voice_array;
} virt;
struct xmp_event inject_event[XMP_MAX_CHANNELS]; struct xmp_event inject_event[XMP_MAX_CHANNELS];

73
source/libxmp-lite/src/control.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -174,6 +174,37 @@ int xmp_set_position(xmp_context opaque, int pos)
return p->pos; return p->pos;
} }
int xmp_set_row(xmp_context opaque, int row)
{
struct context_data *ctx = (struct context_data *)opaque;
struct player_data *p = &ctx->p;
struct module_data *m = &ctx->m;
struct xmp_module *mod = &m->mod;
struct flow_control *f = &p->flow;
int pos = p->pos;
int pattern = mod->xxo[pos];
if (pos < 0 || pos >= mod->len) {
pos = 0;
}
if (ctx->state < XMP_STATE_PLAYING)
return -XMP_ERROR_STATE;
if (row >= mod->xxp[pattern]->rows)
return -XMP_ERROR_INVALID;
/* See set_position. */
if (p->pos < 0)
p->pos = 0;
p->ord = p->pos;
p->row = row;
p->frame = -1;
f->num_rows = mod->xxp[mod->xxo[p->ord]]->rows;
return row;
}
void xmp_stop_module(xmp_context opaque) void xmp_stop_module(xmp_context opaque)
{ {
struct context_data *ctx = (struct context_data *)opaque; struct context_data *ctx = (struct context_data *)opaque;
@ -275,12 +306,12 @@ int xmp_channel_vol(xmp_context opaque, int chn, int vol)
} }
#ifdef USE_VERSIONED_SYMBOLS #ifdef USE_VERSIONED_SYMBOLS
EXPORT extern int xmp_set_player_v40__(xmp_context, int, int); LIBXMP_EXPORT extern int xmp_set_player_v40__(xmp_context, int, int);
EXPORT extern int xmp_set_player_v41__(xmp_context, int, int) LIBXMP_EXPORT extern int xmp_set_player_v41__(xmp_context, int, int)
__attribute__((alias("xmp_set_player_v40__"))); __attribute__((alias("xmp_set_player_v40__")));
EXPORT extern int xmp_set_player_v43__(xmp_context, int, int) LIBXMP_EXPORT extern int xmp_set_player_v43__(xmp_context, int, int)
__attribute__((alias("xmp_set_player_v40__"))); __attribute__((alias("xmp_set_player_v40__")));
EXPORT extern int xmp_set_player_v44__(xmp_context, int, int) LIBXMP_EXPORT extern int xmp_set_player_v44__(xmp_context, int, int)
__attribute__((alias("xmp_set_player_v40__"))); __attribute__((alias("xmp_set_player_v40__")));
asm(".symver xmp_set_player_v40__, xmp_set_player@XMP_4.0"); asm(".symver xmp_set_player_v40__, xmp_set_player@XMP_4.0");
@ -393,14 +424,14 @@ int xmp_set_player__(xmp_context opaque, int parm, int val)
} }
#ifdef USE_VERSIONED_SYMBOLS #ifdef USE_VERSIONED_SYMBOLS
EXPORT extern int xmp_get_player_v40__(xmp_context, int); LIBXMP_EXPORT extern int xmp_get_player_v40__(xmp_context, int);
EXPORT extern int xmp_get_player_v41__(xmp_context, int) LIBXMP_EXPORT extern int xmp_get_player_v41__(xmp_context, int)
__attribute__((alias("xmp_get_player_v40__"))); __attribute__((alias("xmp_get_player_v40__")));
EXPORT extern int xmp_get_player_v42__(xmp_context, int) LIBXMP_EXPORT extern int xmp_get_player_v42__(xmp_context, int)
__attribute__((alias("xmp_get_player_v40__"))); __attribute__((alias("xmp_get_player_v40__")));
EXPORT extern int xmp_get_player_v43__(xmp_context, int) LIBXMP_EXPORT extern int xmp_get_player_v43__(xmp_context, int)
__attribute__((alias("xmp_get_player_v40__"))); __attribute__((alias("xmp_get_player_v40__")));
EXPORT extern int xmp_get_player_v44__(xmp_context, int) LIBXMP_EXPORT extern int xmp_get_player_v44__(xmp_context, int)
__attribute__((alias("xmp_get_player_v40__"))); __attribute__((alias("xmp_get_player_v40__")));
asm(".symver xmp_get_player_v40__, xmp_get_player@XMP_4.0"); asm(".symver xmp_get_player_v40__, xmp_get_player@XMP_4.0");
@ -527,3 +558,25 @@ int xmp_set_instrument_path(xmp_context opaque, char *path)
return 0; return 0;
} }
int xmp_set_tempo_factor(xmp_context opaque, double val)
{
struct context_data *ctx = (struct context_data *)opaque;
struct player_data *p = &ctx->p;
struct module_data *m = &ctx->m;
struct mixer_data *s = &ctx->s;
int ticksize;
if (val <= 0.0) {
return -1;
}
val *= 10;
ticksize = s->freq * m->time_factor * m->rrate / p->bpm / 1000 * sizeof(int);
if (ticksize > XMP_MAX_FRAMESIZE) {
return -1;
}
m->time_factor = val;
return 0;
}

2
source/libxmp-lite/src/dataio.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

11
source/libxmp-lite/src/effects.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -540,9 +540,11 @@ void libxmp_process_fx(struct context_data *ctx, struct channel_data *xc, int ch
#ifndef LIBXMP_CORE_DISABLE_IT #ifndef LIBXMP_CORE_DISABLE_IT
case FX_IT_BPM: /* Set IT BPM */ case FX_IT_BPM: /* Set IT BPM */
if (MSN(fxp) == 0) { /* T0x - Tempo slide down by x */ if (MSN(fxp) == 0) {
SET(TEMPO_SLIDE); SET(TEMPO_SLIDE);
if (LSN(fxp)) /* T0x - Tempo slide down by x */
xc->tempo.slide = -LSN(fxp); xc->tempo.slide = -LSN(fxp);
/* T00 - Repeat previous slide */
} else if (MSN(fxp) == 1) { /* T1x - Tempo slide up by x */ } else if (MSN(fxp) == 1) { /* T1x - Tempo slide up by x */
SET(TEMPO_SLIDE); SET(TEMPO_SLIDE);
xc->tempo.slide = LSN(fxp); xc->tempo.slide = LSN(fxp);
@ -586,8 +588,11 @@ void libxmp_process_fx(struct context_data *ctx, struct channel_data *xc, int ch
xc->vol.fslide2 = -fxp; xc->vol.fslide2 = -fxp;
break; break;
case FX_IT_BREAK: /* Pattern break with hex parameter */ case FX_IT_BREAK: /* Pattern break with hex parameter */
if (!f->loop_chn)
{
p->flow.pbreak = 1; p->flow.pbreak = 1;
p->flow.jumpline = fxp; p->flow.jumpline = fxp;
}
break; break;
#endif #endif
@ -684,10 +689,10 @@ void libxmp_process_fx(struct context_data *ctx, struct channel_data *xc, int ch
EFFECT_MEMORY_S3M(fxp); EFFECT_MEMORY_S3M(fxp);
if (fxp) { if (fxp) {
xc->retrig.val = fxp; xc->retrig.val = fxp;
xc->retrig.type = MSN(xc->retrig.val);
} }
if (note) { if (note) {
xc->retrig.count = LSN(xc->retrig.val) + 1; xc->retrig.count = LSN(xc->retrig.val) + 1;
xc->retrig.type = MSN(xc->retrig.val);
} }
SET(RETRIG); SET(RETRIG);
break; break;

2
source/libxmp-lite/src/hio.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

2
source/libxmp-lite/src/it.h
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

21
source/libxmp-lite/src/it_load.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -42,19 +42,22 @@ const struct format_loader libxmp_loader_it = {
it_load it_load
}; };
#ifndef LIBXMP_CORE_PLAYER /* */
#if defined(__WATCOMC__) #if defined(__WATCOMC__)
#undef localtime_r #undef localtime_r
#define localtime_r _localtime #define localtime_r _localtime
#elif !defined(HAVE_LOCALTIME_R) || defined(_WIN32) #elif !defined(HAVE_LOCALTIME_R) || defined(_WIN32)
#undef localtime_r #undef localtime_r
struct tm *localtime_r(const time_t * timep, struct tm *result) #define localtime_r libxmp_localtime_r
static struct tm *libxmp_localtime_r(const time_t * timep, struct tm *result)
{ {
/* Note: Win32 localtime() is thread-safe */ /* Note: Win32 localtime() is thread-safe */
memcpy(result, localtime(timep), sizeof(struct tm)); memcpy(result, localtime(timep), sizeof(struct tm));
return result; return result;
} }
#endif #endif
#endif /* ! LIBXMP_CORE_PLAYER */
static int it_test(HIO_HANDLE * f, char *t, const int start) static int it_test(HIO_HANDLE * f, char *t, const int start)
{ {
@ -280,14 +283,7 @@ static int read_envelope(struct xmp_envelope *ei, struct it_envelope *env,
} }
env->flg = buf[0]; env->flg = buf[0];
env->num = buf[1]; env->num = MIN(buf[1], 25); /* Clamp to IT max */
/* Sanity check */
if (env->num >= XMP_MAX_ENV_POINTS) {
env->flg = 0;
env->num = 0;
return -1;
}
env->lpb = buf[2]; env->lpb = buf[2];
env->lpe = buf[3]; env->lpe = buf[3];
@ -1140,7 +1136,6 @@ static int it_load(struct module_data *m, HIO_HANDLE *f, const int start)
} }
if (ifh.chpan[i] & 0x80) { /* Channel mute */ if (ifh.chpan[i] & 0x80) { /* Channel mute */
ifh.chvol[i] = 0;
xxc->flg |= XMP_CHANNEL_MUTE; xxc->flg |= XMP_CHANNEL_MUTE;
} }
@ -1348,7 +1343,7 @@ static int it_load(struct module_data *m, HIO_HANDLE *f, const int start)
D_(D_INFO "Message length : %d", ifh.msglen); D_(D_INFO "Message length : %d", ifh.msglen);
for (j = 0; j < ifh.msglen - 1; j++) { for (j = 0; j + 1 < ifh.msglen; j++) {
int b = hio_read8(f); int b = hio_read8(f);
if (b == '\r') { if (b == '\r') {
b = '\n'; b = '\n';
@ -1360,7 +1355,7 @@ static int it_load(struct module_data *m, HIO_HANDLE *f, const int start)
} }
if (ifh.msglen > 0) { if (ifh.msglen > 0) {
m->comment[j-1] = 0; m->comment[j] = 0;
} }
} }
} }

2
source/libxmp-lite/src/lfo.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

5
source/libxmp-lite/src/load.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -34,9 +34,6 @@
#include "format.h" #include "format.h"
#include "list.h" #include "list.h"
#include "hio.h" #include "hio.h"
#ifndef LIBXMP_CORE_PLAYER
#include "tempfile.h"
#endif
#ifndef LIBXMP_CORE_PLAYER #ifndef LIBXMP_CORE_PLAYER
#if !defined(HAVE_POPEN) && defined(WIN32) #if !defined(HAVE_POPEN) && defined(WIN32)

2
source/libxmp-lite/src/load_helpers.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

2
source/libxmp-lite/src/memio.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

2
source/libxmp-lite/src/mix_all.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

2
source/libxmp-lite/src/mixer.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

2
source/libxmp-lite/src/mod.h
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

2
source/libxmp-lite/src/mtm_load.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

12
source/libxmp-lite/src/period.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -138,10 +138,12 @@ static uint16 pt_period_table[16][36] = {
#define M_LN2 0.69314718055994530942 #define M_LN2 0.69314718055994530942
#endif #endif
#if !defined(HAVE_ROUND) || defined(_MSC_VER) || defined(__WATCOMC__) #if !defined(HAVE_ROUND) || defined(_MSC_VER) || defined(__WATCOMC__)
static inline double round(double val) static inline double libxmp_round(double val)
{ {
return (val >= 0.0)? floor(val + 0.5) : ceil(val - 0.5); return (val >= 0.0)? floor(val + 0.5) : ceil(val - 0.5);
} }
#else
#define libxmp_round round
#endif #endif
#ifdef LIBXMP_PAULA_SIMULATOR #ifdef LIBXMP_PAULA_SIMULATOR
@ -219,7 +221,7 @@ int libxmp_period_to_note(int p)
return 0; return 0;
} }
return (int)round(12.0 * log(PERIOD_BASE / p) / M_LN2) + 1; return libxmp_round(12.0 * log(PERIOD_BASE / p) / M_LN2) + 1;
} }
/* Get pitchbend from base note and amiga period */ /* Get pitchbend from base note and amiga period */
@ -237,11 +239,11 @@ int libxmp_period_to_bend(struct context_data *ctx, double p, int n, double adj)
return (int) (100 * (8 * (((240 - n) << 4) - p))); return (int) (100 * (8 * (((240 - n) << 4) - p)));
case PERIOD_CSPD: case PERIOD_CSPD:
d = libxmp_note_to_period(ctx, n, 0, adj); d = libxmp_note_to_period(ctx, n, 0, adj);
return (int) round(100.0 * (1536.0 / M_LN2) * log(p / d)); return libxmp_round(100.0 * (1536.0 / M_LN2) * log(p / d));
default: default:
/* Amiga */ /* Amiga */
d = libxmp_note_to_period(ctx, n, 0, adj); d = libxmp_note_to_period(ctx, n, 0, adj);
return (int) round(100.0 * (1536.0 / M_LN2) * log(d / p)); return libxmp_round(100.0 * (1536.0 / M_LN2) * log(d / p));
} }
} }

14
source/libxmp-lite/src/player.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -1502,8 +1502,13 @@ int xmp_start_player(xmp_context opaque, int rate, int format)
p->loop_count = 0; p->loop_count = 0;
p->sequence = 0; p->sequence = 0;
/* Unmute all channels and set default volume */ /* Set default volume and mute status */
for (i = 0; i < XMP_MAX_CHANNELS; i++) { for (i = 0; i < mod->chn; i++) {
if (mod->xxc[i].flg & XMP_CHANNEL_MUTE)
p->channel_mute[i] = 1;
p->channel_vol[i] = 100;
}
for (i = mod->chn; i < XMP_MAX_CHANNELS; i++) {
p->channel_mute[i] = 0; p->channel_mute[i] = 0;
p->channel_vol[i] = 100; p->channel_vol[i] = 100;
} }
@ -1553,6 +1558,9 @@ int xmp_start_player(xmp_context opaque, int rate, int format)
goto err1; goto err1;
} }
/* Reset our buffer pointers */
xmp_play_buffer(opaque, NULL, 0, 0);
#ifndef LIBXMP_CORE_PLAYER #ifndef LIBXMP_CORE_PLAYER
for (i = 0; i < p->virt.virt_channels; i++) { for (i = 0; i < p->virt.virt_channels; i++) {
struct channel_data *xc = &p->xc_data[i]; struct channel_data *xc = &p->xc_data[i];

2
source/libxmp-lite/src/read_event.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

2
source/libxmp-lite/src/s3m.h
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

2
source/libxmp-lite/src/s3m_load.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

2
source/libxmp-lite/src/sample.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

2
source/libxmp-lite/src/scan.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

17
source/libxmp-lite/src/smix.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -251,7 +251,7 @@ int xmp_smix_load_sample(xmp_context opaque, int num, char *path)
retval = -XMP_ERROR_SYSTEM; retval = -XMP_ERROR_SYSTEM;
goto err2; goto err2;
} }
size = hio_read32l(h) / (bits / 8); size = hio_read32l(h);
if (size == 0) { if (size == 0) {
retval = -XMP_ERROR_FORMAT; retval = -XMP_ERROR_FORMAT;
goto err2; goto err2;
@ -264,11 +264,17 @@ int xmp_smix_load_sample(xmp_context opaque, int num, char *path)
xxs->lpe = 0; xxs->lpe = 0;
xxs->flg = bits == 16 ? XMP_SAMPLE_16BIT : 0; xxs->flg = bits == 16 ? XMP_SAMPLE_16BIT : 0;
xxs->data = (unsigned char *)malloc(size); xxs->data = malloc(size + 8);
if (xxs->data == NULL) { if (xxs->data == NULL) {
retval = -XMP_ERROR_SYSTEM; retval = -XMP_ERROR_SYSTEM;
goto err2; goto err2;
} }
/* ugly hack to make the interpolator happy */
memset(xxs->data, 0, 4);
memset(xxs->data + 4 + size, 0, 4);
xxs->data += 4;
if (hio_seek(h, 44, SEEK_SET) < 0) { if (hio_seek(h, 44, SEEK_SET) < 0) {
retval = -XMP_ERROR_SYSTEM; retval = -XMP_ERROR_SYSTEM;
goto err2; goto err2;
@ -300,7 +306,9 @@ int xmp_smix_release_sample(xmp_context opaque, int num)
return -XMP_ERROR_INVALID; return -XMP_ERROR_INVALID;
} }
free(smix->xxs[num].data); if (smix->xxs[num].data != NULL) {
free(smix->xxs[num].data - 4);
}
free(smix->xxi[num].sub); free(smix->xxi[num].sub);
smix->xxs[num].data = NULL; smix->xxs[num].data = NULL;
@ -322,3 +330,4 @@ void xmp_end_smix(xmp_context opaque)
free(smix->xxs); free(smix->xxs);
free(smix->xxi); free(smix->xxi);
} }

2
source/libxmp-lite/src/virtual.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),

17
source/libxmp-lite/src/xm_load.c
View file

@ -1,5 +1,5 @@
/* Extended Module Player /* Extended Module Player
* Copyright (C) 1996-2016 Claudio Matsuoka and Hipolito Carraro Jr * Copyright (C) 1996-2018 Claudio Matsuoka and Hipolito Carraro Jr
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -351,6 +351,7 @@ static int load_instruments(struct module_data *m, int version, HIO_HANDLE * f)
struct xm_instrument xi; struct xm_instrument xi;
struct xm_sample_header xsh[16]; struct xm_sample_header xsh[16];
int sample_num = 0; int sample_num = 0;
long total_sample_size;
int i, j; int i, j;
uint8 buf[208]; uint8 buf[208];
@ -363,6 +364,7 @@ static int load_instruments(struct module_data *m, int version, HIO_HANDLE * f)
return -1; return -1;
for (i = 0; i < mod->ins; i++) { for (i = 0; i < mod->ins; i++) {
long instr_pos = hio_tell(f);
struct xmp_instrument *xxi = &mod->xxi[i]; struct xmp_instrument *xxi = &mod->xxi[i];
/* Modules converted with MOD2XM 1.0 always say we have 31 /* Modules converted with MOD2XM 1.0 always say we have 31
@ -571,6 +573,7 @@ static int load_instruments(struct module_data *m, int version, HIO_HANDLE * f)
xxs->flg |= xsh[j].type & XM_LOOP_PINGPONG ? XMP_SAMPLE_LOOP | XMP_SAMPLE_LOOP_BIDIR : 0; xxs->flg |= xsh[j].type & XM_LOOP_PINGPONG ? XMP_SAMPLE_LOOP | XMP_SAMPLE_LOOP_BIDIR : 0;
} }
total_sample_size = 0;
for (j = 0; j < xxi->nsm; j++) { for (j = 0; j < xxi->nsm; j++) {
struct xmp_subinstrument *sub = &xxi->sub[j]; struct xmp_subinstrument *sub = &xxi->sub[j];
int flags; int flags;
@ -595,10 +598,22 @@ static int load_instruments(struct module_data *m, int version, HIO_HANDLE * f)
if (libxmp_load_sample(m, f, flags, &mod->xxs[sub->sid], NULL) < 0) { if (libxmp_load_sample(m, f, flags, &mod->xxs[sub->sid], NULL) < 0) {
return -1; return -1;
} }
if (flags & SAMPLE_FLAG_ADPCM) {
total_sample_size += 16 + ((xsh[j].length + 1) >> 1);
} else {
total_sample_size += xsh[j].length;
} }
} }
} }
/* Reposition correctly in case of 16-bit sample having odd in-file length.
* See "Lead Lined for '99", reported by Dennis Mulleneers.
*/
if (hio_seek(f, instr_pos + xih.size + 40 * xih.samples + total_sample_size, SEEK_SET) < 0) {
return -1;
}
}
/* Final sample number adjustment */ /* Final sample number adjustment */
mod->xxs = libxmp_realloc_samples(mod->xxs, &mod->smp, sample_num); mod->xxs = libxmp_realloc_samples(mod->xxs, &mod->smp, sample_num);
if (mod->xxs == NULL) { if (mod->xxs == NULL) {