Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

avoid voice_count becomming negative #169

Merged
merged 2 commits into from
Sep 3, 2017
Merged

avoid voice_count becomming negative #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80b46c6
avoid voice_count becomming negative
derselbst Jul 1, 2017
2f3a1a9
clarify comment
derselbst Sep 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions fluidsynth/src/synth/fluid_synth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,8 +800,18 @@ delete_fluid_synth(fluid_synth_t* synth)
continue;
fluid_voice_unlock_rvoice(voice);
fluid_voice_overflow_rvoice_finished(voice);
if (fluid_voice_is_playing(voice))
fluid_voice_off(voice);
if (fluid_voice_is_playing(voice)) {
fluid_voice_off(voice);
/* If we only use fluid_voice_off(voice) it will trigger a delayed
* fluid_voice_stop(voice) via fluid_synth_check_finished_voices().
* But here, we are deleting the fluid_synth_t instance so
* fluid_voice_stop() will be never triggered resulting in
* SoundFont data never unloaded (i.e a serious memory leak).
* So, fluid_voice_stop() must be explicitly called to insure
* unloading SoundFont data
*/
fluid_voice_stop(voice);
}
}
}

Expand Down Expand Up @@ -2812,7 +2822,7 @@ fluid_synth_check_finished_voices(fluid_synth_t* synth)
for (j=0; j < synth->polyphony; j++) {
if (synth->voice[j]->rvoice == fv) {
fluid_voice_unlock_rvoice(synth->voice[j]);
fluid_voice_off(synth->voice[j]);
fluid_voice_stop(synth->voice[j]);
break;
}
else if (synth->voice[j]->overflow_rvoice == fv) {
Expand Down
23 changes: 15 additions & 8 deletions fluidsynth/src/synth/fluid_voice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,21 +1277,30 @@ void fluid_voice_overflow_rvoice_finished(fluid_voice_t* voice)
fluid_sample_null_ptr(&voice->overflow_rvoice->dsp.sample);
}


/*
* fluid_voice_off
*
* Force the voice into finished stage. Useful anywhere a voice
* needs to be cancelled from MIDI API.
*/
void fluid_voice_off(fluid_voice_t* voice)
{
UPDATE_RVOICE0(fluid_rvoice_voiceoff); /* request to finish the voice */
}

/*
* fluid_voice_stop
*
* Purpose:
* Turns off a voice, meaning that it is not processed
* anymore by the DSP loop.
* Turns off a voice, meaning that it is not processed anymore by the
* DSP loop, i.e. contrary part to fluid_voice_start().
*/
int
fluid_voice_off(fluid_voice_t* voice)
void
fluid_voice_stop(fluid_voice_t* voice)
{
fluid_profile(FLUID_PROF_VOICE_RELEASE, voice->ref);

voice->chan = NO_CHANNEL;
UPDATE_RVOICE0(fluid_rvoice_voiceoff);

if (voice->can_access_rvoice)
fluid_sample_null_ptr(&voice->rvoice->dsp.sample);
Expand All @@ -1304,8 +1313,6 @@ fluid_voice_off(fluid_voice_t* voice)

/* Decrement voice count */
voice->channel->synth->active_voice_count--;

return FLUID_OK;
}

/**
Expand Down
9 changes: 2 additions & 7 deletions fluidsynth/src/synth/fluid_voice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,10 @@ int fluid_voice_set_output_rate(fluid_voice_t* voice, fluid_real_t value);
function.*/
void fluid_voice_update_param(fluid_voice_t* voice, int gen);

/** fluid_voice_release
Force the voice into release stage. Usefuf anywhere a voice
needs to be damped even if pedals (sustain sostenuto) are depressed.
See fluid_synth_damp_voices_LOCAL(), fluid_synth_damp_voices_by_sostenuto_LOCAL,
fluid_voice_noteoff(), fluid_synth_stop_LOCAL().
*/
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are you remove this comment. Maybe move to the c file?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A more up to date comment for this function is present at

fluidsynth/fluidsynth/src/synth/fluid_voice.c

Line 1186 in 80b46c6

Force the voice into release stage. Useful anywhere a voice

Also, I'm afraid you are the only available reviewer currently, as the others are inactive (did you got my mail?).

void fluid_voice_release(fluid_voice_t* voice);
int fluid_voice_noteoff(fluid_voice_t* voice);
int fluid_voice_off(fluid_voice_t* voice);
void fluid_voice_off(fluid_voice_t* voice);
void fluid_voice_stop(fluid_voice_t* voice);
void fluid_voice_overflow_rvoice_finished(fluid_voice_t* voice);
void fluid_voice_mix (fluid_voice_t *voice, int count, fluid_real_t* dsp_buf,
fluid_real_t* left_buf, fluid_real_t* right_buf,
Expand Down