Skip to content

Commit

Permalink
tempomult option
Browse files Browse the repository at this point in the history
  • Loading branch information
@yotam-medini
yotam-medini committed Sep 13, 2024
1 parent c5dade3 commit 94f9cd5
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 21 deletions.
2 changes: 1 addition & 1 deletion include/f_midi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#ifndef __MIDI_H
#define __MIDI_H

extern struct _mdi *_WM_ParseNewMidi(const uint8_t *midi_data, uint32_t midi_size);
extern struct _mdi *_WM_ParseNewMidi(const uint8_t *midi_data, uint32_t midi_size, float tempo_mult);
extern int _WM_Event2Midi(struct _mdi *mdi, uint8_t **out, uint32_t *outsize);

#endif /* __MIDI_H */
4 changes: 2 additions & 2 deletions include/wildmidi_lib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ WM_SYMBOL long WildMidi_GetVersion (void);
WM_SYMBOL int WildMidi_Init (const char *config_file, uint16_t rate, uint16_t mixer_options);
WM_SYMBOL int WildMidi_InitVIO(struct _WM_VIO * callbacks, const char *config_file, uint16_t rate, uint16_t mixer_options);
WM_SYMBOL int WildMidi_MasterVolume (uint8_t master_volume);
WM_SYMBOL midi * WildMidi_Open (const char *midifile);
WM_SYMBOL midi * WildMidi_OpenBuffer (const uint8_t *midibuffer, uint32_t size);
WM_SYMBOL midi * WildMidi_Open (const char *midifile, float tempomult);
WM_SYMBOL midi * WildMidi_OpenBuffer (const uint8_t *midibuffer, uint32_t size, float tempo_mult);
WM_SYMBOL int WildMidi_GetMidiOutput (midi *handle, int8_t **buffer, uint32_t *size);
WM_SYMBOL int WildMidi_GetOutput (midi *handle, int8_t *buffer, uint32_t size);
WM_SYMBOL int WildMidi_SetOption (midi *handle, uint16_t options, uint16_t setting);
Expand Down
5 changes: 4 additions & 1 deletion src/f_midi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@


