diff --git a/include/fluidsynth/shell.h b/include/fluidsynth/shell.h index 4ba4c3be..25de19fa 100644 --- a/include/fluidsynth/shell.h +++ b/include/fluidsynth/shell.h @@ -63,16 +63,6 @@ typedef struct { char* help; /**< A help string */ } fluid_cmd_t; -/* the shell cmd handler struct */ -typedef struct { - fluid_synth_t* synth; - fluid_midi_router_t* router; - fluid_cmd_hash_t* commands; - - fluid_midi_router_rule_t *cmd_rule; /* Rule currently being processed by shell command handler */ - int cmd_rule_type; /* Type of the rule (#fluid_midi_router_rule_type) */ -} fluid_cmd_handler_t; - /* The command handler */ FLUIDSYNTH_API diff --git a/include/fluidsynth/types.h b/include/fluidsynth/types.h index 82b2624e..052a121f 100644 --- a/include/fluidsynth/types.h +++ b/include/fluidsynth/types.h @@ -56,6 +56,7 @@ typedef struct _fluid_event_t fluid_event_t; /**< Sequencer e typedef struct _fluid_sequencer_t fluid_sequencer_t; /**< Sequencer instance */ typedef struct _fluid_ramsfont_t fluid_ramsfont_t; /**< RAM SoundFont */ typedef struct _fluid_rampreset_t fluid_rampreset_t; /**< RAM SoundFont preset */ +typedef struct _fluid_cmd_handler_t fluid_cmd_handler_t; /**< Shell Command Handler */ typedef int fluid_istream_t; /**< Input stream descriptor */ typedef int fluid_ostream_t; /**< Output stream descriptor */ diff --git a/src/bindings/fluid_cmd.c b/src/bindings/fluid_cmd.c index c03e6ce6..f98b030d 100644 --- a/src/bindings/fluid_cmd.c +++ b/src/bindings/fluid_cmd.c @@ -39,6 +39,18 @@ #define MAX_COMMAND_LEN 1024 /* max command length accepted by fluid_command() */ #define FLUID_WORKLINELENGTH 1024 /* LADSPA plugins use long command lines */ + +/* the shell cmd handler struct */ +struct _fluid_cmd_handler_t { + fluid_synth_t* synth; + fluid_midi_router_t* router; + fluid_cmd_hash_t* commands; + + fluid_midi_router_rule_t *cmd_rule; /* Rule currently being processed by shell command handler */ + int cmd_rule_type; /* Type of the rule (#fluid_midi_router_rule_type) */ +}; + + struct _fluid_shell_t { fluid_settings_t* settings; fluid_cmd_handler_t* handler;