zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-01-19 07:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Promote Controller/Pressure/Bend event functions to 32bits (#670)

Browse source
This commit is contained in:
Tom M 2020-10-08 16:33:52 +02:00 committed by GitHub
parent d64ab70709
commit 97615ef2cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/fluidsynth-v20-devdoc.txt
View file

@ -75,6 +75,7 @@ What is FluidSynth?
- #fluid_file_callbacks_t now uses <code>long long</code> as file-offset type (see #fluid_long_long_t). This is a breaking change, which allows to load SoundFonts bigger than 2GiB on Windows. This change required to bump fluidsynth's SOVERSION.
- fluid_event_any_control_change() has been removed
- various fluid_event_*() functions that received a "value" argument of type <code>short</code> now receive an <code>int</code> argument in preparation for MIDI 2.0 support
- The sequencer has received a major revisal. For you that means:
- The sequencer's queue no longer blocks the synthesizer thread, due to being busy arranging its events internally.
- Events that share the same tick was given a new, documented order, see fluid_sequencer_send_at().

26
include/fluidsynth/event.h
View file

@ -87,25 +87,25 @@ FLUIDSYNTH_API void fluid_event_all_notes_off(fluid_event_t *evt, int channel);
/* Instrument selection */
FLUIDSYNTH_API void fluid_event_bank_select(fluid_event_t *evt, int channel, short bank_num);
FLUIDSYNTH_API void fluid_event_program_change(fluid_event_t *evt, int channel, short preset_num);
FLUIDSYNTH_API void fluid_event_program_change(fluid_event_t *evt, int channel, int preset_num);
FLUIDSYNTH_API void fluid_event_program_select(fluid_event_t *evt, int channel, unsigned int sfont_id, short bank_num, short preset_num);
/* Real-time generic instrument controllers */
FLUIDSYNTH_API
void fluid_event_control_change(fluid_event_t *evt, int channel, short control, short val);
void fluid_event_control_change(fluid_event_t *evt, int channel, short control, int val);
/* Real-time instrument controllers shortcuts */
FLUIDSYNTH_API void fluid_event_pitch_bend(fluid_event_t *evt, int channel, int val);
FLUIDSYNTH_API void fluid_event_pitch_wheelsens(fluid_event_t *evt, int channel, short val);
FLUIDSYNTH_API void fluid_event_modulation(fluid_event_t *evt, int channel, short val);
FLUIDSYNTH_API void fluid_event_sustain(fluid_event_t *evt, int channel, short val);
FLUIDSYNTH_API void fluid_event_pan(fluid_event_t *evt, int channel, short val);
FLUIDSYNTH_API void fluid_event_volume(fluid_event_t *evt, int channel, short val);
FLUIDSYNTH_API void fluid_event_reverb_send(fluid_event_t *evt, int channel, short val);
FLUIDSYNTH_API void fluid_event_chorus_send(fluid_event_t *evt, int channel, short val);
FLUIDSYNTH_API void fluid_event_pitch_wheelsens(fluid_event_t *evt, int channel, int val);
FLUIDSYNTH_API void fluid_event_modulation(fluid_event_t *evt, int channel, int val);
FLUIDSYNTH_API void fluid_event_sustain(fluid_event_t *evt, int channel, int val);
FLUIDSYNTH_API void fluid_event_pan(fluid_event_t *evt, int channel, int val);
FLUIDSYNTH_API void fluid_event_volume(fluid_event_t *evt, int channel, int val);
FLUIDSYNTH_API void fluid_event_reverb_send(fluid_event_t *evt, int channel, int val);
FLUIDSYNTH_API void fluid_event_chorus_send(fluid_event_t *evt, int channel, int val);
FLUIDSYNTH_API void fluid_event_key_pressure(fluid_event_t *evt, int channel, short key, short val);
FLUIDSYNTH_API void fluid_event_channel_pressure(fluid_event_t *evt, int channel, short val);
FLUIDSYNTH_API void fluid_event_key_pressure(fluid_event_t *evt, int channel, short key, int val);
FLUIDSYNTH_API void fluid_event_channel_pressure(fluid_event_t *evt, int channel, int val);
FLUIDSYNTH_API void fluid_event_system_reset(fluid_event_t *evt);
/* Only when unregistering clients */
@ -119,8 +119,8 @@ FLUIDSYNTH_API int fluid_event_get_channel(fluid_event_t *evt);
FLUIDSYNTH_API short fluid_event_get_key(fluid_event_t *evt);
FLUIDSYNTH_API short fluid_event_get_velocity(fluid_event_t *evt);
FLUIDSYNTH_API short fluid_event_get_control(fluid_event_t *evt);
FLUIDSYNTH_API short fluid_event_get_value(fluid_event_t *evt);
FLUIDSYNTH_API short fluid_event_get_program(fluid_event_t *evt);
FLUIDSYNTH_API int fluid_event_get_value(fluid_event_t *evt);
FLUIDSYNTH_API int fluid_event_get_program(fluid_event_t *evt);
FLUIDSYNTH_API void *fluid_event_get_data(fluid_event_t *evt);
FLUIDSYNTH_API unsigned int fluid_event_get_duration(fluid_event_t *evt);
FLUIDSYNTH_API short fluid_event_get_bank(fluid_event_t *evt);

3
src/midi/fluid_seqbind_notes.h
View file

@ -22,13 +22,12 @@
#define _FLUID_SEQBIND_NOTE_H
#include "fluidsynth.h"
#include "fluid_event.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef int fluid_note_id_t;
fluid_note_id_t fluid_note_compute_id(int chan, short key);
void* new_fluid_note_container(void);
void delete_fluid_note_container(void *cont);

30
src/synth/fluid_event.c
View file

@ -97,7 +97,7 @@ fluid_event_set_time(fluid_event_t *evt, unsigned int time)
}
void
fluid_event_set_id(fluid_event_t *evt, short id)
fluid_event_set_id(fluid_event_t *evt, fluid_note_id_t id)
{
evt->id = id;
}
@ -236,7 +236,7 @@ fluid_event_bank_select(fluid_event_t *evt, int channel, short bank_num)
* @param val MIDI program number (0-127)
*/
void
fluid_event_program_change(fluid_event_t *evt, int channel, short val)
fluid_event_program_change(fluid_event_t *evt, int channel, int val)
{
evt->type = FLUID_SEQ_PROGRAMCHANGE;
evt->channel = channel;
@ -294,7 +294,7 @@ fluid_event_pitch_bend(fluid_event_t *evt, int channel, int pitch)
* @param value MIDI pitch wheel sensitivity value in semitones
*/
void
fluid_event_pitch_wheelsens(fluid_event_t *evt, int channel, short value)
fluid_event_pitch_wheelsens(fluid_event_t *evt, int channel, int value)
{
evt->type = FLUID_SEQ_PITCHWHEELSENS;
evt->channel = channel;
@ -308,7 +308,7 @@ fluid_event_pitch_wheelsens(fluid_event_t *evt, int channel, short value)
* @param val MIDI modulation value (0-127)
*/
void
fluid_event_modulation(fluid_event_t *evt, int channel, short val)
fluid_event_modulation(fluid_event_t *evt, int channel, int val)
{
evt->type = FLUID_SEQ_MODULATION;
evt->channel = channel;
@ -333,7 +333,7 @@ fluid_event_modulation(fluid_event_t *evt, int channel, short val)
* @param val MIDI sustain value (0-127)
*/
void
fluid_event_sustain(fluid_event_t *evt, int channel, short val)
fluid_event_sustain(fluid_event_t *evt, int channel, int val)
{
evt->type = FLUID_SEQ_SUSTAIN;
evt->channel = channel;
@ -359,7 +359,7 @@ fluid_event_sustain(fluid_event_t *evt, int channel, short val)
* @param val MIDI control value (0-127)
*/
void
fluid_event_control_change(fluid_event_t *evt, int channel, short control, short val)
fluid_event_control_change(fluid_event_t *evt, int channel, short control, int val)
{
evt->type = FLUID_SEQ_CONTROLCHANGE;
evt->channel = channel;
@ -374,7 +374,7 @@ fluid_event_control_change(fluid_event_t *evt, int channel, short control, short
* @param val MIDI panning value (0-127, 0=left, 64 = middle, 127 = right)
*/
void
fluid_event_pan(fluid_event_t *evt, int channel, short val)
fluid_event_pan(fluid_event_t *evt, int channel, int val)
{
evt->type = FLUID_SEQ_PAN;
evt->channel = channel;
@ -399,7 +399,7 @@ fluid_event_pan(fluid_event_t *evt, int channel, short val)
* @param val Volume value (0-127)
*/
void
fluid_event_volume(fluid_event_t *evt, int channel, short val)
fluid_event_volume(fluid_event_t *evt, int channel, int val)
{
evt->type = FLUID_SEQ_VOLUME;
evt->channel = channel;
@ -424,7 +424,7 @@ fluid_event_volume(fluid_event_t *evt, int channel, short val)
* @param val Reverb amount (0-127)
*/
void
fluid_event_reverb_send(fluid_event_t *evt, int channel, short val)
fluid_event_reverb_send(fluid_event_t *evt, int channel, int val)
{
evt->type = FLUID_SEQ_REVERBSEND;
evt->channel = channel;
@ -449,7 +449,7 @@ fluid_event_reverb_send(fluid_event_t *evt, int channel, short val)
* @param val Chorus amount (0-127)
*/
void
fluid_event_chorus_send(fluid_event_t *evt, int channel, short val)
fluid_event_chorus_send(fluid_event_t *evt, int channel, int val)
{
evt->type = FLUID_SEQ_CHORUSSEND;
evt->channel = channel;
@ -487,7 +487,7 @@ fluid_event_unregistering(fluid_event_t *evt)
* @since 1.1.0
*/
void
fluid_event_channel_pressure(fluid_event_t *evt, int channel, short val)
fluid_event_channel_pressure(fluid_event_t *evt, int channel, int val)
{
evt->type = FLUID_SEQ_CHANNELPRESSURE;
evt->channel = channel;
@ -514,7 +514,7 @@ fluid_event_channel_pressure(fluid_event_t *evt, int channel, short val)
* @since 2.0.0
*/
void
fluid_event_key_pressure(fluid_event_t *evt, int channel, short key, short val)
fluid_event_key_pressure(fluid_event_t *evt, int channel, short key, int val)
{
evt->type = FLUID_SEQ_KEYPRESSURE;
evt->channel = channel;
@ -587,7 +587,7 @@ unsigned int fluid_event_get_time(fluid_event_t *evt)
* @param evt Sequencer event structure
* @return Time value
*/
short fluid_event_get_id(fluid_event_t *evt)
fluid_note_id_t fluid_event_get_id(fluid_event_t *evt)
{
return evt->id;
}
@ -664,7 +664,7 @@ short fluid_event_get_control(fluid_event_t *evt)
* #FLUID_SEQ_CONTROLCHANGE, #FLUID_SEQ_PAN, #FLUID_SEQ_VOLUME,
* #FLUID_SEQ_REVERBSEND, #FLUID_SEQ_CHORUSSEND.
*/
short fluid_event_get_value(fluid_event_t *evt)
int fluid_event_get_value(fluid_event_t *evt)
{
return evt->value;
}
@ -726,7 +726,7 @@ int fluid_event_get_pitch(fluid_event_t *evt)
* Used by the #FLUID_SEQ_PROGRAMCHANGE and #FLUID_SEQ_PROGRAMSELECT
* event types.
*/
short
int
fluid_event_get_program(fluid_event_t *evt)
{
return evt->value;

10
src/synth/fluid_event.h
View file

@ -28,6 +28,8 @@
extern "C" {
#endif
typedef int fluid_note_id_t;
/* Private data for event */
/* ?? should be optimized in size, using unions */
struct _fluid_event_t
@ -40,8 +42,8 @@ struct _fluid_event_t
short key;
short vel;
short control;
short value;
int id;
int value;
fluid_note_id_t id;
int pitch;
unsigned int duration;
void *data;
@ -50,8 +52,8 @@ struct _fluid_event_t
unsigned int fluid_event_get_time(fluid_event_t *evt);
void fluid_event_set_time(fluid_event_t *evt, unsigned int time);
short fluid_event_get_id(fluid_event_t *evt);
void fluid_event_set_id(fluid_event_t *evt, short id);
fluid_note_id_t fluid_event_get_id(fluid_event_t *evt);
void fluid_event_set_id(fluid_event_t *evt, fluid_note_id_t id);
void fluid_event_clear(fluid_event_t *evt);