struct _mdi *
_WM_ParseNewMidi(const uint8_t *midi_data, uint32_t midi_size) {
_WM_ParseNewMidi(const uint8_t *midi_data, uint32_t midi_size, float tempo_mult) {
struct _mdi *mdi;

uint32_t tmp_val;
Expand Down Expand Up @@ -142,6 +142,7 @@ _WM_ParseNewMidi(const uint8_t *midi_data, uint32_t midi_size) {
}

samples_per_delta_f = _WM_GetSamplesPerTick(divisions, tempo);
samples_per_delta_f /= tempo_mult;

mdi = _WM_initMDI();
_WM_midi_setup_divisions(mdi,divisions);
Expand Down Expand Up @@ -298,6 +299,7 @@ _WM_ParseNewMidi(const uint8_t *midi_data, uint32_t midi_size) {
tempo = 500000;

samples_per_delta_f = _WM_GetSamplesPerTick(divisions, tempo);
samples_per_delta_f /= tempo_mult;
}
}
tracks[i] += setup_ret;
Expand Down Expand Up @@ -372,6 +374,7 @@ _WM_ParseNewMidi(const uint8_t *midi_data, uint32_t midi_size) {
tempo = 500000;

samples_per_delta_f = _WM_GetSamplesPerTick(divisions, tempo);
samples_per_delta_f /= tempo_mult;
}
}
tracks[i] += setup_ret;
Expand Down
52 changes: 39 additions & 13 deletions src/player/wildmidi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ static struct _midi_test midi_test[] = {

static int midi_test_max = 1;
static unsigned int rate = 32072;
static float tempo_mult = 1.0f;

/*
MIDI Output Functions
Expand Down Expand Up @@ -264,6 +265,7 @@ static struct option const long_options[] = {
{ "textaslyric", 0, 0, 'a' },
{ "playfrom", 1, 0, 'i'},
{ "playto", 1, 0, 'j'},
{ "tempomult", 1, 0, 'T'},
{ NULL, 0, NULL, 0 }
};

Expand Down Expand Up @@ -302,6 +304,7 @@ static void do_help(void) {
printf(" defaults to: %s\n", WILDMIDI_CFG);
printf(" -m V --mastervol=V Set the master volume (0..127), default is 100\n");
printf(" -b --reverb Enable final output reverb engine\n\n");
printf(" -T --tempomult=v Playing speed multiplier, default is 1.0\n\n");
}

static void do_available_outputs(void) {
Expand Down Expand Up @@ -329,6 +332,23 @@ static void do_syntax(void) {
printf("Usage: wildmidi [options] filename.mid\n\n");
}

static void samples_to_min_sec(uint32_t samples, uint32_t *pmin, uint32_t *psec) {
uint32_t rate60 = 60 * rate;
uint32_t samples_tempo_mult = samples * tempo_mult;
uint32_t seconds = samples_tempo_mult / rate;
*pmin = seconds / 60;
*psec = seconds % 60;
}

static void get_current_pro_perc_min_sec(
const struct _WM_Info *wm_info,
uint32_t *perc,
uint32_t *pro_min,
uint32_t *pro_sec) {
*perc = (100 * wm_info->current_sample) / wm_info->approx_total_samples;
samples_to_min_sec(wm_info->current_sample, pro_min, pro_sec);
}

static char config_file[1024];

int main(int argc, char **argv) {
Expand Down Expand Up @@ -382,7 +402,7 @@ int main(int argc, char **argv) {

do_version();
while (1) {
i = getopt_long(argc, argv, "0vho:tx:g:P:f:lr:c:m:btak:p:ed:nsi:j:", long_options,
i = getopt_long(argc, argv, "0vho:tx:g:P:f:lr:c:m:btak:p:ed:nsi:j:T:", long_options,
&option_index);
if (i == -1)
break;
Expand Down Expand Up @@ -495,6 +515,17 @@ int main(int argc, char **argv) {
case 'j':
play_to = (unsigned long int)(atof(optarg) * (double)rate);
break;
case 'T': /* Config File */
if (!*optarg) {
fprintf(stderr, "Error: empty tempo multiplier.\n");
return (1);
}
tempo_mult = atof(optarg);
if (!((1.0/4.0) < tempo_mult) && (tempo_mult < 4.0)) {
fprintf(stderr, "Error: bad tempo_mult %g.\n", tempo_mult);
return (1);
}
break;
default:
do_syntax();
return (1);
Expand All @@ -513,6 +544,8 @@ int main(int argc, char **argv) {
return (1);
}
}
play_to /= tempo_mult;
play_from /= tempo_mult;

