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

Amend r6174 to un-break libxmp-lite.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6179 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-06-14 06:59:58 +00:00
parent 9f871a7587
commit 08326d19dd
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -523,7 +523,7 @@ void libxmp_mixer_softmixer(struct context_data *ctx)
if (mix_fn != NULL) { if (mix_fn != NULL) {
mix_fn(vi, buf_pos, samples, mix_fn(vi, buf_pos, samples,
vol_l >> 8, vol_r >> 8, (int) step * (1 << SMIX_SHIFT), rsize, delta_l, delta_r); vol_l >> 8, vol_r >> 8, (int) (step * (1 << SMIX_SHIFT)), rsize, delta_l, delta_r);
} }
buf_pos += mix_size; buf_pos += mix_size;

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

@ -925,12 +925,12 @@ static void process_frequency(struct context_data *ctx, int chn, int act)
/* For xmp_get_frame_info() */ /* For xmp_get_frame_info() */
xc->info_pitchbend = linear_bend >> 7; xc->info_pitchbend = linear_bend >> 7;
xc->info_period = (int) period * 4096; xc->info_period = (int) (period * 4096);
if (IS_PERIOD_MODRNG()) { if (IS_PERIOD_MODRNG()) {
CLAMP(xc->info_period, CLAMP(xc->info_period,
(int) libxmp_note_to_period(ctx, MAX_NOTE_MOD, xc->finetune, 0) * 4096, (int) (libxmp_note_to_period(ctx, MAX_NOTE_MOD, xc->finetune, 0) * 4096),
(int) libxmp_note_to_period(ctx, MIN_NOTE_MOD, xc->finetune, 0) * 4096); (int) (libxmp_note_to_period(ctx, MIN_NOTE_MOD, xc->finetune, 0) * 4096));
} else if (xc->info_period < (1 << 12)) { } else if (xc->info_period < (1 << 12)) {
xc->info_period = (1 << 12); xc->info_period = (1 << 12);
} }
@ -1847,7 +1847,7 @@ void xmp_get_frame_info(xmp_context opaque, struct xmp_frame_info *info)
info->speed = p->speed; info->speed = p->speed;
info->bpm = p->bpm; info->bpm = p->bpm;
info->total_time = p->scan[p->sequence].time; info->total_time = p->scan[p->sequence].time;
info->frame_time = (int) p->frame_time * 1000; info->frame_time = (int) (p->frame_time * 1000);
info->time = (int) p->current_time; info->time = (int) p->current_time;
info->buffer = s->buffer; info->buffer = s->buffer;