From cd199cfdc83c4687d3b351b59804d4fd4238e471 Mon Sep 17 00:00:00 2001 From: Tom M Date: Sat, 14 Dec 2019 18:09:29 +0100 Subject: [PATCH] Remove unused tracing code from sequencer (#596) --- include/fluidsynth/seq.h | 8 ---- src/midi/fluid_seq.c | 90 ---------------------------------------- 2 files changed, 98 deletions(-) diff --git a/include/fluidsynth/seq.h b/include/fluidsynth/seq.h index c0e6b555..f6e5b2bb 100644 --- a/include/fluidsynth/seq.h +++ b/include/fluidsynth/seq.h @@ -64,14 +64,6 @@ FLUIDSYNTH_API unsigned int fluid_sequencer_get_tick(fluid_sequencer_t *seq); FLUIDSYNTH_API void fluid_sequencer_set_time_scale(fluid_sequencer_t *seq, double scale); FLUIDSYNTH_API double fluid_sequencer_get_time_scale(fluid_sequencer_t *seq); -// Compile in internal traceing functions -#define FLUID_SEQ_WITH_TRACE 0 - -#if FLUID_SEQ_WITH_TRACE -FLUIDSYNTH_API char *fluid_seq_gettrace(fluid_sequencer_t *seq); -FLUIDSYNTH_API void fluid_seq_cleartrace(fluid_sequencer_t *seq); -#endif - #ifdef __cplusplus } #endif diff --git a/src/midi/fluid_seq.c b/src/midi/fluid_seq.c index 0e4b36ae..d5e5f5ff 100644 --- a/src/midi/fluid_seq.c +++ b/src/midi/fluid_seq.c @@ -58,11 +58,6 @@ struct _fluid_sequencer_t fluid_evt_entry *queueLater; fluid_evt_heap_t *heap; fluid_mutex_t mutex; -#if FLUID_SEQ_WITH_TRACE - char *tracebuf; - char *traceptr; - int tracelen; -#endif }; /* Private data for clients */ @@ -136,21 +131,6 @@ new_fluid_sequencer2(int use_system_timer) return NULL; } -#if FLUID_SEQ_WITH_TRACE - seq->tracelen = 1024 * 100; - seq->tracebuf = (char *)FLUID_MALLOC(seq->tracelen); - - if(seq->tracebuf == NULL) - { - _fluid_seq_queue_end(seq); - FLUID_FREE(seq); - FLUID_LOG(FLUID_PANIC, "sequencer: Out of memory\n"); - return NULL; - } - - seq->traceptr = seq->tracebuf; -#endif - return(seq); } @@ -184,16 +164,6 @@ delete_fluid_sequencer(fluid_sequencer_t *seq) seq->clients = NULL; }*/ -#if FLUID_SEQ_WITH_TRACE - - if(seq->tracebuf != NULL) - { - FLUID_FREE(seq->tracebuf); - } - - seq->tracebuf = NULL; -#endif - FLUID_FREE(seq); } @@ -210,66 +180,6 @@ fluid_sequencer_get_use_system_timer(fluid_sequencer_t *seq) } -#if FLUID_SEQ_WITH_TRACE - -/* trace */ -void -fluid_seq_dotrace(fluid_sequencer_t *seq, char *fmt, ...) -{ - va_list args; - int len, remain = seq->tracelen - (seq->traceptr - seq->tracebuf); - - if(remain <= 0) - { - return; - } - - va_start(args, fmt); - len = FLUID_VSNPRINTF(seq->traceptr, remain, fmt, args); - va_end(args); - - if(len > 0) - { - if(len <= remain) - { - // all written, with 0 at end - seq->traceptr += len; - } - else - { - // not enough room, set to end - seq->traceptr = seq->tracebuf + seq->tracelen; - } - } - - return; -} - -/** - * Clear sequencer trace buffer. - * @param seq Sequencer object - */ -void -fluid_seq_cleartrace(fluid_sequencer_t *seq) -{ - seq->traceptr = seq->tracebuf; -} - -/** - * Get sequencer trace buffer. - * @param seq Sequencer object - */ -char * -fluid_seq_gettrace(fluid_sequencer_t *seq) -{ - return seq->tracebuf; -} -#else - -void fluid_seq_dotrace(fluid_sequencer_t *seq, char *fmt, ...) {} - -#endif // FLUID_SEQ_WITH_TRACE - /* clients */ /**