Remove duplicate code to fix build with glib

Author: derselbst

src/synth/fluid_synth.c

@@ -104,7 +104,6 @@ fluid_synth_get_preset_by_sfont_name(fluid_synth_t *synth, const char *sfontname
 static void fluid_synth_update_presets(fluid_synth_t *synth);
 static void fluid_synth_update_gain_LOCAL(fluid_synth_t *synth);
 static int fluid_synth_update_polyphony_LOCAL(fluid_synth_t *synth, int new_polyphony);
-static int fluid_synth_render_blocks(fluid_synth_t *synth, int blockcount);
 
 static fluid_voice_t *fluid_synth_free_voice_by_kill_LOCAL(fluid_synth_t *synth);
 static void fluid_synth_kill_by_exclusive_class_LOCAL(fluid_synth_t *synth,
@@ -5118,7 +5117,7 @@ void fluid_synth_process_event_queue(fluid_synth_t *synth)
  * Must be called from renderer thread only!
  * @return number of blocks rendered. Might (often) return less than requested
  */
-static int
+int
 fluid_synth_render_blocks(fluid_synth_t *synth, int blockcount)
 {
     int i, maxblocks;

src/synth/fluid_synth.h

@@ -259,6 +259,8 @@ fluid_synth_write_float_channels(fluid_synth_t *synth, int len,
                                  void *channels_out[], int channels_off[],
                                  int channels_incr[]);
 
+int fluid_synth_render_blocks(fluid_synth_t *synth, int blockcount);
+
 fluid_preset_t *fluid_synth_find_preset(fluid_synth_t *synth,
                                         int banknum,
                                         int prognum);

src/synth/fluid_synth_write_int.cpp

@@ -34,126 +34,6 @@
 
 #include <cstdint>
 
-/* --------------------------------------------------------------------------
- * Local static helpers/tables
- *
- * -------------------------------------------------------------------------- */
-
-static FLUID_INLINE unsigned int fluid_synth_get_ticks(fluid_synth_t *synth)
-{
-    return fluid_atomic_int_get(&synth->ticks_since_start);
-}
-
-static FLUID_INLINE void fluid_synth_add_ticks(fluid_synth_t *synth, int val)
-{
-    fluid_atomic_int_add(&synth->ticks_since_start, val);
-}
-
-
-/***************************************************************
- *                    FLUID SAMPLE TIMERS
- *    Timers that use written audio data as timing reference
- */
-struct _fluid_sample_timer_t
-{
-    fluid_sample_timer_t *next; /* Single linked list of timers */
-    unsigned long starttick;
-    fluid_timer_callback_t callback;
-    void *data;
-    int isfinished;
-};
-
-/*
- * fluid_sample_timer_process - called when synth->ticks is updated
- */
-static void fluid_sample_timer_process(fluid_synth_t *synth)
-{
-    fluid_sample_timer_t *st;
-    long msec;
-    int cont;
-    unsigned int ticks = fluid_synth_get_ticks(synth);
-
-    for (st = synth->sample_timers; st; st = st->next)
-    {
-        if (st->isfinished)
-        {
-            continue;
-        }
-
-        msec = (long)(1000.0 * ((double)(ticks - st->starttick)) / synth->sample_rate);
-        cont = (*st->callback)(st->data, msec);
-
-        if (cont == 0)
-        {
-            st->isfinished = 1;
-        }
-    }
-}
-
-/*
- * Process blocks (FLUID_BUFSIZE) of audio.
- * Must be called from renderer thread only!
- * @return number of blocks rendered. Might (often) return less than requested
- */
-static int fluid_synth_render_blocks(fluid_synth_t *synth, int blockcount)
-{
-    int i, maxblocks;
-    fluid_profile_ref_var(prof_ref);
-
-    /* Assign ID of synthesis thread */
-    //  synth->synth_thread_id = fluid_thread_get_id ();
-
-    fluid_check_fpe("??? Just starting up ???");
-
-    fluid_rvoice_eventhandler_dispatch_all(synth->eventhandler);
-
-    /* do not render more blocks than we can store internally */
-    maxblocks = fluid_rvoice_mixer_get_bufcount(synth->eventhandler->mixer);
-
-    if (blockcount > maxblocks)
-    {
-        blockcount = maxblocks;
-    }
-
-    for (i = 0; i < blockcount; i++)
-    {
-        fluid_sample_timer_process(synth);
-        fluid_synth_add_ticks(synth, FLUID_BUFSIZE);
-
-        /* If events have been queued waiting for fluid_rvoice_eventhandler_dispatch_all()
-         * (should only happen with parallel render) stop processing and go for rendering
-         */
-        if (fluid_rvoice_eventhandler_dispatch_count(synth->eventhandler))
-        {
-            // Something has happened, we can't process more
-            blockcount = i + 1;
-            break;
-        }
-    }
-
-    fluid_check_fpe("fluid_sample_timer_process");
-
-    blockcount = fluid_rvoice_mixer_render(synth->eventhandler->mixer, blockcount);
-
-    /* Testcase, that provokes a denormal floating point error */
-#if 0
-    {
-        float num = 1;
-
-        while(num != 0)
-        {
-            num *= 0.5;
-        };
-    };
-#endif
-    fluid_check_fpe("??? Remainder of synth_one_block ???");
-    fluid_profile(FLUID_PROF_ONE_BLOCK,
-                  prof_ref,
-                  fluid_rvoice_mixer_get_active_voices(synth->eventhandler->mixer),
-                  blockcount * FLUID_BUFSIZE);
-    return blockcount;
-}
-
 /* --------------------------------------------------------------------------
  * Integer write core: tag dispatch + traits (C++11)
  * -------------------------------------------------------------------------- */