FreeCalypso > hg > freecalypso-tools
view ringtools/imy/durations.c @ 964:a96cb97b66a2
ringtools/imy: fix duplicate definition of tdma_durations[]
The bug was reported by Vadim Yanitskiy <fixeria@osmocom.org>,
although the present fix is slightly different from the contributed
patch: because main.c doesn't need this tdma_durations[] array
at all, let's simply remove the reference to this array from main.c
rather than turn it into an extern.
I no longer remember my original thought flow that resulted (by mistake)
in tdma_durations[] being multiply defined in main.c and durations.c.
My intent might have been to define all globals in main.c and have
the reference in durations.c be an extern - and I missed that extern -
but without clear memory, I have no certainty. In any case, having
this data array defined in the same module that fills it (durations.c)
is sensible, so let's make it the new way.
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Thu, 31 Aug 2023 19:38:18 +0000 |
parents | fd4c9bc7835d |
children |
line wrap: on
line source
/* * This module implements the step of precomputing various note durations * in TDMA frames. */ extern unsigned beats_per_min; unsigned tdma_durations[6][4]; static float modifier_values[4] = {1.0f, 1.5f, 1.75f, 2.0f / 3.0f}; compute_note_durations() { float beat_ref, basic_ms[6], dur_ms; unsigned dur_tdma; int i, j; beat_ref = 60000.0f / beats_per_min; basic_ms[0] = beat_ref * 4.0f; basic_ms[1] = beat_ref * 2.0f; basic_ms[2] = beat_ref; basic_ms[3] = beat_ref / 2.0f; basic_ms[4] = beat_ref / 4.0f; basic_ms[5] = beat_ref / 8.0f; for (i = 0; i < 6; i++) { for (j = 0; j < 4; j++) { dur_ms = basic_ms[i] * modifier_values[j]; dur_tdma = dur_ms * 13.0f / 60.0f + 0.5f; tdma_durations[i][j] = dur_tdma; } } }