From 1f9fde78db3e0ddbdb63b43cb243cc7b007a46f0 Mon Sep 17 00:00:00 2001
From: Dave Griffiths <dave@fo.am>
Date: Mon, 13 Jul 2015 00:26:30 +0100
Subject: [PATCH] jiggery pokery and crash fixes

---
 samplebrain/qt/audio_thread.cpp   | 2 +-
 samplebrain/qt/process_thread.cpp | 5 +++--
 samplebrain/src/brain.cpp         | 1 +
 samplebrain/src/renderer.cpp      | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/samplebrain/qt/audio_thread.cpp b/samplebrain/qt/audio_thread.cpp
index 8f2b693..9c64fd6 100644
--- a/samplebrain/qt/audio_thread.cpp
+++ b/samplebrain/qt/audio_thread.cpp
@@ -10,11 +10,11 @@ audio_thread::audio_thread(process_thread &p) :
     m_brain_mutex(p.m_brain_mutex),
     m_osc("8888")
 {
+    start_audio();
     pthread_mutex_lock(m_brain_mutex);
     m_renderer = new renderer(p.m_source,p.m_target);
     pthread_mutex_unlock(m_brain_mutex);
     m_osc.run();
-    start_audio();
 }
 
 void audio_thread::start_audio() {
diff --git a/samplebrain/qt/process_thread.cpp b/samplebrain/qt/process_thread.cpp
index 78ebaf8..7543294 100644
--- a/samplebrain/qt/process_thread.cpp
+++ b/samplebrain/qt/process_thread.cpp
@@ -51,7 +51,7 @@ void process_thread::process() {
                 m_source_block_size = cmd.get_int(0);
             }
             if (name=="/source_overlap") {
-                m_source_overlap = m_source_block_size-m_source_block_size/cmd.get_float(0);
+                m_source_overlap = m_source_block_size*cmd.get_float(0);
             }
             if (name=="/generate_brain") {
                 pthread_mutex_lock(m_brain_mutex);
@@ -68,7 +68,8 @@ void process_thread::process() {
                 m_target_block_size = cmd.get_int(0);
             }
             if (name=="/target_overlap") {
-                m_target_overlap = m_target_block_size-m_target_block_size/cmd.get_float(0);
+                m_target_overlap = m_target_block_size*cmd.get_float(0);
+                cerr<<m_target_overlap<<endl;
             }
             if (name=="/generate_target") {
                 pthread_mutex_lock(m_brain_mutex);
diff --git a/samplebrain/src/brain.cpp b/samplebrain/src/brain.cpp
index d7c65bb..7a9db19 100644
--- a/samplebrain/src/brain.cpp
+++ b/samplebrain/src/brain.cpp
@@ -58,6 +58,7 @@ void brain::init(u32 block_size, u32 overlap, u32 env, bool ditchpcm) {
 
 void brain::chop_and_add(const sample &s, u32 block_size, u32 overlap, u32 env, bool ditchpcm) {
     u32 pos=0;
+    if (overlap>=block_size) overlap=0;
     while (pos+block_size-1<s.get_length()) {
         cerr<<'\r';
         cerr<<"adding: "<<pos/(float)s.get_length()*100;
diff --git a/samplebrain/src/renderer.cpp b/samplebrain/src/renderer.cpp
index 8945aa0..a287095 100644
--- a/samplebrain/src/renderer.cpp
+++ b/samplebrain/src/renderer.cpp
@@ -6,6 +6,7 @@ using namespace std;
 
 void renderer::init(brain &source, brain &target) {
     m_volume=1;
+    m_playing=false;
     m_source=source;
     m_target=target;
     m_render_time=0;
@@ -22,8 +23,7 @@ void renderer::process(u32 nframes, float *buf) {
     u32 tgt_start = m_render_time/(float)tgt_shift;
     u32 tgt_end = (m_render_time+nframes)/(float)tgt_shift;
 
-
-    if (tgt_end>=m_target.get_num_blocks()) {
+    if (tgt_end>=m_target.get_num_blocks() || m_source.get_num_blocks()==0) {
         m_render_time=0;
         m_render_blocks.clear();
         // next time...