From 914eb2fea0139eb388b088a5531bd6ac8e175956 Mon Sep 17 00:00:00 2001
From: Krzysztof Foltman <wdev@foltman.com>
Date: Sat, 9 Mar 2013 21:05:17 +0000
Subject: [PATCH] Eliminate known memory leaks.

---
 rt.c    | 2 ++
 seq.c   | 5 +----
 usbio.c | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rt.c b/rt.c
index 444d9d1..d845ff8 100644
--- a/rt.c
+++ b/rt.c
@@ -561,5 +561,7 @@ void cbox_rt_destroy(struct cbox_rt *rt)
     cbox_master_destroy(rt->master);
     rt->master = NULL;
 
+    cbox_midi_merger_close(&rt->scene_input_merger);
+    
     free(rt);
 }
diff --git a/seq.c b/seq.c
index 097ae88..dcaadeb 100644
--- a/seq.c
+++ b/seq.c
@@ -367,8 +367,6 @@ struct cbox_song_playback *cbox_song_playback_new(struct cbox_song *song, struct
     return spb;
 }
 
-#define MAX_TRACKS 16
-
 static void cbox_song_playback_set_tempo(struct cbox_song_playback *spb, double tempo)
 {
     int ppos = spb->song_pos_ppqn;
@@ -412,8 +410,6 @@ int cbox_song_playback_get_next_tempo_change(struct cbox_song_playback *spb)
 
 void cbox_song_playback_render(struct cbox_song_playback *spb, struct cbox_midi_buffer *output, int nsamples)
 {
-    struct cbox_midi_buffer *midibufsrcs[MAX_TRACKS];
-    
     cbox_midi_buffer_clear(output);
     
     if (spb->master->new_tempo != 0 && spb->master->new_tempo != spb->master->tempo)
@@ -582,5 +578,6 @@ void cbox_song_playback_destroy(struct cbox_song_playback *spb)
     free(spb->tempo_map_items);
     free(spb->tracks);
     g_hash_table_destroy(spb->pattern_map);
+    cbox_midi_merger_close(&spb->track_merger);
     free(spb);
 }
diff --git a/usbio.c b/usbio.c
index 15560c0..0e75207 100644
--- a/usbio.c
+++ b/usbio.c
@@ -230,6 +230,7 @@ void cbox_usbio_destroy(struct cbox_io_impl *impl)
     
     libusb_exit(uii->usbctx_probe);
     libusb_exit(uii->usbctx);
+    cbox_midi_merger_close(&uii->midi_input_merger);
     free(uii);
 }
 
-- 
2.11.4.GIT