zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-04-08 08:41:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for ticket #22 - Wrong tempo changes

Browse source
This commit is contained in:
Pedro Lopez-Cabanillas 2009-02-28 23:16:36 +00:00
parent 5b4387e332
commit af673afaba
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fluidsynth/src/fluid_midi.c
View file

@ -272,6 +272,7 @@ int fluid_midi_file_read_track(fluid_midi_file* mf, fluid_player_t* player, int
return FLUID_FAILED;
}
id[4]='\0';
mf->dtime = 0;
while (!found_track){
@ -354,7 +355,6 @@ int fluid_midi_file_read_varlen(fluid_midi_file* mf)
*/
int fluid_midi_file_read_event(fluid_midi_file* mf, fluid_track_t* track)
{
int dtime;
int status;
int type;
int tempo;
@ -371,7 +371,7 @@ int fluid_midi_file_read_event(fluid_midi_file* mf, fluid_track_t* track)
if (fluid_midi_file_read_varlen(mf) != FLUID_OK) {
return FLUID_FAILED;
}
dtime = mf->varlen;
mf->dtime += mf->varlen;
/* read the status byte */
status = fluid_midi_file_getc(mf);
@ -519,12 +519,13 @@ int fluid_midi_file_read_event(fluid_midi_file* mf, fluid_track_t* track)
result = FLUID_FAILED;
break;
}
evt->dtime = dtime;
evt->dtime = mf->dtime;
evt->type = MIDI_SET_TEMPO;
evt->channel = 0;
evt->param1 = tempo;
evt->param2 = 0;
fluid_track_add_event(track, evt);
mf->dtime = 0;
break;
case MIDI_SMPTE_OFFSET:
@ -642,12 +643,13 @@ int fluid_midi_file_read_event(fluid_midi_file* mf, fluid_track_t* track)
FLUID_LOG(FLUID_ERR, "Out of memory");
return FLUID_FAILED;
}
evt->dtime = dtime;
evt->dtime = mf->dtime;
evt->type = type;
evt->channel = channel;
evt->param1 = param1;
evt->param2 = param2;
fluid_track_add_event(track, evt);
mf->dtime = 0;
}
}
return FLUID_OK;

1
fluidsynth/src/fluid_midi.h
View file

@ -290,6 +290,7 @@ typedef struct {
int trackpos;
int eot;
int varlen;
int dtime;
} fluid_midi_file;
fluid_midi_file* new_fluid_midi_file(char* filename);