Revert "make fluid_midi_parser_parse() public"

This reverts commit 4568e551b9. Would allow fluidsynth to be abused as midi parser.

Closes #150
This commit is contained in:
derselbst 2017-12-21 14:52:06 +01:00
parent a9a9eb5b8c
commit 5f45c6d97b
5 changed files with 14 additions and 32 deletions

View file

@ -121,7 +121,6 @@ Changes in FluidSynth 2.0.0 concerning developers:
Changes in FluidSynth 1.1.9 concerning developers:
- add a function for registering audio drivers based on acutal needs: fluid_audio_driver_register()
- make fluid_midi_parser_parse() public to enable realtime byte to #fluid_midi_event_t parsing
- implement handling of #FLUID_SEQ_ALLSOUNDSOFF events in fluid_seq_fluidsynth_callback()
- fix return value of fluid_file_set_encoding_quality()

View file

@ -146,11 +146,7 @@ FLUIDSYNTH_API int fluid_player_get_bpm(fluid_player_t * player);
FLUIDSYNTH_API int fluid_player_get_midi_tempo(fluid_player_t * player);
FLUIDSYNTH_API int fluid_player_seek(fluid_player_t *player, int ticks);
FLUIDSYNTH_API fluid_midi_parser_t* new_fluid_midi_parser(void);
FLUIDSYNTH_API void delete_fluid_midi_parser(fluid_midi_parser_t* parser);
FLUIDSYNTH_API fluid_midi_event_t* fluid_midi_parser_parse(fluid_midi_parser_t* parser, unsigned char c);
///
#ifdef __cplusplus
}

View file

@ -58,7 +58,6 @@ typedef struct _fluid_rampreset_t fluid_rampreset_t; /**< RAM SoundFo
typedef struct _fluid_cmd_handler_t fluid_cmd_handler_t; /**< Shell Command Handler */
typedef struct _fluid_ladspa_fx_t fluid_ladspa_fx_t; /**< LADSPA effects instance */
typedef struct _fluid_file_callbacks_t fluid_file_callbacks_t; /**< Callback struct to perform custom file loading of soundfonts */
typedef struct _fluid_midi_parser_t fluid_midi_parser_t;
typedef int fluid_istream_t; /**< Input stream descriptor */
typedef int fluid_ostream_t; /**< Output stream descriptor */

View file

@ -1891,10 +1891,8 @@ int fluid_player_get_midi_tempo(fluid_player_t * player)
*
*/
/**
* Create a MIDI parser.
* @return New MIDI parser or NULL when out of memory.
* @since 1.1.9
/*
* new_fluid_midi_parser
*/
fluid_midi_parser_t *
new_fluid_midi_parser ()
@ -1909,10 +1907,8 @@ new_fluid_midi_parser ()
return parser;
}
/**
* Delete a MIDI parser.
* @param parser The MIDI parser to delete
* @since 1.1.9
/*
* delete_fluid_midi_parser
*/
void
delete_fluid_midi_parser(fluid_midi_parser_t *parser)
@ -1923,25 +1919,11 @@ delete_fluid_midi_parser(fluid_midi_parser_t *parser)
}
/**
* Parse one character of a MIDI byte stream at a time.
* Parse a MIDI stream one character at a time.
* @param parser Parser instance
* @param c Next character in MIDI stream
* @return A parsed MIDI event or NULL if more data required. Event is owned internally, should
* not be modified or freed and is only valid until next call to this function.
* @since 1.1.9
*
* Usage example:
* @code
* int ret=FLUID_OK;
* for (i = 0; i < length_of_byte_stream && ret == FLUID_OK; i++)
* {
* fluid_midi_event_t* event = fluid_midi_parser_parse(parser, my_byte_stream[i]);
* if (event != NULL)
* {
* ret = fluid_sequencer_add_midi_event_to_buffer(seq, event);
* }
* }
* @endcode
* @return A parsed MIDI event or NULL if none. Event is internal and should
* not be modified or freed and is only valid until next call to this function.
*/
fluid_midi_event_t *
fluid_midi_parser_parse(fluid_midi_parser_t *parser, unsigned char c)

View file

@ -25,6 +25,12 @@
#include "fluid_sys.h"
#include "fluid_list.h"
typedef struct _fluid_midi_parser_t fluid_midi_parser_t;
fluid_midi_parser_t* new_fluid_midi_parser(void);
void delete_fluid_midi_parser(fluid_midi_parser_t* parser);
fluid_midi_event_t* fluid_midi_parser_parse(fluid_midi_parser_t* parser, unsigned char c);
/***************************************************************
*