/* check if we only need to convert a file to midi */
if (midi_file[0] != '\0') {
Expand Down Expand Up @@ -589,7 +622,7 @@ int main(int argc, char **argv) {
else real_file++;
printf("\rPlaying %s ", real_file);

midi_ptr = WildMidi_Open(argv[optind]);
midi_ptr = WildMidi_Open(argv[optind], tempo_mult);
optind++;
if (midi_ptr == NULL) {
ret_err = WildMidi_GetError();
Expand All @@ -605,7 +638,7 @@ int main(int argc, char **argv) {
midi_test[test_count].size);
test_data[25] = test_bank;
test_data[28] = test_patch;
midi_ptr = WildMidi_OpenBuffer(test_data, 633);
midi_ptr = WildMidi_OpenBuffer(test_data, 633, tempo_mult);
test_count++;
if (midi_ptr == NULL) {
fprintf(stderr, "\rFailed loading test midi no. %i\r\n", test_count);
Expand All @@ -616,8 +649,7 @@ int main(int argc, char **argv) {

wm_info = WildMidi_GetInfo(midi_ptr);

apr_mins = wm_info->approx_total_samples / (rate * 60);
apr_secs = (wm_info->approx_total_samples % (rate * 60)) / rate;
samples_to_min_sec(wm_info->approx_total_samples, &apr_mins, &apr_secs);
mixer_options = wm_info->mixer_options;
modes[0] = (mixer_options & WM_MO_LOG_VOLUME)? 'l' : ' ';
modes[1] = (mixer_options & WM_MO_REVERB)? 'r' : ' ';
Expand Down Expand Up @@ -754,10 +786,7 @@ int main(int argc, char **argv) {

if (inpause) {
wm_info = WildMidi_GetInfo(midi_ptr);
perc_play = (wm_info->current_sample * 100)
/ wm_info->approx_total_samples;
pro_mins = wm_info->current_sample / (rate * 60);
pro_secs = (wm_info->current_sample % (rate * 60)) / rate;
get_current_pro_perc_min_sec(wm_info, &perc_play, &pro_mins, &pro_secs);
fprintf(stderr,
"%s [%s] [%3i] [%2um %2us Processed] [%2u%%] P \r",
display_lyrics, modes, (int)master_volume, pro_mins,
Expand Down Expand Up @@ -805,10 +834,7 @@ int main(int argc, char **argv) {
memcpy(display_lyrics,lyrics,MAX_DISPLAY_LYRICS);
display_lyrics[MAX_DISPLAY_LYRICS] = '\0';

perc_play = (wm_info->current_sample * 100)
/ wm_info->approx_total_samples;
pro_mins = wm_info->current_sample / (rate * 60);
pro_secs = (wm_info->current_sample % (rate * 60)) / rate;
get_current_pro_perc_min_sec(wm_info, &perc_play, &pro_mins, &pro_secs);
fprintf(stderr,
"%s [%s] [%3i] [%2um %2us Processed] [%2u%%] %c \r",
display_lyrics, modes, (int)master_volume, pro_mins,
Expand Down
8 changes: 4 additions & 4 deletions src/wildmidi_lib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1652,7 +1652,7 @@ WM_SYMBOL int WildMidi_Close(midi * handle) {
return (0);
}

WM_SYMBOL midi *WildMidi_Open(const char *midifile) {
WM_SYMBOL midi *WildMidi_Open(const char *midifile, float tempo_mult) {
uint8_t *mididata = NULL;
uint32_t midisize = 0;
uint8_t mus_hdr[] = { 'M', 'U', 'S', 0x1A };
Expand Down Expand Up @@ -1684,7 +1684,7 @@ WM_SYMBOL midi *WildMidi_Open(const char *midifile) {
} else if (memcmp(mididata, xmi_hdr, 4) == 0) {
ret = (void *) _WM_ParseNewXmi(mididata, midisize);
} else {
ret = (void *) _WM_ParseNewMidi(mididata, midisize);
ret = (void *) _WM_ParseNewMidi(mididata, midisize, tempo_mult);
}
_WM_FreeBufferFile(mididata);

Expand All @@ -1698,7 +1698,7 @@ WM_SYMBOL midi *WildMidi_Open(const char *midifile) {
return (ret);
}

WM_SYMBOL midi *WildMidi_OpenBuffer(const uint8_t *midibuffer, uint32_t size) {
WM_SYMBOL midi *WildMidi_OpenBuffer(const uint8_t *midibuffer, uint32_t size, float tempo_mult) {
uint8_t mus_hdr[] = { 'M', 'U', 'S', 0x1A };
uint8_t xmi_hdr[] = { 'F', 'O', 'R', 'M' };
midi * ret = NULL;
Expand Down Expand Up @@ -1729,7 +1729,7 @@ WM_SYMBOL midi *WildMidi_OpenBuffer(const uint8_t *midibuffer, uint32_t size) {
} else if (memcmp(midibuffer, xmi_hdr, 4) == 0) {
ret = (void *) _WM_ParseNewXmi(midibuffer, size);
} else {
ret = (void *) _WM_ParseNewMidi(midibuffer, size);
ret = (void *) _WM_ParseNewMidi(midibuffer, size, tempo_mult);
}

if (ret) {
Expand Down

0 comments on commit 94f9cd5

Please sign in to comment.