Released 0.4.1

.gitignore

@@ -5,3 +5,4 @@ AudiobookRecorder.jar
 AudiobookRecorder-linux
 AudiobookRecorder-osx.dmg
 AudiobookRecorder-win.exe
+.*.swp

README.md

@@ -10,6 +10,8 @@ A system for easing the task of recording and editing audiobooks.
 * Chapter management
 * Audio effect chains (biquad, delay line, etc)
 
+# [Manual and Tutorial](https://majenkoprojects.github.io/AudiobookRecorder)
+
 Usage
 -----
 
@@ -29,12 +31,13 @@ From here on much is controlled by key presses.
   appended to the currently selected chapter, or to the last chapter if none is selected.
 * Press and hold "T" to record a new phrase that is the start of a new paragraph.  This adds the "post paragraph" gap to the previous sentence. Otherwise it does the same as "R".
 * Press and hold "F" to record a "continuation" phrase. This sets the previous phrase's post-gap to be the "short" gap instead of the normal length gap.
+* Press and hold "Y" to record a new phrase that is the start of a new section. This add the "post section" gap to the previous sentence. Otherwise it does the same as "R".
 * Press "D" to delete the last phrase you recorded.
 * Press "E" to re-record the currently selected phrase.
 
-Each phrase you record will be briefly analysed using FFT to find the start and end of the audio and set
+Each phrase you record can be automatically analysed to find the start and end of the audio and set
 crop marks appropriately.  These can be adjusted in the waveform display when a phrase is selected. You can also
-re-run the analysis using either the default FFT method or using a peak detector method (finding the first and last points
+re-run the analysis using either FFT or a peak detector method (finding the first and last points
 where the audio amplitude rises above the backround noise).
 
 The phrases also have a "post gap" associated with them.  This is the amount of room noise (in milliseconds) to place between
@@ -53,18 +56,14 @@ edit the text of this ID to identify the recordings. You
 may, for instance, change it to have the same text as the
 audio contains.  
 
-To help with this the Haven On-Demand online speech recognition
+The audio can also be automatically converted to text if you have an suitable command-line
-service is integrated with the system and can be used to try and convert the 
+executable that will work. One example is (on Linux) [DeepSpeech](https://github.com/mozilla/DeepSpeech) by Mozilla.
-audio into text.  Right clicking on a recording brings
-up a menu which includes the option to try and convert
-the audio into text.  The detected text is then used to
-replace the current recording ID / text.
 
 File layout
 -----------
 
 All data is stored in your "storage" directory (specified in Options).  Each book (which is a directory named after the
-title of the book) has an associated XML file (audiobook.abk) and a directory "files" where all the audio (stored as WAV
+title of the book) has an associated XML file (audiobook.abx) and a directory "files" where all the audio (stored as WAV
 files) is placed.
 
 When you export the book as MP3 a new folder "export" is created within the book's folder where the MP3 files are placed.
@@ -81,3 +80,26 @@ Building
 5. Build with `ant build`
 6. Run with `java -jar ./AudiobookRecorder.jar`
 
+
+----
+
+Extra Resources
+===============
+
+* DeepSpeech wrapper script
+
+This is a small script that will convert the audio into a format DeepSpeech likes and call the `deepspeech` executable, removing any extra rubbish from the output. It
+also requires `sox` to be installed for the audio conversion.
+
+```
+#!/bin/bash
+
+ID=$$
+FILE=$1
+BINPATH=${HOME}/local/bin
+MODELS=${HOME}/ds/deepspeech-0.6.1-models
+
+sox "$FILE" -r 16000 -c 1 -b 16 "/tmp/ds-${ID}.wav"
+${BINPATH}/deepspeech --model ${MODELS}/output_graph.pbmm --lm ${MODELS}/lm.binary --trie ${MODELS}/trie --audio "/tmp/ds-${ID}.wav" 2>/dev/null
+rm /tmp/ds-${ID}.wav
+```

iircoeff.c

@@ -1,133 +0,0 @@
-/*
- *   Copyright (C) 2002-2006  Felipe Rivera <liebremx at users.sourceforge.net>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- *   Coefficient stuff
- *
- *   $Id: iir_cfs.c,v 1.2 2006/01/15 00:17:46 liebremx Exp $
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-static const double band_f031[] =
-{ 20,25,31.5,40,50,63,80,100,125,160,200,250,315,400,500,630,800,
-  1000,1250,1600,2000,2500,3150,4000,5000,6300,8000,10000,12500,16000,20000
-};
-
-#define GAIN_F0 1.0
-#define GAIN_F1 GAIN_F0 / M_SQRT2
-
-#define SAMPLING_FREQ 44100.0
-#define TETA(f) (2*M_PI*(double)f/sample_frequency)
-#define TWOPOWER(value) (value * value)
-
-#define BETA2(tf0, tf) \
-(TWOPOWER(GAIN_F1)*TWOPOWER(cos(tf0)) \
- - 2.0 * TWOPOWER(GAIN_F1) * cos(tf) * cos(tf0) \
- + TWOPOWER(GAIN_F1) \
- - TWOPOWER(GAIN_F0) * TWOPOWER(sin(tf)))
-#define BETA1(tf0, tf) \
-    (2.0 * TWOPOWER(GAIN_F1) * TWOPOWER(cos(tf)) \
-     + TWOPOWER(GAIN_F1) * TWOPOWER(cos(tf0)) \
-     - 2.0 * TWOPOWER(GAIN_F1) * cos(tf) * cos(tf0) \
-     - TWOPOWER(GAIN_F1) + TWOPOWER(GAIN_F0) * TWOPOWER(sin(tf)))
-#define BETA0(tf0, tf) \
-    (0.25 * TWOPOWER(GAIN_F1) * TWOPOWER(cos(tf0)) \
-     - 0.5 * TWOPOWER(GAIN_F1) * cos(tf) * cos(tf0) \
-     + 0.25 * TWOPOWER(GAIN_F1) \
-     - 0.25 * TWOPOWER(GAIN_F0) * TWOPOWER(sin(tf)))
-
-#define GAMMA(beta, tf0) ((0.5 + beta) * cos(tf0))
-#define ALPHA(beta) ((0.5 - beta)/2.0)
-
-/*************
- * Functions *
- *************/
-
-/* Get the band_f031 at both sides of F0. These will be cut at -3dB */
-static void find_f1_and_f2(double f0, double octave_percent, double *f1, double *f2)
-{
-    double octave_factor = pow(2.0, octave_percent/2.0);
-    *f1 = f0/octave_factor;
-    *f2 = f0*octave_factor;
-}
-
-/* Find the quadratic root
- * Always return the smallest root */
-static int find_root(double a, double b, double c, double *x0) {
-  double k = c-((b*b)/(4.*a));
-  double h = -(b/(2.*a));
-  double x1 = 0.;
-  if (-(k/a) < 0.)
-    return -1;
-  *x0 = h - sqrt(-(k/a));
-  x1 = h + sqrt(-(k/a));
-  if (x1 < *x0)
-    *x0 = x1;
-  return 0;
-}
-
-void calc_coeffs(double sample_frequency)
-{
-  int i, n;
-  double f1, f2;
-  double x0;
-
-    printf("    public final static IIRCoefficients iir_cf31_%d[] = {\n", (int)sample_frequency);
-    for (i = 0; i < 31; i++) {
-
-      /* Find -3dB frequencies for the center freq */
-      find_f1_and_f2(band_f031[i], 1.0/3.0, &f1, &f2);
-      /* Find Beta */
-      if ( find_root(
-            BETA2(TETA(band_f031[i]), TETA(f1)),
-            BETA1(TETA(band_f031[i]), TETA(f1)),
-            BETA0(TETA(band_f031[i]), TETA(f1)),
-            &x0) == 0)
-      {
-        /* Got a solution, now calculate the rest of the factors */
-        /* Take the smallest root always (find_root returns the smallest one)
-         *
-         * NOTE: The IIR equation is
-         *  y[n] = 2 * (alpha*(x[n]-x[n-2]) + gamma*y[n-1] - beta*y[n-2])
-         *  Now the 2 factor has been distributed in the coefficients
-         */
-        /* Now store the coefficients */
-        printf("        /* %.1f Hz */\n", band_f031[i]);
-        printf("        new IIRCoefficients(%.10e, %010e, %.10e),\n",
-            (double)(2.0 * x0),
-            (double)(2.0 * ALPHA(x0)),
-            (double)(2.0 * GAMMA(x0, TETA(band_f031[i])))
-        );
-      } else {
-        printf("  **** Where are the roots?\n");
-      }
-    }// for i
-    printf("    };\n");
-}
-
-int main(int argc, char **argv) {
-    if (argc != 2) {
-        printf("Usage: iircoeff <sample frequency>\n");
-        return -1;
-    }
-
-    double f = strtod(argv[1], NULL);
-    calc_coeffs(f);
-}

iircoeff.pl

@@ -1,76 +0,0 @@
-#!/usr/bin/perl
-
-use Math::Trig;
-
-my $fs = 48000;
-my $q = 1.414;
-
-printCo(20, $fs, $q);
-printCo(25, $fs, $q);
-printCo(31.5, $fs, $q);
-printCo(40, $fs, $q);
-printCo(50, $fs, $q);
-printCo(63, $fs, $q);
-printCo(80, $fs, $q);
-printCo(100, $fs, $q);
-printCo(125, $fs, $q);
-printCo(160, $fs, $q);
-printCo(200, $fs, $q);
-printCo(250, $fs, $q);
-printCo(315, $fs, $q);
-printCo(400, $fs, $q);
-printCo(500, $fs, $q);
-printCo(630, $fs, $q);
-printCo(800, $fs, $q);
-printCo(1000, $fs, $q);
-printCo(1250, $fs, $q);
-printCo(1600, $fs, $q);
-printCo(2000, $fs, $q);
-printCo(2500, $fs, $q);
-printCo(3150, $fs, $q);
-printCo(4000, $fs, $q);
-printCo(5000, $fs, $q);
-printCo(6300, $fs, $q);
-printCo(8000, $fs, $q);
-printCo(10000, $fs, $q);
-printCo(12500, $fs, $q);
-printCo(16000, $fs, $q);
-printCo(20000, $fs, $q);
-
-sub printCo($$$$) {
-    my $f0 = shift;
-    my $fs = shift;
-    my $q = shift;
-
-
-    @coeff = coefficient($f0, $fs, $q);
-    print "/* $f0 Hz */\n";
-    printf("new IIRCoefficients(%.10e, %.10e, %.10e),\n" , $coeff[1] * 2, $coeff[0] * 2, $coeff[2] * 2);
-}
-
-
-sub coefficient($$$$) {
-    my $f0 = shift;
-    my $fs = shift;
-    my $q = shift;
-
-    my $q2 = $q * $q;
-
-    my $f1 = $f0 * (sqrt(1 + (1 / (4 * $q2))) - (1 / (2 * $q)));
-    my $f2 = $f0 * (sqrt(1 + (1 / (4 * $q2))) + (1 / (2 * $q)));
-
-    my $pi = 3.141592653;
-
-    my $theta0 = 2 * $pi * ($f0 / $fs);
-
-    my $thetaOverTwoQ = $theta0 / (2 * $q);
-
-    my $beta = 0.5 * ((1 - tan($thetaOverTwoQ)) / (1 + tan($thetaOverTwoQ)));
-
-    my $gamma = (0.5 + $beta) * cos($theta0);
-    
-    my $alpha = (0.5 - $beta) / 2;
-
-    return ($alpha, $beta, $gamma);
-}
-

resources/uk/co/majenko/audiobookrecorder/config.txt

@@ -1 +1 @@
-version=0.3.6
+version=0.4.1

src/uk/co/majenko/audiobookrecorder/Biquad.java

@@ -1,23 +1,5 @@
 package uk.co.majenko.audiobookrecorder;
 
-//  Biquad.java
-//
-//  Created by Nigel Redmon on 11/24/12
-//  EarLevel Engineering: earlevel.com
-//  Copyright 2012 Nigel Redmon
-//  Translated to Java 2019 Majenko Technologies
-//
-//  For a complete explanation of the Biquad code:
-//  http://www.earlevel.com/main/2012/11/26/biquad-c-source-code/
-//
-//  License:
-//
-//  This source code is provided as is, without warranty.
-//  You may copy and distribute verbatim copies of this document.
-//  You may modify and use this source code to create binary code
-//  for your own purposes, free or commercial.
-//
-
 import java.util.ArrayList;
 
 public class Biquad implements Effect {

src/uk/co/majenko/audiobookrecorder/Book.java

@@ -1,28 +1,40 @@
 package uk.co.majenko.audiobookrecorder;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.UUID;
-import java.util.Properties;
+import java.util.Random;
+import java.util.TimerTask;
+import java.util.TreeMap;
+import java.awt.Image;
 import javax.sound.sampled.AudioFormat;
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 import javax.swing.ImageIcon;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.OutputKeys;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
+import org.xml.sax.SAXException;
 
 public class Book extends BookTreeNode {
     
@@ -32,34 +44,86 @@ public class Book extends BookTreeNode {
     String comment;
     String ACX;
     String manuscript;
-
     String defaultEffect = "none";
-
+    Sentence roomNoise = null;
-    int sampleRate;
-    int channels;
-    int resolution;
-
     String notes = null;
-
     ImageIcon icon;
-
-    Properties prefs;
-
     File location;
+    Random rng = new Random();
+    TreeMap<String, EffectGroup> effects;
+    AudioFormat cachedFormat = null;
 
-    public Book(Properties p, String bookname) {
+    public Book(String bookname) {
         super(bookname);
         Debug.trace();
-        prefs = p;
         name = bookname;
+        location = new File(Options.get("path.storage"), sanitize(name));
         AudiobookRecorder.window.setTitle("AudioBook Recorder :: " + name); // This should be in the load routine!!!!
+        setIcon(Icons.book);
+        roomNoise = new Sentence("room-noise", "Room Noise");
+        roomNoise.setParentBook(this);
+        loadEffects();
     }
 
-    public Book(Element root) {
+    public Book(File inputFile) throws SAXException, IOException, ParserConfigurationException {
-        super(getTextNode(root, "title"));
         Debug.trace();
-        name = getTextNode(root, "title");
+        Debug.d("Loading book from", inputFile.getCanonicalPath());
-        AudiobookRecorder.window.setTitle("AudioBook Recorder :: " + name); // This should be in the load routine!!!!
+        if (inputFile.getName().endsWith(".abx")) {
+            location = inputFile.getParentFile();
+            DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+            Document doc = dBuilder.parse(inputFile);
+            doc.getDocumentElement().normalize();
+            Element root = doc.getDocumentElement();
+
+            name = getTextNode(root, "title");
+            author = getTextNode(root, "author");
+            genre = getTextNode(root, "genre");
+            comment = getTextNode(root, "comment");
+            ACX = getTextNode(root, "acx");
+            manuscript = getTextNode(root, "manuscript");
+            notes = getTextNode(root, "notes");
+
+            Element settings = getNode(root, "settings");
+            Element audioSettings = getNode(settings, "audio");
+            Element effectSettings = getNode(settings, "effects");
+
+            defaultEffect = getTextNode(settings, "default");
+
+            AudiobookRecorder.window.setTitle("AudioBook Recorder :: " + name); // This should be in the load routine!!!!
+
+            loadEffects();
+
+            File cf = new File(location, "coverart.png");
+            if (!cf.exists()) {
+                cf = new File(location, "coverart.jpg");
+                if (!cf.exists()) {
+                    cf = new File(location, "coverart.gif");
+                }
+            }
+
+            if (cf.exists()) {
+                ImageIcon i = new ImageIcon(cf.getAbsolutePath());
+                Image ri = Utils.getScaledImage(i.getImage(), 22, 22);
+                setIcon(new ImageIcon(ri));
+            } else {
+                setIcon(Icons.book);
+            }
+
+            roomNoise = new Sentence("room-noise", "Room Noise");
+            roomNoise.setParentBook(this);
+
+            Element chapters = getNode(root, "chapters");
+            NodeList chapterList = chapters.getElementsByTagName("chapter");
+            for (int i = 0; i < chapterList.getLength(); i++) {
+                Element chapterElement = (Element)chapterList.item(i);
+                Chapter newChapter = new Chapter(chapterElement);
+                newChapter.setParentBook(this);
+                add(newChapter);
+            }
+    
+            AudiobookRecorder.window.updateEffectChains(effects);
+        }
     }
 
     public void loadBookXML(Element root, DefaultTreeModel model) {
@@ -70,18 +134,12 @@ public class Book extends BookTreeNode {
         comment = getTextNode(root, "comment");
         ACX = getTextNode(root, "acx");
         manuscript = getTextNode(root, "manuscript");
-
-        AudiobookRecorder.window.setBookNotes(getTextNode(root, "notes"));
         notes = getTextNode(root, "notes");
 
         Element settings = getNode(root, "settings");
         Element audioSettings = getNode(settings, "audio");
         Element effectSettings = getNode(settings, "effects");
 
-        sampleRate = Utils.s2i(getTextNode(audioSettings, "samplerate"));
-        channels = Utils.s2i(getTextNode(audioSettings, "channels"));
-        resolution = Utils.s2i(getTextNode(audioSettings, "resolution"));
-
         defaultEffect = getTextNode(settings, "default");
 
         AudiobookRecorder.window.setTitle("AudioBook Recorder :: " + name); // This should be in the load routine!!!!
@@ -90,6 +148,9 @@ public class Book extends BookTreeNode {
 
         NodeList chapterList = chapters.getElementsByTagName("chapter");
 
+        roomNoise = new Sentence("room-noise", "Room Noise");
+        roomNoise.setParentBook(this);
+
         for (int i = 0; i < chapterList.getLength(); i++) {
             Element chapterElement = (Element)chapterList.item(i);
             Chapter newChapter = new Chapter(chapterElement, model);
@@ -117,26 +178,18 @@ public class Book extends BookTreeNode {
         return node.getTextContent();
     }
 
+    public void setTitle(String n) { Debug.trace(); name = n; }
     public void setAuthor(String a) { Debug.trace(); author = a; }
     public void setGenre(String g) { Debug.trace(); genre = g; }
     public void setComment(String c) { Debug.trace(); comment = c; }
     public void setACX(String c) { Debug.trace(); ACX = c; }
 
+    public String getTitle() { Debug.trace(); return name; }
     public String getAuthor() { Debug.trace(); return author; }
     public String getGenre() { Debug.trace(); return genre; }
     public String getComment() { Debug.trace(); return comment; }
     public String getACX() { Debug.trace(); if (ACX == null) return ""; return ACX; }
 
-    public Chapter getClosingCredits() {
-        Debug.trace();
-        return getChapterById("close");
-    }
-    
-    public Chapter getOpeningCredits() {
-        Debug.trace();
-        return getChapterById("open");
-    }
-
     @SuppressWarnings("unchecked")
     public Chapter getChapterById(String id) {
         Debug.trace();
@@ -152,14 +205,31 @@ public class Book extends BookTreeNode {
         return null;
     }
 
+    public Chapter getChapterByName(String name) {
+        Debug.trace();
+        for (Enumeration o = children(); o.hasMoreElements();) {
+            Object ob = (Object)o.nextElement();
+            if (ob instanceof Chapter) {
+                Chapter c = (Chapter)ob;
+                if (c.getName().equals(name)) {
+                    return c;
+                }
+            }
+        }
+        return null;
+    }
+
     public Chapter getLastChapter() {
         Debug.trace();
-        Chapter cc = getClosingCredits();
+        DefaultMutableTreeNode leaf = getLastLeaf();
-        if (cc == null) return null;
+        if (leaf instanceof Sentence) {
-        Chapter c = (Chapter)getChildBefore(cc);
+            Sentence s = (Sentence)leaf;
-        if (c == null) return null;
+            return (Chapter)s.getParent();
-        if (c.getId().equals("open")) return null;
+        }
-        return c;
+        if (leaf instanceof Chapter) {
+            return (Chapter)getLastLeaf();
+        } 
+        return null;
     }
 
     public Chapter getChapter(int n) {
@@ -171,7 +241,27 @@ public class Book extends BookTreeNode {
     public Chapter addChapter() {
         Debug.trace();
         String uuid = UUID.randomUUID().toString();
-        return new Chapter(uuid, uuid);
+        Chapter c = new Chapter(uuid, uuid);
+        add(c);
+        c.setParentBook(this);
+        return c;
+    }
+
+    public Chapter addChapter(String name) {
+        Debug.trace();
+        String uuid = UUID.randomUUID().toString();
+        Chapter c = new Chapter(uuid, name);
+        add(c);
+        c.setParentBook(this);
+        return c;
+    }
+
+    public Chapter addChapter(String id, String name) {
+        Debug.trace();
+        Chapter c = new Chapter(id, name);
+        add(c);
+        c.setParentBook(this);
+        return c;
     }
 
     public String getName() {
@@ -198,14 +288,9 @@ public class Book extends BookTreeNode {
         }
     }
 
-    public File getBookPath() {
-        Debug.trace();
-        return new File(Options.get("path.storage"), name);
-    }
-
     public void renameBook(String newName) {
         Debug.trace();
-        File oldDir = getBookPath();
+        File oldDir = location;
         File newDir = new File(Options.get("path.storage"), newName);
 
         if (newDir.exists()) {
@@ -216,8 +301,12 @@ public class Book extends BookTreeNode {
         if (oldDir.exists() && oldDir.isDirectory()) {
             oldDir.renameTo(newDir);
             name = newName;
-            AudiobookRecorder.window.saveBookStructure();
+            try {
-            AudiobookRecorder.window.bookTreeModel.reload(this);
+                save();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            reloadTree();
             Options.set("path.last-book", name);
             Options.savePreferences();
             AudiobookRecorder.window.setTitle("AudioBook Recorder :: " + name);
@@ -229,58 +318,17 @@ public class Book extends BookTreeNode {
         return name;
     }
 
-    @SuppressWarnings("unchecked")
-    public void renumberChapters() {
-        Debug.trace();
-        int id = 1;
-
-        for (Enumeration c = children(); c.hasMoreElements();) {
-            Chapter chp = (Chapter)c.nextElement();
-            if (Utils.s2i(chp.getId()) > 0) {
-                chp.setId(String.format("%04d", id));
-                id++;
-            }
-        }
-    }
-
-    public int getSampleRate() { Debug.trace(); return sampleRate; }
-    public void setSampleRate(int sr) { Debug.trace(); sampleRate = sr; }
-    public int getChannels() { Debug.trace(); return channels; }
-    public void setChannels(int c) { Debug.trace(); channels = c; }
-    public int getResolution() { Debug.trace(); return resolution; }
-    public void setResolution(int r) { Debug.trace(); resolution = r; }
-
     public AudioFormat getAudioFormat() {
         Debug.trace();
-        return new AudioFormat(getSampleRate(), getResolution(), getChannels(), true, false);
+        if (cachedFormat != null) {
-    }
+            return cachedFormat;
-
+        }
-    public String get(String key) {
+        cachedFormat = roomNoise.getAudioFormat();
-        Debug.trace();
+        return cachedFormat;
-        if (prefs.getProperty(key) == null) { return Options.get(key); }
-        return prefs.getProperty(key);
-    }
-
-    public Integer getInteger(String key) {
-        Debug.trace();
-        if (prefs.getProperty(key) == null) { return Options.getInteger(key); }
-        return Utils.s2i(prefs.getProperty(key));
-    }
-
-    public void set(String key, String value) {
-        Debug.trace();
-        prefs.setProperty(key, value);
-    }
-
-    public void set(String key, Integer value) {
-        Debug.trace();
-        prefs.setProperty(key, "" + value);
     }
 
     public File getBookFolder() {
-        Debug.trace();
+        return location;
-        File dir = new File(Options.get("path.storage"), name);
-        return dir;
     }
 
     public ArrayList<String> getUsedEffects() {
@@ -331,19 +379,11 @@ public class Book extends BookTreeNode {
         root.appendChild(makeTextNode(doc, "genre", genre));
         root.appendChild(makeTextNode(doc, "acx", ACX));
         root.appendChild(makeTextNode(doc, "manuscript", manuscript));
-
+        root.appendChild(makeTextNode(doc, "notes", notes));
-        root.appendChild(makeTextNode(doc, "notes", AudiobookRecorder.window.getBookNotes()));
 
         Element settingsNode = doc.createElement("settings");
         root.appendChild(settingsNode);
         
-        Element audioSettingsNode = doc.createElement("audio");
-        settingsNode.appendChild(audioSettingsNode);
-
-        audioSettingsNode.appendChild(makeTextNode(doc, "channels", channels));
-        audioSettingsNode.appendChild(makeTextNode(doc, "resolution", resolution));
-        audioSettingsNode.appendChild(makeTextNode(doc, "samplerate", sampleRate));
-        
         Element effectsNode = doc.createElement("effects");
         settingsNode.appendChild(effectsNode);
         
@@ -409,7 +449,7 @@ public class Book extends BookTreeNode {
     public void setManuscript(File f) {
         Debug.trace();
         manuscript = f.getName();
-        File dst = new File(getBookPath(), manuscript);
+        File dst = new File(location, manuscript);
 
         try {
             Files.copy(f.toPath(), dst.toPath());
@@ -422,29 +462,230 @@ public class Book extends BookTreeNode {
         Debug.trace();
         if (manuscript == null) return null;
         if (manuscript.equals("")) return null;
-        File f = new File(getBookPath(), manuscript);
+        File f = new File(location, manuscript);
         if (f.exists()) { 
             return f;
         }
         return null;
     }
 
-    public void onSelect() {
+    public void onSelect(BookTreeNode target) {
+        Debug.trace();
+        AudiobookRecorder.setSelectedBook(this);
+        if (target == this) {
+            AudiobookRecorder.setSelectedChapter(null);
+            AudiobookRecorder.setSelectedSentence(null);
+        }
+        AudiobookRecorder.window.setBookNotes(notes);
+        AudiobookRecorder.window.noiseFloorLabel.setNoiseFloor(getNoiseFloorDB());
+//        AudiobookRecorder.window.updateEffectChains(effects);
+        TreeNode p = getParent();
+        if (p instanceof BookTreeNode) {
+            BookTreeNode btn = (BookTreeNode)p;
+            btn.onSelect(target);
+        }
     }
 
     public String getNotes() {
+        Debug.trace();
         return notes;
     }
 
     public void setNotes(String n) {
+        Debug.trace();
         notes = n;
     }
 
     public File getLocation() { 
+        Debug.trace();
         return location;
     }
 
     public void setLocation(File l) {
+        Debug.trace();
         location = l;
     }
+
+    public void reloadTree() {
+        Debug.trace();
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                Debug.trace();
+                if (AudiobookRecorder.window == null) return;
+                if (AudiobookRecorder.window.bookTreeModel == null) return;
+                try {
+                    AudiobookRecorder.window.bookTreeModel.reload(Book.this);
+                } catch (Exception ignored) {
+                }
+            }
+        });
+    }
+
+    @Override
+    public Book getBook() {
+        Debug.trace();
+        return this;
+    }
+
+    public byte[] getRoomNoise(int ms) {
+        Debug.trace();
+
+        if (roomNoise == null) return null;
+
+//        roomNoise.setEffectChain(getDefaultEffect());
+        int len = roomNoise.getSampleSize();
+        if (len == 0) return null;
+
+        AudioFormat f = roomNoise.getAudioFormat();
+
+        float sr = f.getSampleRate();
+
+        int samples = (int)(ms * (sr / 1000f));
+
+        int start = rng.nextInt(len - samples);
+        int end = start + samples;
+
+        roomNoise.setStartOffset(start);
+        roomNoise.setEndOffset(end);
+
+        byte[] data = roomNoise.getPCMData();
+
+        return data;
+    }
+
+    public double getNoiseFloor() {
+        Debug.trace();
+        if (roomNoise == null) return 0;
+        return roomNoise.getPeak();
+    }
+
+    public int getNoiseFloorDB() {
+        Debug.trace();
+        if (roomNoise == null) return 0;
+        return roomNoise.getPeakDB();
+    }
+
+    public Sentence getRoomNoiseSentence() {
+        Debug.trace();
+        return roomNoise;
+    }
+
+    public void recordRoomNoise() {
+        Debug.trace();
+        if (roomNoise.startRecording()) {
+
+            java.util.Timer ticker = new java.util.Timer(true);
+            ticker.schedule(new TimerTask() {
+                public void run() {
+                    Debug.trace();
+                    roomNoise.stopRecording();
+                }
+            }, 5000); // 5 seconds of recording
+        }
+    }
+
+    public void loadEffects() {
+        Debug.trace();
+        effects = new TreeMap<String,EffectGroup>();
+        loadEffectsFromFolder(new File(Options.get("path.storage"), "System"));
+        if (location != null) {
+            loadEffectsFromFolder(location);
+        }
+    }
+
+    public void loadEffectsFromFolder(File dir) {
+        Debug.trace();
+        if (dir == null) return;
+        if (!dir.exists()) return;
+        File[] files = dir.listFiles();
+        for (File f : files) {
+            if (f.getName().endsWith(".eff")) {
+                EffectGroup g = loadEffect(f);
+                if (g != null) {
+                    String fn = f.getName().replace(".eff","");
+                    effects.put(fn, g);
+                }
+            }
+        }
+    }
+
+    public EffectGroup loadEffect(File xml) {
+        Debug.trace();
+        try {
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            Document document = builder.parse(xml);
+
+            Element root = document.getDocumentElement();
+            if (root.getTagName().equals("effect")) {
+                EffectGroup g = EffectGroup.loadEffectGroup(root);
+                return g;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    public void save() throws ParserConfigurationException, TransformerConfigurationException, TransformerException {
+        Debug.trace();
+        if (location == null) {
+            location = new File(Options.get("path.storage"), getName());
+        }
+
+        if (!location.exists()) {
+            location.mkdirs();
+        }
+
+        File xml = new File(location, "audiobook.abx");
+        Document doc = buildDocument();
+
+
+        // write the content into xml file
+        TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        Transformer transformer = transformerFactory.newTransformer();
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+        DOMSource source = new DOMSource(doc);
+        StreamResult result = new StreamResult(xml);
+        transformer.transform(source, result);
+    }
+
+    public File getBookFile() {
+        return new File(location, "audiobook.abx");
+    }
+
+    final static int[] illegalChars = {34, 60, 62, 124, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 58, 42, 63, 92, 47};
+
+    static {
+        Arrays.sort(illegalChars);
+    }
+
+    public static String sanitize(String badFileName) {
+        StringBuilder cleanName = new StringBuilder();
+        int len = badFileName.codePointCount(0, badFileName.length());
+        for (int i=0; i<len; i++) {
+            int c = badFileName.codePointAt(i);
+            if (Arrays.binarySearch(illegalChars, c) < 0) {
+                cleanName.appendCodePoint(c);
+            }
+        }
+        return cleanName.toString();
+    }
+
+    @Override
+    public double getLength() {
+        Debug.trace();
+        double len = 0;
+        for (Enumeration o = children(); o.hasMoreElements();) {
+            Object ob = (Object)o.nextElement();
+            if (ob instanceof Chapter) {
+                Chapter c = (Chapter)ob;
+                len += c.getLength();
+            }
+        }
+        return len;
+    }
+
 }

src/uk/co/majenko/audiobookrecorder/BookInfoPanel.java

@@ -83,7 +83,6 @@ public class BookInfoPanel extends JPanel {
         Pattern p = Pattern.compile("\\/titleview\\/([A-Z0-9]{14})");
         Matcher m = p.matcher(acx.getText());
         if (m.find()) {
-            System.err.println(m);
             return m.group(1);
         }
         return acx.getText();

src/uk/co/majenko/audiobookrecorder/BookTreeNode.java

@@ -14,7 +14,8 @@ public abstract class BookTreeNode extends DefaultMutableTreeNode {
 
     public abstract void setNotes(String t);
     public abstract String getNotes();
-
+    public abstract void onSelect(BookTreeNode target);
-    public abstract void onSelect();
+    public abstract Book getBook();
+    public abstract double getLength();
 }
 

src/uk/co/majenko/audiobookrecorder/BookTreeRenderer.java

@@ -2,9 +2,11 @@ package uk.co.majenko.audiobookrecorder;
 
 import java.awt.Component;
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import javax.swing.SwingConstants;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTree;
@@ -84,7 +86,8 @@ public class BookTreeRenderer extends DefaultTreeCellRenderer {
             }
 
 
-            JLabel time = new JLabel(Utils.secToTime(s.getLength(), "mm:ss.SSS") + "     ");
+            JLabel time = new JLabelFixedWidth(75, " " + Utils.secToTime(s.getStartTime(), "mm.ss.SSS") + "     ");
+            time.setHorizontalAlignment(SwingConstants.RIGHT);
 
             ctx.gridx = 0;
             ctx.gridy = 0;
@@ -93,35 +96,38 @@ public class BookTreeRenderer extends DefaultTreeCellRenderer {
             ctx.anchor = GridBagConstraints.LINE_START;
             p.add(ret, ctx);
 
-            if (s.isDetecting()) {
-                JLabel eff = new JLabel(" recognising... ");
-                ctx.weightx = 0.0d;
-                ctx.gridx = 1;
-                p.add(eff);
-            } else if (s.isQueued()) {
-                JLabel eff = new JLabel(" queued ");
-                ctx.weightx = 0.0d;
-                ctx.gridx = 1;
-                p.add(eff);
-            } else if (s.isQueued()) {
-            }
-
             String effectChain = s.getEffectChain();
             if ((effectChain != null) && (!effectChain.equals("none"))) {
-                Effect e = AudiobookRecorder.window.effects.get(effectChain);
+                Effect e = s.getBook().effects.get(effectChain);
                 if (e != null) {
                     JLabel eff = new JLabel(e.toString() + " ");
                     ctx.weightx = 0.0d;
-                    ctx.gridx = 2;
+                    ctx.gridx = 1;
                     p.add(eff);
                 }
             }
 
+
+            if (s.isProcessing()) {
+                JLabel eff = new JLabel();
+                eff.setIcon(Icons.processing);
+                ctx.weightx = 0.0d;
+                ctx.gridx = 2;
+                p.add(eff);
+            } else if (s.isQueued()) {
+                JLabel eff = new JLabel();
+                eff.setIcon(Icons.queued);
+                ctx.weightx = 0.0d;
+                ctx.gridx = 2;
+                p.add(eff);
+            }
+
             ctx.weightx = 0.0d;
             ctx.gridx = 3;
             ctx.anchor = GridBagConstraints.LINE_END;
             int peak = s.getPeakDB();
-            JLabel peakLabel = new JLabel(peak + "dB ");
+            JLabel peakLabel = new JLabelFixedWidth(50, peak + "dB ");
+            peakLabel.setHorizontalAlignment(SwingConstants.RIGHT);
             if (peak > 0) {
                 peakLabel.setForeground(new Color(0xCC, 0x00, 0x00));
             }
@@ -175,7 +181,7 @@ public class BookTreeRenderer extends DefaultTreeCellRenderer {
             ret.setIcon(b.getIcon());
             p.add(ret, ctx);
 
-            JLabel author = new JLabel(b.getAuthor());
+            JLabel author = new JLabel(b.getAuthor() + " - " + Utils.secToTime(b.getLength(), "HH:mm:ss"));
             ctx.gridy++;
             author.setBorder(new EmptyBorder(0, 27, 0, 0));
             Font f = author.getFont();

src/uk/co/majenko/audiobookrecorder/Chain.java

@@ -15,7 +15,7 @@ public class Chain implements Effect {
 
     public void process(double[][] samples) {
         if (target != null) {
-            Effect t = AudiobookRecorder.window.effects.get(target);
+            Effect t = AudiobookRecorder.window.getBook().effects.get(target);
             if (t != null) {
                 t.process(samples);
             }
@@ -40,7 +40,7 @@ public class Chain implements Effect {
 
     public void init(double sf) {
         if (target != null) {
-            Effect t = AudiobookRecorder.window.effects.get(target);
+            Effect t = AudiobookRecorder.window.getBook().effects.get(target);
             if (t != null) {
                 t.init(sf);
             }

src/uk/co/majenko/audiobookrecorder/Chapter.java

@@ -9,6 +9,7 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
 
 import it.sauronsoftware.jave.FFMPEGLocator;
 import it.sauronsoftware.jave.AudioAttributes;
@@ -52,6 +53,7 @@ public class Chapter extends BookTreeNode {
     int postGap;
 
     String notes;
+    Book parentBook = null;
 
     public Chapter(String i, String chaptername) {
         super(chaptername);
@@ -81,6 +83,25 @@ public class Chapter extends BookTreeNode {
         }
     }
 
+    public Chapter(Element root) {
+        Debug.trace();
+        name = Book.getTextNode(root, "name");
+        id = root.getAttribute("id");
+        preGap = Utils.s2i(Book.getTextNode(root, "pre-gap"));
+        postGap = Utils.s2i(Book.getTextNode(root, "post-gap"));
+
+        notes = Book.getTextNode(root, "notes");
+
+        Element sentencesNode = Book.getNode(root, "sentences");
+        NodeList sentences = sentencesNode.getElementsByTagName("sentence");
+
+        for (int i = 0; i < sentences.getLength(); i++) {
+            Element sentenceElement = (Element)sentences.item(i);
+            Sentence newSentence = new Sentence(sentenceElement);
+            add(newSentence);
+        }
+    }
+
     public String getId() {
         Debug.trace();
         return id;
@@ -149,7 +170,7 @@ public class Chapter extends BookTreeNode {
 
         if (getChildCount() == 0) return;
 
-        Book book = AudiobookRecorder.window.book;
+        Book book = getBook();
 
         File bookRoot = new File(Options.get("path.storage"), book.getName());
         if (!bookRoot.exists()) {
@@ -183,7 +204,7 @@ public class Chapter extends BookTreeNode {
         attributes.setAudioAttributes(audioAttributes);
 
 
-        AudioFormat sampleformat = AudiobookRecorder.window.roomNoise.getAudioFormat();
+        AudioFormat sampleformat = getBook().getRoomNoiseSentence().getAudioFormat();
         AudioFormat format = new AudioFormat(sampleformat.getSampleRate(), 16, 2, true, false);
         byte[] data;
 
@@ -201,7 +222,7 @@ public class Chapter extends BookTreeNode {
         File taggedFile = new File(export, book.getName() + " - " + name + ".mp3");
 
         FileOutputStream fos = new FileOutputStream(exportFile);
-        data = AudiobookRecorder.window.getRoomNoise(Utils.s2i(Options.get("catenation.pre-chapter")));
+        data = getBook().getRoomNoise(Utils.s2i(Options.get("catenation.pre-chapter")));
         fullLength += data.length;
         fos.write(data);
 
@@ -218,9 +239,9 @@ public class Chapter extends BookTreeNode {
             fos.write(data);
 
             if (s.hasMoreElements()) {
-                data = AudiobookRecorder.window.getRoomNoise(snt.getPostGap());
+                data = getBook().getRoomNoise(snt.getPostGap());
             } else {
-                data = AudiobookRecorder.window.getRoomNoise(Utils.s2i(Options.get("catenation.post-chapter")));
+                data = getBook().getRoomNoise(Utils.s2i(Options.get("catenation.post-chapter")));
             }
             fullLength += data.length;
             fos.write(data);
@@ -348,11 +369,21 @@ public class Chapter extends BookTreeNode {
         notes = t;
     }
 
-    public void onSelect() {
+    public void onSelect(BookTreeNode target) {
         Debug.trace();
+        AudiobookRecorder.setSelectedChapter(this);
+        if (target == this) {
+            AudiobookRecorder.setSelectedSentence(null);
+        }
         AudiobookRecorder.window.setChapterNotes(notes);
+        TreeNode p = getParent();
+        if (p instanceof BookTreeNode) {
+            BookTreeNode btn = (BookTreeNode)p;
+            btn.onSelect(target);
+        }
     }
 
+    @Override
     public double getLength() {
         Debug.trace();
         double len = 0;
@@ -361,9 +392,32 @@ public class Chapter extends BookTreeNode {
             if (ob instanceof Sentence) {
                 Sentence s = (Sentence)ob;
                 len += s.getLength();
+                len += (s.getPostGap() / 1000d);
             }
         }
+
+        if (len > 0) {
+            len += (getPreGap() / 1000d);
+            len += (getPostGap() / 1000d);
+        }
         return len;
     }
 
+    @Override
+    public Book getBook() {
+        if (parentBook != null) return parentBook;
+        if (getParent() == null) return null;
+        return (Book)getParent();
+    }
+
+    public void setParentBook(Book me) {
+        parentBook = me;
+        for (Enumeration o = children(); o.hasMoreElements();) {
+            Object ob = (Object)o.nextElement();
+            if (ob instanceof Sentence) {
+                Sentence s = (Sentence)ob;
+                s.setParentBook(me);
+            }
+        }
+    }
 }

src/uk/co/majenko/audiobookrecorder/DelayLine.java

@@ -45,27 +45,13 @@ public class DelayLine implements Effect {
             for (int i = 0; i < subSamples[Sentence.LEFT].length; i++) {
                 int off = i + d.getSamples();
                 if ((off < samples[Sentence.LEFT].length) && (off > 0)) {
-                    samples[Sentence.LEFT][off] = mix(samples[Sentence.LEFT][off], subSamples[Sentence.LEFT][i]);
+                    samples[Sentence.LEFT][off] = Utils.mix(samples[Sentence.LEFT][off], subSamples[Sentence.LEFT][i]);
-                    samples[Sentence.RIGHT][off] = mix(samples[Sentence.RIGHT][off], subSamples[Sentence.RIGHT][i]);
+                    samples[Sentence.RIGHT][off] = Utils.mix(samples[Sentence.RIGHT][off], subSamples[Sentence.RIGHT][i]);
                 }
             }
         }
     }
 
-    double mix(double a, double b) {
-        double out;
-
-        if ((a < 0) && (b < 0)) {
-            out = (a + b) - (a * b);
-        } else if ((a > 0) && (b > 0)) {
-            out = (a + b) - (a * b);
-        } else {
-            out = a + b;
-        }
-
-        return out;
-    }
-
     public DelayLineStore addDelayLine(int samples, double gain, double pan) {
         DelayLineStore s = new DelayLineStore(samples, gain, pan);
         delayLines.add(s);

src/uk/co/majenko/audiobookrecorder/EffectGroup.java

@@ -1,6 +1,10 @@
 package uk.co.majenko.audiobookrecorder;
 
 import java.util.ArrayList;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
 
 public class EffectGroup implements Effect {
     String name;
@@ -66,4 +70,259 @@ public class EffectGroup implements Effect {
             e.init(sf);
         }
     }
+
+
+
+    public static EffectGroup loadEffectGroup(Element root) {
+        Debug.trace();
+        EffectGroup group = new EffectGroup(root.getAttribute("name"));
+        NodeList kids = root.getChildNodes();
+        for (int i = 0; i < kids.getLength(); i++) {
+            Node kid = kids.item(i);
+            if (kid instanceof Element) {
+                Element e = (Element)kid;
+                if (e.getTagName().equals("biquad")) {
+                    Effect eff = (Effect)loadBiquad(e);
+                    if (eff != null) {
+                        group.addEffect(eff);
+                    }
+                } else if (e.getTagName().equals("delayline")) {
+                    Effect eff = (Effect)loadDelayLine(e);
+                    if (eff != null) {
+                        group.addEffect(eff);
+                    }
+                } else if (e.getTagName().equals("pan")) {
+                    Effect eff = (Effect)loadPan(e);
+                    if (eff != null) {
+                        group.addEffect(eff);
+                    }
+                } else if (e.getTagName().equals("amplifier")) {
+                    Effect eff = (Effect)loadAmplifier(e);
+                    if (eff != null) {
+                        group.addEffect(eff);
+                    }
+                } else if (e.getTagName().equals("chain")) {
+                    Effect eff = (Effect)loadChain(e);
+                    if (eff != null) {
+                        group.addEffect(eff);
+                    }
+                } else if (e.getTagName().equals("group")) {
+                    Effect eff = (Effect)loadEffectGroup(e);
+                    if (eff != null) {
+                        group.addEffect(eff);
+                    }
+                } else if (e.getTagName().equals("lfo")) {
+                    Effect eff = (Effect)loadLFO(e);
+                    if (eff != null) {
+                        group.addEffect(eff);
+                    }
+                } else if (e.getTagName().equals("agc")) {
+                    Effect eff = (Effect)loadAGC(e);
+                    if (eff != null) {
+                        group.addEffect(eff);
+                    }
+                } else if (e.getTagName().equals("clipping")) {
+                    Effect eff = (Effect)loadClipping(e);
+                    if (eff != null) {
+                        group.addEffect(eff);
+                    }
+                }
+            }
+        }
+        return group;
+    }
+
+    public static Biquad loadBiquad(Element root) {
+        Debug.trace();
+        String type = root.getAttribute("type").toLowerCase();
+        Biquad bq = new Biquad();
+
+        if (type.equals("lowpass")) {
+            bq.setType(Biquad.Lowpass);
+        } else if (type.equals("highpass")) {
+            bq.setType(Biquad.Highpass);
+        } else if (type.equals("bandpass")) {
+            bq.setType(Biquad.Bandpass);
+        } else if (type.equals("notch")) {
+            bq.setType(Biquad.Notch);
+        }  else if (type.equals("peak")) {
+            bq.setType(Biquad.Peak);
+        } else if (type.equals("lowshelf")) {
+            bq.setType(Biquad.Lowshelf);
+        } else if (type.equals("highshelf")) {
+            bq.setType(Biquad.Highshelf);
+        } else {
+            Debug.d("Bad Biquad type:", type);
+            return null;
+        }
+
+        bq.setQ(Utils.s2d(root.getAttribute("q")));
+        bq.setFc(Utils.s2d(root.getAttribute("fc")));
+        bq.setPeakGain(Utils.s2d(root.getAttribute("gain")));
+        return bq;
+    }
+    public static DelayLine loadDelayLine(Element root) {
+        Debug.trace();
+        DelayLine line = new DelayLine();
+
+        NodeList list = root.getChildNodes();
+        if (Utils.s2b(root.getAttribute("wetonly"))) {
+            line.setWetOnly(true);
+        }
+
+        for (int i = 0; i < list.getLength(); i++) {
+            Node n = list.item(i);
+            if (n instanceof Element) {
+                Element e = (Element)n;
+                if (e.getTagName().equals("delay")) {
+                    int samples = Utils.s2i(e.getAttribute("samples"));
+                    double gain = Utils.s2d(e.getAttribute("gain"));
+                    double pan = Utils.s2d(e.getAttribute("pan"));
+                    DelayLineStore store = line.addDelayLine(samples, gain, pan);
+
+
+                    NodeList inner = e.getChildNodes();
+                    for (int j = 0; j < inner.getLength(); j++) {
+                        Node in = inner.item(j);
+                        if (in instanceof Element) {
+                            Element ie = (Element)in;
+
+                            if (ie.getTagName().equals("biquad")) {
+                                Effect eff = (Effect)loadBiquad(ie);
+                                if (eff != null) {
+                                    store.addEffect(eff);
+                                }
+                            } else if (ie.getTagName().equals("delayline")) {
+                                Effect eff = (Effect)loadDelayLine(ie);
+                                if (eff != null) {
+                                    store.addEffect(eff);
+                                }
+                            } else if (ie.getTagName().equals("pan")) {
+                                Effect eff = (Effect)loadPan(ie);
+                                if (eff != null) {
+                                    store.addEffect(eff);
+                                }
+                            } else if (ie.getTagName().equals("amplifier")) {
+                                Effect eff = (Effect)loadAmplifier(ie);
+                                if (eff != null) {
+                                    store.addEffect(eff);
+                                }
+                            } else if (ie.getTagName().equals("chain")) {
+                                Effect eff = (Effect)loadChain(ie);
+                                if (eff != null) {
+                                    store.addEffect(eff);
+                                }
+                            } else if (ie.getTagName().equals("group")) {
+                                Effect eff = (Effect)loadEffectGroup(ie);
+                                if (eff != null) {
+                                    store.addEffect(eff);
+                                }
+                            } else if (ie.getTagName().equals("lfo")) {
+                                Effect eff = (Effect)loadLFO(ie);
+                                if (eff != null) {
+                                    store.addEffect(eff);
+                                }
+                            } else if (ie.getTagName().equals("agc")) {
+                                Effect eff = (Effect)loadAGC(ie);
+                                if (eff != null) {
+                                    store.addEffect(eff);
+                                }
+                            } else if (ie.getTagName().equals("clipping")) {
+                                Effect eff = (Effect)loadClipping(ie);
+                                if (eff != null) {
+                                    store.addEffect(eff);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return line;
+    }
+
+    public static Amplifier loadAmplifier(Element root) {
+        Debug.trace();
+        Amplifier a = new Amplifier(Utils.s2d(root.getAttribute("gain")));
+        return a;
+    }
+
+    public static Chain loadChain(Element root) {
+        Debug.trace();
+        Chain c = new Chain(root.getAttribute("src"));
+        return c;
+    }
+
+    public static Pan loadPan(Element root) {
+        Debug.trace();
+        Pan p = new Pan(Utils.s2d(root.getAttribute("pan")));
+        return p;
+    }
+
+    public static Clipping loadClipping(Element root) {
+        Debug.trace();
+        Clipping c = new Clipping(Utils.s2d(root.getAttribute("clip")));
+        return c;
+    }
+
+    public static LFO loadLFO(Element root) {
+        Debug.trace();
+        double f = Utils.s2d(root.getAttribute("frequency"));
+        double d = Utils.s2d(root.getAttribute("depth"));
+        double p = Utils.s2d(root.getAttribute("phase"));
+        double dty = Math.PI;
+        String waveform = root.getAttribute("waveform");
+        if (waveform == null) {
+            waveform = "sine";
+        }
+
+        int w = LFO.SINE;
+
+        switch (waveform.toLowerCase()) {
+            case "sine": w = LFO.SINE; break;
+            case "cosine": w = LFO.COSINE; break;
+            case "square": w = LFO.SQUARE; break;
+            case "triangle": w = LFO.TRIANGLE; break;
+            case "sawtooth": w = LFO.SAWTOOTH; break;
+        }
+
+        int m = LFO.ADD;
+
+        String mode = root.getAttribute("mode");
+
+        if (mode == null) {
+            mode = "add";
+        }
+
+        switch (mode.toLowerCase()) {
+            case "add": m = LFO.ADD; break;
+            case "replace": m = LFO.REPLACE; break;
+        }
+
+        if (root.getAttribute("duty") != null) {
+            int di = Utils.s2i(root.getAttribute("duty")); // 0-100;
+            dty = (Math.PI * 2) * ((double)di / 100d);
+        }
+        return new LFO(f, d, p, w, dty, m);
+    }
+
+    public static AGC loadAGC(Element root) {
+        Debug.trace();
+        double ceiling = Utils.s2d(root.getAttribute("ceiling"));
+        double limit = Utils.s2d(root.getAttribute("limit"));
+        double attack = Utils.s2d(root.getAttribute("attack"));
+        double decay = Utils.s2d(root.getAttribute("decay"));
+        if (ceiling < 0.0001d) {
+            ceiling = 0.708d; // -3dB
+        }
+        if (limit < 0.0001d) {
+            limit = 1d; // No gain
+        }
+        AGC agc = new AGC(ceiling, attack, decay, limit);
+        return agc;
+    }
+
+
+
 }

src/uk/co/majenko/audiobookrecorder/FFT.java

@@ -1,130 +1,93 @@
 package uk.co.majenko.audiobookrecorder;
 
-/**
-* @author Orlando Selenu
-*
-*/
 public class FFT {
-/**
+    public static double[] fft(final double[] inputReal, double[] inputImag, boolean DIRECT) {
- * The Fast Fourier Transform (generic version, with NO optimizations).
+        int n = inputReal.length;
- *
- * @param inputReal
- *            an array of length n, the real part
- * @param inputImag
- *            an array of length n, the imaginary part
- * @param DIRECT
- *            TRUE = direct transform, FALSE = inverse transform
- * @return a new array of length 2n
- */
-public static double[] fft(final double[] inputReal, double[] inputImag,
-                           boolean DIRECT) {
-    // - n is the dimension of the problem
-    // - nu is its logarithm in base e
-    int n = inputReal.length;
 
-    // If n is a power of 2, then ld is an integer (_without_ decimals)
+        double ld = Math.log(n) / Math.log(2.0);
-    double ld = Math.log(n) / Math.log(2.0);
 
-    // Here I check if n is a power of 2. If exist decimals in ld, I quit
+        if (((int) ld) - ld != 0) {
-    // from the function returning null.
+            System.out.println("The number of elements is not a power of 2.");
-    if (((int) ld) - ld != 0) {
+            return null;
-        System.out.println("The number of elements is not a power of 2.");
+        }
-        return null;
-    }
 
-    // Declaration and initialization of the variables
+        int nu = (int) ld;
-    // ld should be an integer, actually, so I don't lose any information in
+        int n2 = n / 2;
-    // the cast
+        int nu1 = nu - 1;
-    int nu = (int) ld;
+        double[] xReal = new double[n];
-    int n2 = n / 2;
+        double[] xImag = new double[n];
-    int nu1 = nu - 1;
+        double tReal, tImag, p, arg, c, s;
-    double[] xReal = new double[n];
+        
-    double[] xImag = new double[n];
+        double constant;
-    double tReal, tImag, p, arg, c, s;
+        if (DIRECT) {
+            constant = -2 * Math.PI;
+        } else {
+            constant = 2 * Math.PI;
+        }
 
-    // Here I check if I'm going to do the direct transform or the inverse
+        for (int i = 0; i < n; i++) {
-    // transform.
+            xReal[i] = inputReal[i];
-    double constant;
+            xImag[i] = inputImag[i];
-    if (DIRECT)
+        }
-        constant = -2 * Math.PI;
-    else
-        constant = 2 * Math.PI;
 
-    // I don't want to overwrite the input arrays, so here I copy them. This
+        int k = 0;
-    // choice adds \Theta(2n) to the complexity.
+        for (int l = 1; l <= nu; l++) {
-    for (int i = 0; i < n; i++) {
+            while (k < n) {
-        xReal[i] = inputReal[i];
+                for (int i = 1; i <= n2; i++) {
-        xImag[i] = inputImag[i];
+                    p = bitreverseReference(k >> nu1, nu);
-    }
+                    // direct FFT or inverse FFT
-
+                    arg = constant * p / n;
-    // First phase - calculation
+                    c = Math.cos(arg);
-    int k = 0;
+                    s = Math.sin(arg);
-    for (int l = 1; l <= nu; l++) {
+                    tReal = xReal[k + n2] * c + xImag[k + n2] * s;
-        while (k < n) {
+                    tImag = xImag[k + n2] * c - xReal[k + n2] * s;
-            for (int i = 1; i <= n2; i++) {
+                    xReal[k + n2] = xReal[k] - tReal;
-                p = bitreverseReference(k >> nu1, nu);
+                    xImag[k + n2] = xImag[k] - tImag;
-                // direct FFT or inverse FFT
+                    xReal[k] += tReal;
-                arg = constant * p / n;
+                    xImag[k] += tImag;
-                c = Math.cos(arg);
+                    k++;
-                s = Math.sin(arg);
+                }
-                tReal = xReal[k + n2] * c + xImag[k + n2] * s;
+                k += n2;
-                tImag = xImag[k + n2] * c - xReal[k + n2] * s;
-                xReal[k + n2] = xReal[k] - tReal;
-                xImag[k + n2] = xImag[k] - tImag;
-                xReal[k] += tReal;
-                xImag[k] += tImag;
-                k++;
             }
-            k += n2;
+            k = 0;
+            nu1--;
+            n2 /= 2;
         }
+
         k = 0;
-        nu1--;
+        int r;
-        n2 /= 2;
+        while (k < n) {
-    }
+            r = bitreverseReference(k, nu);
-
+            if (r > k) {
-    // Second phase - recombination
+                tReal = xReal[k];
-    k = 0;
+                tImag = xImag[k];
-    int r;
+                xReal[k] = xReal[r];
-    while (k < n) {
+                xImag[k] = xImag[r];
-        r = bitreverseReference(k, nu);
+                xReal[r] = tReal;
-        if (r > k) {
+                xImag[r] = tImag;
-            tReal = xReal[k];
+            }
-            tImag = xImag[k];
+            k++;
-            xReal[k] = xReal[r];
-            xImag[k] = xImag[r];
-            xReal[r] = tReal;
-            xImag[r] = tImag;
         }
-        k++;
+
+        double[] newArray = new double[xReal.length * 2];
+        double radice = 1 / Math.sqrt(n);
+        for (int i = 0; i < newArray.length; i += 2) {
+            int i2 = i / 2;
+            newArray[i] = xReal[i2] * radice;
+            newArray[i + 1] = xImag[i2] * radice;
+        }
+        return newArray;
     }
 
-    // Here I have to mix xReal and xImag to have an array (yes, it should
+    private static int bitreverseReference(int j, int nu) {
-    // be possible to do this stuff in the earlier parts of the code, but
+        int j2;
-    // it's here to readibility).
+        int j1 = j;
-    double[] newArray = new double[xReal.length * 2];
+        int k = 0;
-    double radice = 1 / Math.sqrt(n);
+        for (int i = 1; i <= nu; i++) {
-    for (int i = 0; i < newArray.length; i += 2) {
+            j2 = j1 / 2;
-        int i2 = i / 2;
+            k = 2 * k + j1 - 2 * j2;
-        // I used Stephen Wolfram's Mathematica as a reference so I'm going
+            j1 = j2;
-        // to normalize the output while I'm copying the elements.
+        }
-        newArray[i] = xReal[i2] * radice;
+        return k;
-        newArray[i + 1] = xImag[i2] * radice;
     }
-    return newArray;
-}
-
-/**
- * The reference bitreverse function.
- */
-private static int bitreverseReference(int j, int nu) {
-    int j2;
-    int j1 = j;
-    int k = 0;
-    for (int i = 1; i <= nu; i++) {
-        j2 = j1 / 2;
-        k = 2 * k + j1 - 2 * j2;
-        j1 = j2;
-    }
-    return k;
-  }
 }

src/uk/co/majenko/audiobookrecorder/Icons.java

@@ -40,4 +40,8 @@ public class Icons {
     static public final ImageIcon disable     = new ImageIcon(Icons.class.getResource("icons/disable-effects.png"));
     static public final ImageIcon manuscript  = new ImageIcon(Icons.class.getResource("icons/manuscript.png"));
     static public final ImageIcon tooltip     = new ImageIcon(Icons.class.getResource("icons/tooltip.png"));
+    static public final ImageIcon queued      = new ImageIcon(Icons.class.getResource("icons/queued.png"));
+    static public final ImageIcon processing  = new ImageIcon(Icons.class.getResource("icons/processing.png"));
+    static public final ImageIcon close       = new ImageIcon(Icons.class.getResource("icons/close.png"));
+    static public final ImageIcon refresh     = new ImageIcon(Icons.class.getResource("icons/refresh.png"));
 }

src/uk/co/majenko/audiobookrecorder/JLabelFixedWidth.java

@@ -0,0 +1,38 @@
+package uk.co.majenko.audiobookrecorder;
+
+import javax.swing.JLabel;
+import java.awt.Dimension;
+
+public class JLabelFixedWidth extends JLabel {
+    int width = 0;
+    int height = 0;
+    Dimension size;
+    public JLabelFixedWidth(int w, String txt) {
+        super(txt);
+        JLabel t = new JLabel(txt);
+        size = t.getPreferredSize();
+        size.width = w;
+    }
+
+    public JLabelFixedWidth(int w) {
+        super();
+        JLabel t = new JLabel("nothing");
+        size = t.getPreferredSize();
+        size.width = w;
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+        return size;
+    }
+
+    @Override
+    public Dimension getMaximumSize() {
+        return size;
+    }
+
+    @Override
+    public Dimension getMinimumSize() {
+        return size;
+    }
+}

src/uk/co/majenko/audiobookrecorder/KVPair.java

@@ -14,10 +14,6 @@ public class KVPair<K,V> implements Comparable {
     }
 
     public int compareTo(Object o) {
-//        if (o instanceof KVPair) {
-//            KVPair ko = (KVPair)o;
-//            return key.compareTo(ko.key);
-//        }
         return 0;
     }
 

src/uk/co/majenko/audiobookrecorder/MainToolBar.java

@@ -19,7 +19,6 @@ public class MainToolBar extends JToolBar {
     JButtonSpacePlay playonSentence;
     JButtonSpacePlay playtoSentence;
     JButtonSpacePlay stopPlaying;
-    JButtonSpacePlay eq;
     JButtonSpacePlay openManuscript;
     JToggleButtonSpacePlay mic;
 
@@ -50,7 +49,7 @@ public class MainToolBar extends JToolBar {
 
         saveBook = new JButtonSpacePlay(Icons.save, "Save Book", new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                root.saveBookStructure();
+                root.saveAllBooks();
             }
         });
         add(saveBook);
@@ -66,7 +65,7 @@ public class MainToolBar extends JToolBar {
 
         recordRoomNoise = new JButtonSpacePlay(Icons.recordRoom, "Record Room Noise", new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-                root.recordRoomNoise();
+                root.getBook().recordRoomNoise();
             }
         });
         add(recordRoomNoise);
@@ -102,16 +101,6 @@ public class MainToolBar extends JToolBar {
         });
         add(stopPlaying);
 
-        addSeparator();
-        eq = new JButtonSpacePlay(Icons.eq, "Reload Effects", new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                root.loadEffects();
-                CacheManager.purgeCache();
-            }
-        });
-
-        add(eq);
-
         addSeparator();
 
         mic = new JToggleButtonSpacePlay(Icons.mic, "Enable / disable microphone", new ActionListener() {
@@ -119,7 +108,7 @@ public class MainToolBar extends JToolBar {
             public void actionPerformed(ActionEvent e) {
                 JToggleButton b = (JToggleButton)e.getSource();
                 if (b.isSelected()) {
-                    if (!root.enableMicrophone()) {
+                    if (!Microphone.start()) {
                         b.setSelected(false);
                     } else {
                         if (bgCol == null) {
@@ -128,7 +117,7 @@ public class MainToolBar extends JToolBar {
                         b.setBackground(Color.RED);
                     }
                 } else {
-                    root.disableMicrophone();
+                    Microphone.stop();
                     if (bgCol != null) {
                         b.setBackground(bgCol);
                     }

src/uk/co/majenko/audiobookrecorder/Microphone.java

@@ -0,0 +1,77 @@
+package uk.co.majenko.audiobookrecorder;
+
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Mixer;
+import javax.sound.sampled.SourceDataLine;
+import javax.sound.sampled.TargetDataLine;
+import javax.sound.sampled.AudioInputStream;
+
+import javax.swing.JOptionPane;
+
+public class Microphone {
+
+    public static TargetDataLine device = null;
+    public static AudioInputStream stream = null;
+
+    public static boolean start() {
+        Debug.trace();
+        AudioFormat format = Options.getAudioFormat();
+        Mixer.Info mixer = Options.getRecordingMixer();
+
+        device = null;
+
+        try {
+            device = AudioSystem.getTargetDataLine(format, mixer);
+        } catch (Exception e) {
+            e.printStackTrace();
+            device = null;
+            return false;
+        }
+
+        if (device == null) {
+            JOptionPane.showMessageDialog(AudiobookRecorder.window, "Sample format not supported", "Error", JOptionPane.ERROR_MESSAGE);
+            return false;
+        }
+
+        stream = new AudioInputStream(device);
+
+        try {
+            device.open();
+        } catch (Exception e) {
+            e.printStackTrace();
+            device = null;
+            return false;
+        }
+
+        device.start();
+        return true;
+    }
+
+    public static void stop() {
+        Debug.trace();
+        try {
+            stream.close();
+            device.stop();
+            device.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        device = null;
+        stream = null;
+    } 
+
+    public static AudioInputStream getStream() {
+        return stream;
+    }
+
+    public static TargetDataLine getDevice() {
+        return device;
+    }
+
+    public static void flush() {
+        if (device != null) {
+            device.flush();
+        }
+    }
+}

src/uk/co/majenko/audiobookrecorder/NoiseFloor.java

@@ -0,0 +1,51 @@
+package uk.co.majenko.audiobookrecorder;
+
+import javax.swing.JPanel;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.awt.Dimension;
+import java.awt.Color;
+
+public class NoiseFloor extends JPanel {
+
+    int noiseFloor = 0;
+
+    public NoiseFloor() {
+        super();
+        noiseFloor = 0;
+    }
+
+    public void setNoiseFloor(int n) {
+        noiseFloor = n;
+        repaint();
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+        return new Dimension(128, 24);
+    }
+
+    @Override
+    public Dimension getMinimumSize() {
+        return getPreferredSize();
+    }
+
+    @Override
+    public Dimension getMaximumSize() {
+        return getPreferredSize();
+    }
+
+    @Override
+    public void paintComponent(Graphics g) {
+        Rectangle size = g.getClipBounds();
+        g.setColor(getBackground());
+        g.fillRect(0, 0, size.width - 1, size.height - 1);
+        g.setColor(new Color(10, 10, 10));
+        g.drawRect(0, 0, size.width - 1, size.height - 1);
+        g.setFont(getFont());
+
+        g.setColor(getForeground());
+        g.drawString("Noise Floor: " + noiseFloor + "dB", 6, 16);
+    }
+}
+

src/uk/co/majenko/audiobookrecorder/OpenBookPanel.java

@@ -121,7 +121,7 @@ public class OpenBookPanel extends JPanel {
                             c = c.getParent();
                         }
                         if (c == null) {
-                            System.err.println("Could not get option pane!");
+                            Debug.d("Could not get option pane!");
                         } else {
                             JOptionPane op = (JOptionPane)c;
                             op.setValue(JOptionPane.OK_OPTION);

src/uk/co/majenko/audiobookrecorder/Options.java

@@ -114,6 +114,7 @@ public class Options extends JDialog {
         panel.add(t, constraint);
 
         for (KVPair p : options) {
+            if (p == null) continue;
             if (p.key.equals(def)) {
                 o.setSelectedItem(p);
             }
@@ -388,7 +389,7 @@ public class Options extends JDialog {
 
         enableParsing = addCheckBox(optionsPanel, "Enable automatic speech-to-text (**SLOW**)", getBoolean("process.sphinx"), "This will automatically start recognising the speech in every sentence you record. This can really slow down recording though so it's recommended to leave it turned off and do your recognition afterwards as a batch operation.");
         speechCommand = addTextField(optionsPanel, "Speech to text command (must take 1 filename parameter):", get("process.command"), "This specifies what command to run to recognize the speech. This command must take only one parameter, which is the full path of the WAV file. It should return (on standard output) the recognised speech.");
-        workerThreads = addSpinner(optionsPanel, "Worker threads:", 1, 100, 1, getInteger("process.threads"), "", "How many concurrent threads to run when processing speech. This should ideally be no more than the number of CPU cores you have in your computer.");
+        workerThreads = addSpinner(optionsPanel, "Worker threads:", 1, 100, 1, getInteger("process.threads"), "", "How many concurrent threads to run when processing speech. This should ideally be no more than the number of CPU cores you have in your computer minus one.");
     
         addSeparator(optionsPanel);
 
@@ -495,49 +496,37 @@ public class Options extends JDialog {
 
     @SuppressWarnings("unchecked")
     static KVPair<String, String>[] getRecordingMixerList() {
-        TreeSet<KVPair<String, String>> list = new TreeSet<KVPair<String, String>>();
+        return getMixerList(TargetDataLine.class);
-
-        AudioFormat stereoFormat = new AudioFormat(44100f, 16, 2, true, false);
-        AudioFormat monoFormat = new AudioFormat(44100f, 16, 1, true, false);
-
-        DataLine.Info stereoDIF = new DataLine.Info(TargetDataLine.class, stereoFormat);
-        DataLine.Info monoDIF = new DataLine.Info(TargetDataLine.class, monoFormat);
-
-        Mixer.Info[] info = AudioSystem.getMixerInfo();
-        for (Mixer.Info i : info) {
-            Mixer m = AudioSystem.getMixer(i);
-
-            boolean supported = false;
-
-            try {
-                m.getLine(stereoDIF);
-                supported = true;
-            } catch (Exception e) {
-            }
-
-            try {
-                m.getLine(monoDIF);
-                supported = true;
-            } catch (Exception e) {
-            }
-
-            if (supported) {
-                KVPair<String, String> p = new KVPair<String, String>(i.getName(), i.getName()); //i.getDescription());
-                list.add(p);
-            }
-        }
-
-        return list.toArray(new KVPair[0]);
     }
 
     static KVPair[] getPlaybackMixerList() {
-        TreeSet<KVPair<String, String>> list = new TreeSet<KVPair<String, String>>();
+        return getMixerList(SourceDataLine.class);
+    }
+
+    static KVPair[] getMixerList(Class<?> cl) {
+        ArrayList<KVPair<String, String>> list = new ArrayList<KVPair<String, String>>();
 
         AudioFormat stereoFormat = new AudioFormat(44100f, 16, 2, true, false);
         AudioFormat monoFormat = new AudioFormat(44100f, 16, 1, true, false);
 
-        DataLine.Info stereoDIF = new DataLine.Info(SourceDataLine.class, stereoFormat);
+        ArrayList<AudioFormat> validFormats = new ArrayList<AudioFormat>();
-        DataLine.Info monoDIF = new DataLine.Info(SourceDataLine.class, monoFormat);
+
+        validFormats.add(new AudioFormat(44100f, 16, 1, true, false));
+        validFormats.add(new AudioFormat(44100f, 16, 2, true, false));
+        validFormats.add(new AudioFormat(44100f, 24, 1, true, false));
+        validFormats.add(new AudioFormat(44100f, 24, 2, true, false));
+        validFormats.add(new AudioFormat(48000f, 16, 1, true, false));
+        validFormats.add(new AudioFormat(48000f, 16, 2, true, false));
+        validFormats.add(new AudioFormat(48000f, 24, 1, true, false));
+        validFormats.add(new AudioFormat(48000f, 24, 2, true, false));
+        validFormats.add(new AudioFormat(96000f, 16, 1, true, false));
+        validFormats.add(new AudioFormat(96000f, 16, 2, true, false));
+        validFormats.add(new AudioFormat(96000f, 24, 1, true, false));
+        validFormats.add(new AudioFormat(96000f, 24, 2, true, false));
+        validFormats.add(new AudioFormat(192000f, 16, 1, true, false));
+        validFormats.add(new AudioFormat(192000f, 16, 2, true, false));
+        validFormats.add(new AudioFormat(192000f, 24, 1, true, false));
+        validFormats.add(new AudioFormat(192000f, 24, 2, true, false));
 
         Mixer.Info[] info = AudioSystem.getMixerInfo();
         for (Mixer.Info i : info) {
@@ -545,19 +534,14 @@ public class Options extends JDialog {
 
             boolean supported = false;
 
-            try { 
+            for (AudioFormat valid : validFormats) {
-                m.getLine(stereoDIF);
+                try { 
-                supported = true; 
+                    m.getLine(new DataLine.Info(cl, valid));
-            } catch (Exception e) {
+                    supported = true; 
+                } catch (Exception e) {
+                }
             }
 
-            try { 
-                m.getLine(monoDIF);
-                supported = true; 
-            } catch (Exception e) {
-            }
-
-
             if (supported) {
                 KVPair<String, String> p = new KVPair<String, String>(i.getName(), i.getName()); //i.getDescription());
                 list.add(p);
@@ -575,10 +559,11 @@ public class Options extends JDialog {
     }
 
     static KVPair[] getSampleRateList() {
-        KVPair[] l = new KVPair[3];
+        KVPair[] l = new KVPair[4];
         l[0] = new KVPair<String, String>("44100", "44100");
         l[1] = new KVPair<String, String>("48000", "48000");
         l[2] = new KVPair<String, String>("96000", "96000");
+        l[3] = new KVPair<String, String>("192000", "192000");
         return l;
     }
 
@@ -722,17 +707,17 @@ public class Options extends JDialog {
         } else if (value instanceof Boolean) {
             set(key, (Boolean)value);
         } else {
-            System.err.println("Bad type for key " + key);
+            Debug.d("Bad type for key", key);
         }
     }
 
     void storePreferences() {
-        set("audio.recording.device", ((KVPair)mixerList.getSelectedItem()).key);
+        if (mixerList.getSelectedItem() != null) set("audio.recording.device", ((KVPair)mixerList.getSelectedItem()).key);
-        set("audio.recording.channels", ((KVPair)channelList.getSelectedItem()).key);
+        if (channelList.getSelectedItem() != null) set("audio.recording.channels", ((KVPair)channelList.getSelectedItem()).key);
-        set("audio.recording.samplerate", ((KVPair)rateList.getSelectedItem()).key);
+        if (rateList.getSelectedItem() != null) set("audio.recording.samplerate", ((KVPair)rateList.getSelectedItem()).key);
-        set("audio.recording.resolution", ((KVPair)bitDepth.getSelectedItem()).key);
+        if (bitDepth.getSelectedItem() != null) set("audio.recording.resolution", ((KVPair)bitDepth.getSelectedItem()).key);
-        set("audio.recording.trim", ((KVPair)trimMethod.getSelectedItem()).key);
+        if (trimMethod.getSelectedItem() != null) set("audio.recording.trim", ((KVPair)trimMethod.getSelectedItem()).key);
-        set("audio.playback.device", ((KVPair)playbackList.getSelectedItem()).key);
+        if (playbackList.getSelectedItem() != null) set("audio.playback.device", ((KVPair)playbackList.getSelectedItem()).key);
         set("path.storage", storageFolder.getText());
         set("path.archive", archiveFolder.getText());
         set("path.ffmpeg", ffmpegLocation.getText());
@@ -742,9 +727,9 @@ public class Options extends JDialog {
         set("catenation.short-sentence", shortSentenceGap.getValue());
         set("catenation.post-paragraph", postParagraphGap.getValue());
         set("catenation.post-section", postSectionGap.getValue());
-        set("audio.export.bitrate", ((KVPair)bitRate.getSelectedItem()).key);
+        if (bitRate.getSelectedItem() != null) set("audio.export.bitrate", ((KVPair)bitRate.getSelectedItem()).key);
-        set("audio.export.channels", ((KVPair)channels.getSelectedItem()).key);
+        if (channels.getSelectedItem() != null) set("audio.export.channels", ((KVPair)channels.getSelectedItem()).key);
-        set("audio.export.samplerate", ((KVPair)exportRate.getSelectedItem()).key);
+        if (exportRate.getSelectedItem() != null) set("audio.export.samplerate", ((KVPair)exportRate.getSelectedItem()).key);
         set("process.sphinx", enableParsing.isSelected());
         set("process.command", speechCommand.getText());
         set("process.threads", workerThreads.getValue());
@@ -752,8 +737,8 @@ public class Options extends JDialog {
         set("cache.size", cacheSize.getValue());
         set("audio.recording.trim.fft", fftThreshold.getValue());
         set("audio.recording.variance", maxGainVariance.getValue());
-        set("audio.recording.trim.blocksize", ((KVPair)fftBlockSize.getSelectedItem()).key);
+        if (fftBlockSize.getSelectedItem() != null) set("audio.recording.trim.blocksize", ((KVPair)fftBlockSize.getSelectedItem()).key);
-        set("audio.playback.blocksize", ((KVPair)playbackBlockSize.getSelectedItem()).key);
+        if (playbackBlockSize.getSelectedItem() != null) set("audio.playback.blocksize", ((KVPair)playbackBlockSize.getSelectedItem()).key);
 
         set("scripts.startup", startupScript.getText());
 
@@ -810,9 +795,10 @@ public class Options extends JDialog {
     }
 
     public static KVPair[] getResolutionList() {
-        KVPair[] pairs = new KVPair[2];
+        KVPair[] pairs = new KVPair[3];
         pairs[0] = new KVPair<String, String>("16", "16 Bit");
         pairs[1] = new KVPair<String, String>("24", "24 Bit");
+        pairs[2] = new KVPair<String, String>("32", "32 Bit");
         return pairs;
     }
 

src/uk/co/majenko/audiobookrecorder/OverlayIcon.java

@@ -1,33 +1,3 @@
-/*
- * Copyright (c) 2015, Majenko Technologies
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * 
- * * Redistributions in binary form must reproduce the above copyright notice, this
- *   list of conditions and the following disclaimer in the documentation and/or
- *   other materials provided with the distribution.
- * 
- * * Neither the name of Majenko Technologies nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 package uk.co.majenko.audiobookrecorder;
 
 import javax.swing.ImageIcon;

src/uk/co/majenko/audiobookrecorder/QueueMonitor.java

@@ -0,0 +1,110 @@
+package uk.co.majenko.audiobookrecorder;
+
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.Queue;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.awt.Dimension;
+import java.awt.Color;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
+public class QueueMonitor extends JPanel implements MouseListener {
+
+    ArrayList<WorkerThread> threadList = new ArrayList<WorkerThread>();
+    Queue<Runnable> queue;
+
+    public QueueMonitor(Queue<Runnable> q) {
+        super();
+        queue = q;
+        addMouseListener(this);
+    }
+
+    public void addThread(WorkerThread t) {
+        threadList.add(t);
+    }
+
+    public void purgeQueue() {
+        Runnable work;
+        synchronized (queue) {
+            while (queue.size() > 0) {
+                work = queue.remove();
+                if (work instanceof SentenceJob) {
+                    SentenceJob sj = (SentenceJob)work;
+                    sj.setDequeued();
+                }
+            }
+            repaint();
+        }
+    }
+
+    @Override
+    public Dimension getPreferredSize() {
+        return new Dimension(150 + (24 * threadList.size()), 24);
+    }
+
+    @Override
+    public Dimension getMinimumSize() {
+        return getPreferredSize();
+    }
+
+    @Override
+    public Dimension getMaximumSize() {
+        return getPreferredSize();
+    }
+
+    @Override
+    public void paintComponent(Graphics g) {
+        Rectangle size = g.getClipBounds();
+        g.setColor(getBackground());
+        g.fillRect(0, 0, size.width - 1, size.height - 1);
+        g.setColor(new Color(10, 10, 10));
+        g.drawRect(0, 0, size.width - 1, size.height - 1);
+        g.setFont(getFont());
+
+        for (int i = 0; i < threadList.size(); i++) {
+            WorkerThread t = threadList.get(i);
+            if (t.isRunning()) {
+                g.setColor(new Color(50, 200, 0));
+            } else {
+                g.setColor(new Color(80, 0, 0));
+            }
+            g.fillOval(i * 24 + 4, 4, 22 - 8, 22 - 8);
+        }
+
+        g.setColor(getForeground());
+        g.drawString("Queued: " + queue.size(), threadList.size() * 24 + 4, 16);
+
+        if (queue.size() > 0) {
+            Icons.close.paintIcon(this, g, size.width - 23, 1);
+        }
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent evt) {   
+    }
+
+    @Override
+    public void mouseExited(MouseEvent evt) {   
+    }
+
+    @Override
+    public void mousePressed(MouseEvent evt) {   
+    }
+
+    @Override
+    public void mouseReleased(MouseEvent evt) {   
+    }
+
+    @Override
+    public void mouseClicked(MouseEvent evt) {   
+        if (queue.size() == 0) return; // No button - ignore it
+        Dimension size = getPreferredSize();
+        if (evt.getX() > (size.width - 24)) {
+            purgeQueue();
+        }
+    }
+
+}
+

src/uk/co/majenko/audiobookrecorder/Sentence.java

@@ -20,10 +20,12 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
 import javax.sound.sampled.TargetDataLine;
 import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioFileFormat;
 import javax.sound.sampled.AudioFormat;
 import java.io.File;
 import java.io.IOException;
@@ -33,6 +35,9 @@ import java.io.FileInputStream;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.AudioFileFormat;
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.util.UUID;
@@ -65,8 +70,11 @@ public class Sentence extends BookTreeNode implements Cacheable {
     boolean attention = false;
     boolean processed = false;
     boolean isDetected = false;
-    boolean detecting = false;
+
-    boolean queued = false;
+    int state = IDLE;
+    static final int IDLE = 0;
+    static final int QUEUED = 1;
+    static final int PROCESSING = 2;
 
     String effectChain = null;
 
@@ -84,6 +92,8 @@ public class Sentence extends BookTreeNode implements Cacheable {
     AudioInputStream inputStream;
     AudioFormat storedFormat = null;
 
+    Book parentBook = null;
+
     double runtime = -1d;
 
     double[][] audioData = null;
@@ -91,6 +101,8 @@ public class Sentence extends BookTreeNode implements Cacheable {
     double[][] processedAudio = null;
 
     double[] fftProfile = null;
+ 
+    TreeMap<Integer, Double> gainPoints = null;
 
     RecordingThread recordingThread;
 
@@ -125,17 +137,20 @@ public class Sentence extends BookTreeNode implements Cacheable {
             try {
                 running = true;
                 recording = true;
-                byte[] buf = new byte[1024]; //AudiobookRecorder.window.microphone.getBufferSize()];
+
+                final int numFrames = 512;
+                final int bufSize = numFrames * format.getFrameSize();
+                byte[] buf = new byte[bufSize]; //AudiobookRecorder.window.microphone.getBufferSize()];
                 FileOutputStream fos = new FileOutputStream(tempFile);
                 int len = 0;
-                AudiobookRecorder.window.microphone.flush();
+                Microphone.flush();
                 int nr = 0;
                 while (recording) {
-                    nr = AudiobookRecorder.window.microphoneStream.read(buf, 0, buf.length);
+                    nr = Microphone.getStream().read(buf, 0, buf.length);
                     len += nr;
                     fos.write(buf, 0, nr);
                 }
-                nr = AudiobookRecorder.window.microphoneStream.read(buf, 0, buf.length);
+                nr = Microphone.getStream().read(buf, 0, buf.length);
                 len += nr;
                 fos.write(buf, 0, nr);
                 fos.close();
@@ -214,19 +229,49 @@ public class Sentence extends BookTreeNode implements Cacheable {
         peak = Utils.s2d(Book.getTextNode(root, "peak", "-1.000"));
         isDetected = Utils.s2b(Book.getTextNode(root, "detected"));
 
+        gainPoints = new TreeMap<Integer, Double>();
+        Element gp = Book.getNode(root, "gainpoints");
+        if (gp != null) {
+            NodeList points = gp.getElementsByTagName("gainpoint");
+
+            for (int i = 0; i < points.getLength(); i++) {
+                Element point = (Element)points.item(i);
+                int loc = Utils.s2i(point.getAttribute("location"));
+                double g = Utils.s2d(point.getAttribute("gain"));
+                gainPoints.put(loc, g);
+            } 
+        }
+
         if (text == null) text = id;
         if (text.equals("")) text = id;
 
-        if ((crossStartOffset == -1) || (crossEndOffset == -1)) {
+        if (id.equals("room-noise")) return;
-            updateCrossings(true);
+
+        if (startOffset >= sampleSize) startOffset = 0;
+        if (endOffset >= sampleSize) endOffset = sampleSize - 1;
+        if (crossStartOffset >= sampleSize) crossStartOffset = 0;
+        if (crossEndOffset >= sampleSize) crossEndOffset = sampleSize - 1;
+
+        if (crossStartOffset == -1) {
+            crossStartOffset = startOffset;
         }
 
-        if (runtime <= 0.01d) getLength();
+        if (crossEndOffset == -1) {
+            crossEndOffset = endOffset;
+        }
+//        if ((crossStartOffset == -1) || (crossEndOffset == -1)) {
+//            updateCrossings();
+//        }
+
+//        if (runtime <= 0.01d) getLength();
+        if (runtime <= 0.001d) {
+            runtime = crossEndOffset - crossStartOffset;
+        }
     }
 
     public boolean startRecording() {
         Debug.trace();
-        if (AudiobookRecorder.window.microphone == null) {
+        if (Microphone.getDevice() == null) {
             JOptionPane.showMessageDialog(AudiobookRecorder.window, "Microphone not started. Start the microphone first.", "Error", JOptionPane.ERROR_MESSAGE);
             return false;
         }
@@ -238,6 +283,7 @@ public class Sentence extends BookTreeNode implements Cacheable {
         Thread rc = new Thread(recordingThread);
         rc.setDaemon(true);
         rc.start();
+        AudiobookRecorder.window.centralPanel.setFlash(true);
 
         return true;
     }
@@ -252,30 +298,45 @@ public class Sentence extends BookTreeNode implements Cacheable {
                 e.printStackTrace();
             }
         }
+        AudiobookRecorder.window.centralPanel.setFlash(false);
 
         CacheManager.removeFromCache(this);
 
         if (!id.equals("room-noise")) {
-            autoTrimSample(true);
+            autoTrimSample();
             if (Options.getBoolean("process.sphinx")) {
-                recognise();
+                AudiobookRecorder.window.queueJob(new SentenceJob(this) {
+                    public void run() {
+                        sentence.doRecognition();
+                    }
+                });
             }
         }
 
     }
 
-    public void autoTrimSample() {
+    public void autoTrimSample(boolean ignored) {
         Debug.trace();
-        autoTrimSample(false);
+        autoTrimSample();
     }
 
-    public void autoTrimSample(boolean useRaw) {
+    public void autoTrimSample() {
         Debug.trace();
         String tm = Options.get("audio.recording.trim");
         if (tm.equals("peak")) {
-            autoTrimSamplePeak(useRaw);
+            AudiobookRecorder.window.queueJob(new SentenceJob(this) {
+                public void run() {
+                    sentence.autoTrimSamplePeak();
+                    AudiobookRecorder.window.updateWaveformMarkers();
+                }
+            });
         } else if (tm.equals("fft")) {
-            autoTrimSampleFFT(useRaw);
+            AudiobookRecorder.window.queueJob(new SentenceJob(this) {
+                public void run() {
+                    sentence.autoTrimSampleFFT();
+                    AudiobookRecorder.window.updateWaveformMarkers();
+                }
+            });
         } else {
             startOffset = 0;
             crossStartOffset = 0;
@@ -284,13 +345,13 @@ public class Sentence extends BookTreeNode implements Cacheable {
             processed = false;
 //            peak = -1d;
         }
+        AudiobookRecorder.window.updateWaveform(true);
     }
 
     public static final int FFTBuckets = 1024;
 
-    public void autoTrimSampleFFT() {
+    public void autoTrimSampleFFT(boolean ignored) {
         Debug.trace();
-        autoTrimSampleFFT(false);
     }
     
     public double bucketDifference(double[] a, double[] b) {
@@ -304,21 +365,17 @@ public class Sentence extends BookTreeNode implements Cacheable {
         return diff;
     }
 
-    public void autoTrimSampleFFT(boolean useRaw) {
+    public void autoTrimSampleFFT() {
         Debug.trace();
         crossStartOffset = -1;
         crossEndOffset = -1;
         double[][] samples;
-        if (useRaw) {
+        samples = getProcessedAudioData();
-            samples = getRawAudioData();
-        } else {
-            samples = getProcessedAudioData();
-        }
         if (samples == null) {
             return;
         }
 
-        double[] roomNoiseProfile = AudiobookRecorder.window.getRoomNoiseSentence().getFFTProfile();
+        double[] roomNoiseProfile = getBook().getRoomNoiseSentence().getFFTProfile();
 
         int fftSize = Options.getInteger("audio.recording.trim.blocksize");
 
@@ -385,7 +442,7 @@ public class Sentence extends BookTreeNode implements Cacheable {
         if (endOffset <= startOffset) endOffset = startOffset + fftSize;
         if (endOffset < 0) endOffset = 0;
         if (endOffset >= samples[LEFT].length) endOffset = samples[LEFT].length;
-        updateCrossings(useRaw);
+        updateCrossings();
         intens = null;
         samples = null;
         processed = true;
@@ -436,23 +493,19 @@ public class Sentence extends BookTreeNode implements Cacheable {
     }
 
 
-    public void autoTrimSamplePeak() {
+    public void autoTrimSamplePeak(boolean ignored) {
         Debug.trace();
-        autoTrimSamplePeak(false);
+        autoTrimSamplePeak();
     }
 
-    public void autoTrimSamplePeak(boolean useRaw) {
+    public void autoTrimSamplePeak() {
         Debug.trace();
         crossStartOffset = -1;
         crossEndOffset = -1;
         double[][] samples;
-        if (useRaw) {
+        samples = getProcessedAudioData();
-            samples = getRawAudioData();
-        } else {
-            samples = getProcessedAudioData();
-        }
         if (samples == null) return;
-        double noiseFloor = AudiobookRecorder.window.getNoiseFloor();
+        double noiseFloor = getBook().getNoiseFloor();
         noiseFloor *= 1.1;
 
         // Find start
@@ -490,7 +543,7 @@ public class Sentence extends BookTreeNode implements Cacheable {
 
         if (startOffset < 0) startOffset = 0;
         if (endOffset >= samples[LEFT].length) endOffset = samples[LEFT].length-1;
-        updateCrossings(useRaw);
+        updateCrossings();
         processed = true;
         reloadTree();
     }
@@ -515,7 +568,10 @@ public class Sentence extends BookTreeNode implements Cacheable {
 
     public File getFile() {
         Debug.trace();
-        File b = new File(AudiobookRecorder.window.getBookFolder(), "files");
+        Debug.d("Get file for", id);
+        Book book = getBook();
+        if (book == null) return null;
+        File b = new File(book.getLocation(), "files");
         if (!b.exists()) {
             b.mkdirs();
         }
@@ -524,7 +580,7 @@ public class Sentence extends BookTreeNode implements Cacheable {
 
     public File getTempFile() {
         Debug.trace();
-        File b = new File(AudiobookRecorder.window.getBookFolder(), "files");
+        File b = new File(getBook().getLocation(), "files");
         if (!b.exists()) {
             b.mkdirs();
         }
@@ -597,38 +653,23 @@ public class Sentence extends BookTreeNode implements Cacheable {
 
     public void updateCrossings() {
         Debug.trace();
-        updateCrossings(false);
+        updateStartCrossing();
-    }
+        updateEndCrossing();
-
-    public void updateCrossings(boolean useRaw) {
-        Debug.trace();
-        updateStartCrossing(useRaw);
-        updateEndCrossing(useRaw);
         runtime = -1d;
         getLength();
     }
 
     public void updateStartCrossing() {
-        Debug.trace();
-        updateStartCrossing(false);
-    }
-
-    public void updateStartCrossing(boolean useRaw) {
         Debug.trace();
         if (crossStartOffset == -1) {
-            crossStartOffset = findNearestZeroCrossing(useRaw, startOffset, 4096);
+            crossStartOffset = findNearestZeroCrossing(startOffset, 4096);
         }
     }
 
     public void updateEndCrossing() {
-        Debug.trace();
-        updateEndCrossing(false);
-    }
-
-    public void updateEndCrossing(boolean useRaw) {
         Debug.trace();
         if (crossEndOffset == -1) {
-            crossEndOffset = findNearestZeroCrossing(useRaw, endOffset, 4096);
+            crossEndOffset = findNearestZeroCrossing(endOffset, 4096);
         }
     }
 
@@ -694,20 +735,8 @@ public class Sentence extends BookTreeNode implements Cacheable {
         return null;
     }
 
-    public Runnable getRecognitionRunnable() {
-        Runnable r = new Runnable() {
-            public void run() {
-                Debug.d("Starting recognition of", getId());
-                doRecognition();
-            }
-        };
-        return r;
-    }
-
     public void doRecognition() {
         Debug.trace();
-        detecting = true;
-        queued = false;
         try {
             reloadTree();
 
@@ -727,18 +756,10 @@ public class Sentence extends BookTreeNode implements Cacheable {
 
             setText(res);
             isDetected = true;
-            detecting = false;
             reloadTree();
         } catch (Exception e) {
             e.printStackTrace();
         }
-        detecting = false;
-    }
-
-    public void recognise() {
-        Debug.trace();
-        Thread t = new Thread(getRecognitionRunnable());
-        t.start();
     }
 
     public void setLocked(boolean l) {
@@ -776,18 +797,9 @@ public class Sentence extends BookTreeNode implements Cacheable {
     }
 
     public int findNearestZeroCrossing(int pos, int range) {
-        Debug.trace();
-        return findNearestZeroCrossing(false, pos, range);
-    }
-
-    public int findNearestZeroCrossing(boolean useRaw, int pos, int range) {
         Debug.trace();
         double[][] data = null;
-        if (useRaw) {
+        data = getProcessedAudioData();
-            data = getRawAudioData();
-        } else {
-            data = getProcessedAudioData();
-        }
         if (data == null) return 0;
         if (data[LEFT].length == 0) return 0;
 
@@ -824,7 +836,25 @@ public class Sentence extends BookTreeNode implements Cacheable {
         return pos;
     }
 
+    public double getStartTime() {
+        double time = 0;
+        DefaultMutableTreeNode prev = getPreviousSibling();
+        while (prev != null) {
+            if (prev instanceof Sentence) {
+                Sentence ps = (Sentence)prev;
+                time += ps.getLength();
+                time += ps.getPostGap() / 1000d;
+                prev = prev.getPreviousSibling();
+            } else {
+                break;
+            }
+        }
+        return time;
+        
+    }
+
     /* Get the length of the sample in seconds */
+    @Override
     public double getLength() {
         Debug.trace();
         if (runtime > 0.01d) return runtime;
@@ -842,6 +872,7 @@ public class Sentence extends BookTreeNode implements Cacheable {
     public Sentence cloneSentence() throws IOException {
         Debug.trace();
         Sentence sentence = new Sentence();
+        sentence.setParentBook(getBook());
         sentence.setPostGap(getPostGap());
         if (!id.equals(text)) {
             sentence.setText(text);
@@ -855,7 +886,6 @@ public class Sentence extends BookTreeNode implements Cacheable {
         File to = sentence.getFile();
         Files.copy(from.toPath(), to.toPath());
 
-//        sentence.updateCrossings();
         return sentence;
     }
 
@@ -873,24 +903,15 @@ public class Sentence extends BookTreeNode implements Cacheable {
 
     public double getPeakValue() {
         Debug.trace();
-        return getPeakValue(false, true);
+        return getPeakValue(true);
     }
 
-    public double getPeakValue(boolean useRaw) {
+    public double getPeakValue(boolean applyGain) {
-        Debug.trace();
-        return getPeakValue(useRaw, true);
-    }
-
-    public double getPeakValue(boolean useRaw, boolean applyGain) {
         Debug.trace();
         double oldGain = gain;
         gain = 1.0d;
         double[][] samples = null;
-        if (useRaw) {
+        samples = getProcessedAudioData(true, applyGain);
-            samples = getRawAudioData();
-        } else {
-            samples = getProcessedAudioData(true, applyGain);
-        }
         gain = oldGain;
         if (samples == null) {
             return 0;
@@ -937,7 +958,7 @@ public class Sentence extends BookTreeNode implements Cacheable {
     public double normalize(double low, double high) {
         Debug.trace();
         if (locked) return gain;
-        double max = getPeakValue(true, false);
+        double max = getPeakValue(false);
         double d = 0.708 / max;
         if (d > 1d) d = 1d;
         if (d < low) d = low;
@@ -952,7 +973,7 @@ public class Sentence extends BookTreeNode implements Cacheable {
     public double normalize() {
         Debug.trace();
         if (locked) return gain;
-        double max = getPeakValue(true, false);
+        double max = getPeakValue(false);
         double d = 0.708 / max;
         if (d > 1d) d = 1d;
         setGain(d);
@@ -1000,12 +1021,16 @@ public class Sentence extends BookTreeNode implements Cacheable {
     public void openInExternalEditor() {
         Debug.trace();
         ExternalEditor ed = new ExternalEditor(this);
-        Thread t = new Thread(ed);
+        ed.run();
-        t.start();
+        CacheManager.removeFromCache(this);
+        runtime = -1;
+        sampleSize = -1;
     }
 
     public void backup() throws IOException {
         Debug.trace();
+	if (getFile() == null) return;
+	if (!getFile().exists()) return;
         File whereto = getFile().getParentFile();
         String name = getFile().getName();
 
@@ -1045,6 +1070,10 @@ public class Sentence extends BookTreeNode implements Cacheable {
             if (command == null) return;
             if (command.equals("")) return;
 
+            Debug.d("Starting size:", sampleSize);
+            Debug.d("Start offset:", startOffset, crossStartOffset);
+            Debug.d("End offset:", endOffset, crossEndOffset);
+
             String[] parts = command.split("::");
         
             ArrayList<String> args = new ArrayList<String>();
@@ -1087,6 +1116,17 @@ public class Sentence extends BookTreeNode implements Cacheable {
             }
 
             CacheManager.removeFromCache(Sentence.this);
+            runtime = -1;
+            sampleSize = -1;
+            loadFile();
+            Debug.d("Ending size:", sampleSize);
+            if (startOffset >= sampleSize) startOffset = 0;
+            if (endOffset >= sampleSize) endOffset = sampleSize - 1;
+            crossStartOffset = -1;
+            crossEndOffset = -1;
+            updateCrossings();
+            Debug.d("Start offset:", startOffset, crossStartOffset);
+            Debug.d("End offset:", endOffset, crossEndOffset);
             AudiobookRecorder.window.updateWaveform(true);
         }
     }
@@ -1095,8 +1135,7 @@ public class Sentence extends BookTreeNode implements Cacheable {
         Debug.trace();
         if (isLocked()) return;
         ExternalProcessor ed = new ExternalProcessor(this, num);
-        Thread t = new Thread(ed);
+        ed.run();
-        t.start();
     }
 
     public void undo() {
@@ -1412,6 +1451,7 @@ public class Sentence extends BookTreeNode implements Cacheable {
 
     synchronized public double[][] getProcessedAudioData(boolean effectsEnabled, boolean applyGain) {
         Debug.trace();
+        Book book = getBook();
         loadFile();
         if (processedAudio != null) {
             return processedAudio;
@@ -1426,22 +1466,24 @@ public class Sentence extends BookTreeNode implements Cacheable {
         // Add processing in here.
 
 
-        String def = AudiobookRecorder.window.getDefaultEffectsChain();
+        String def = getBook().getDefaultEffect();
-        Effect eff = AudiobookRecorder.window.effects.get(def);
+        if ((def != null) && (book.effects != null)) {
-    
+            Effect eff = book.effects.get(def);
-        if (effectsEnabled) {
+        
-            if (eff != null) {
+            if (effectsEnabled) {
-                eff.init(getAudioFormat().getFrameRate());
+                if (eff != null) {
-                eff.process(processedAudio);
+                    eff.init(getAudioFormat().getFrameRate());
-            }
+                    eff.process(processedAudio);
+                }
 
-            if (effectChain != null) {
+                if (effectChain != null) {
-                // Don't double up the default chain
+                    // Don't double up the default chain
-                if (!effectChain.equals(def)) {
+                    if (!effectChain.equals(def)) {
-                    eff = AudiobookRecorder.window.effects.get(effectChain);
+                        eff = book.effects.get(effectChain);
-                    if (eff != null) {
+                        if (eff != null) {
-                        eff.init(getAudioFormat().getFrameRate());
+                            eff.init(getAudioFormat().getFrameRate());
-                        eff.process(processedAudio);
+                            eff.process(processedAudio);
+                        }
                     }
                 }
             }
@@ -1455,6 +1497,12 @@ public class Sentence extends BookTreeNode implements Cacheable {
             }
         }
 
+        double[] gc = calculateGains();
+        for (int i = 0; i < processedAudio[LEFT].length; i++) {
+            processedAudio[LEFT][i] *= gc[i];
+            processedAudio[RIGHT][i] *= gc[i];
+        }
+
         return processedAudio;
     }
 
@@ -1637,6 +1685,17 @@ public class Sentence extends BookTreeNode implements Cacheable {
         sentenceNode.appendChild(Book.makeTextNode(doc, "time", getLength()));
         sentenceNode.appendChild(Book.makeTextNode(doc, "peak", getPeak()));
         sentenceNode.appendChild(Book.makeTextNode(doc, "detected", beenDetected()));
+        Element gp = doc.createElement("gainpoints");
+        if (gainPoints != null) {
+            for (Integer loc : gainPoints.keySet()) {
+                Double g = gainPoints.get(loc);
+                Element p = doc.createElement("gainpoint");
+                p.setAttribute("location", String.format("%d", loc));
+                p.setAttribute("gain", String.format("%.3g", g));
+                gp.appendChild(p);
+            }
+            sentenceNode.appendChild(gp);
+        }
         return sentenceNode;
     }
 
@@ -1661,18 +1720,26 @@ public class Sentence extends BookTreeNode implements Cacheable {
         return notes;
     }
 
-    public void onSelect() {
+    public void onSelect(BookTreeNode target) {
         Debug.trace();
+        AudiobookRecorder.setSelectedSentence(this);
         AudiobookRecorder.window.setSentenceNotes(notes);
+        TreeNode p = getParent();
+        if (p instanceof BookTreeNode) {
+            BookTreeNode btn = (BookTreeNode)p;
+            btn.onSelect(target);
+        }
     }
 
     void reloadTree() {
         Debug.trace();
         if (id.equals("room-noise")) return;
         if (getParent() == null) return;
-        synchronized (AudiobookRecorder.window.bookTreeModel) {
+        SwingUtilities.invokeLater(new Runnable() {
-            AudiobookRecorder.window.bookTreeModel.reload(this);
+            public void run() {
-        }
+                AudiobookRecorder.window.bookTreeModel.reload(Sentence.this);
+            }
+        });
     }
 
     public double getPeak() {
@@ -1707,20 +1774,130 @@ public class Sentence extends BookTreeNode implements Cacheable {
         return (int)db;
     }
 
-    public boolean isDetecting() {
-        return detecting;
-    }
-
     public boolean beenDetected() {
         return isDetected;
     }
 
+    public boolean isProcessing() {
+        return state == PROCESSING;
+    }
+
     public boolean isQueued() {
-        return queued;
+        return state == QUEUED;
+    }
+
+    public void setProcessing() {
+        state = PROCESSING;
+        reloadTree();
     }
 
     public void setQueued() {
-        queued = true;
+        state = QUEUED;
+        reloadTree();
     }
 
+    public void setDequeued() {
+        state = IDLE;
+        reloadTree();
+    }
+
+    public Book getBook() {
+        if (parentBook != null) {
+            Debug.d("Returning parent book");
+            return parentBook; // Override for room noise which isn't attached to a book tree
+        }
+        Chapter c = (Chapter)getParent();
+        if (c == null) {
+            Debug.d("No parent found");
+            return null;
+        }
+        Debug.d("Chapter: ", c.toString());
+        return c.getBook();
+    }
+
+    public void setParentBook(Book b) {
+        parentBook = b;
+    }
+
+    public void refreshAllData() {
+        runtime = -1d;
+        peak = -1d;
+        sampleSize = -1;
+        audioData = null;
+        processedAudio = null;
+        fftProfile = null;
+        CacheManager.removeFromCache(this);
+        getProcessedAudioData();
+        getLength();
+        crossStartOffset = -1;
+        crossEndOffset = -1;
+        updateCrossings();
+        getPeakDB();
+        reloadTree();
+    }
+
+    public TreeMap<Integer, Double> getGainPoints() {
+        Debug.trace();
+        if (gainPoints == null) {
+            gainPoints = new TreeMap<Integer, Double>();
+        }
+        return gainPoints;
+    }
+
+    public void addGainPoint(Integer loc, Double g) {
+        if (gainPoints == null) {
+            gainPoints = new TreeMap<Integer, Double>();
+        }
+        gainPoints.put(loc, g);
+        CacheManager.removeFromCache(this);
+    }
+
+    public void removeGainPoint(Integer loc) {
+        gainPoints.remove(loc);
+        CacheManager.removeFromCache(this);
+    }
+
+    public void adjustGainPoint(Integer loc, Double adj) {
+        if (gainPoints == null) {
+            gainPoints = new TreeMap<Integer, Double>();
+            return;
+        }
+        Double gp = gainPoints.get(loc);
+        if (gp == null) return;
+        gp += adj;
+        gainPoints.put(loc, gp);
+        CacheManager.removeFromCache(this);
+    }
+
+    public double[] calculateGains() {
+        double[] gains = new double[sampleSize];
+
+        double y = 1.0d;
+        int x1 = 0; 
+
+        if (gainPoints == null) {
+            for (int x = 0; x < sampleSize; x++) {
+                gains[x] = 1.0d;
+            }
+            return gains;
+        }
+
+        for (Integer loc : gainPoints.keySet()) {
+            int x2 = loc;
+            double y2 = gainPoints.get(loc);
+        
+            int range = x2 - x1;
+            double diff = y2 - y;
+            double ystep = diff / (double)range;
+            for (int x = 0; x < range; x++) {
+                y += ystep;
+                gains[x1 + x] = y;
+            }
+            x1 = x2;
+        }
+        for (int x = x1; x < sampleSize; x++) {
+            gains[x] = y;
+        }
+        return gains;
+    }
 }

src/uk/co/majenko/audiobookrecorder/SentenceExternalJob.java

@@ -0,0 +1,17 @@
+package uk.co.majenko.audiobookrecorder;
+
+import java.lang.Runnable;
+
+public class SentenceExternalJob extends SentenceJob {
+    protected int command;
+
+    public SentenceExternalJob(Sentence s, int c) {
+        super(s);
+        command = c;
+    }
+
+    @Override
+    public void run() {
+        sentence.runExternalProcessor(command);
+    }
+}

src/uk/co/majenko/audiobookrecorder/SentenceJob.java

@@ -0,0 +1,25 @@
+package uk.co.majenko.audiobookrecorder;
+
+import java.lang.Runnable;
+
+public abstract class SentenceJob implements Runnable {
+    protected Sentence sentence;
+    
+    public SentenceJob(Sentence s) {
+        sentence = s;
+    }
+
+    public void setQueued() {
+        sentence.setQueued();
+    }
+
+    public void setDequeued() {
+        sentence.setDequeued();
+    }
+
+    public void setProcessing() {
+        sentence.setProcessing();
+    }
+    
+    public abstract void run();
+}

src/uk/co/majenko/audiobookrecorder/Utils.java

@@ -9,6 +9,9 @@ import java.awt.Graphics2D;
 import java.awt.Desktop;
 import java.util.Date;
 import java.util.TimeZone;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 
 public class Utils {
     public static Image getScaledImage(Image srcImg, int w, int h){
@@ -70,7 +73,7 @@ public class Utils {
         long t = System.currentTimeMillis();
         long d = t - millis;
         millis = t;
-        System.err.println(String.format("%10d - %10s : %8d | %8d | %8d", d, tag,
+        Debug.d(String.format("%10d - %10s : %8d | %8d | %8d", d, tag,
             Runtime.getRuntime().totalMemory(),
             Runtime.getRuntime().maxMemory(),
             Runtime.getRuntime().freeMemory()
@@ -84,4 +87,49 @@ public class Utils {
         String time = df.format(d); 
         return time;
     }
+
+    public static double[] stereoToMono(double[][] in) {
+        double[] out = new double[in[Sentence.LEFT].length];
+
+        for (int i = 0; i < in[Sentence.LEFT].length; i++) {
+            out[i] = mix(in[Sentence.LEFT][i], in[Sentence.RIGHT][i]);
+        }
+        return out;
+    }
+
+    public static double mix(double a, double b) {
+        double out;
+
+        if ((a < 0) && (b < 0)) {
+            out = (a + b) - (a * b);
+        } else if ((a > 0) && (b > 0)) {
+            out = (a + b) - (a * b);
+        } else {
+            out = a + b;
+        }
+
+        return out;
+    }
+
+    public static void copyFolder(File from, File to) throws IOException {
+        File[] files = from.listFiles();
+
+        for (File source : files) {
+            File destination = new File(to, source.getName());
+            if (destination.exists()) {
+                if (!destination.isDirectory()) {
+                    destination.delete();
+                }
+            }
+            if (source.isDirectory()) {
+                if (!destination.exists()) {
+                    destination.mkdirs();
+                }
+                copyFolder(source, destination);
+            } else {
+                Files.copy(source.toPath(), destination.toPath());
+            }
+        }
+    }
+
 }

src/uk/co/majenko/audiobookrecorder/VersionChecker.java

@@ -0,0 +1,73 @@
+package uk.co.majenko.audiobookrecorder;
+
+import java.lang.Runnable;
+import java.net.URL;
+import javax.net.ssl.HttpsURLConnection;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.BufferedReader;
+import org.json.JSONObject;
+import javax.swing.JButton;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+
+public class VersionChecker implements Runnable {
+    public VersionChecker() {
+    }
+
+    public void run() {
+        try {
+            URL url = new URL("https://api.github.com/repos/MajenkoProjects/AudiobookRecorder/releases/latest");
+            HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
+            InputStream is = conn.getInputStream();
+            InputStreamReader isr = new InputStreamReader(is);
+            BufferedReader br = new BufferedReader(isr);
+
+            String inputLine;
+            StringBuilder jsonData = new StringBuilder();
+
+            while ((inputLine = br.readLine()) != null) {
+                jsonData.append(inputLine);
+            }
+
+            br.close();
+
+            JSONObject job = new JSONObject(jsonData.toString());
+
+            String installed = AudiobookRecorder.config.getProperty("version");
+            String available = job.getString("tag_name");
+            if (available.startsWith("v")) {
+                available = available.substring(1);
+            }
+            String website = job.getString("html_url");
+
+
+            String[] installedParts = installed.split("\\.");
+            String[] availableParts = available.split("\\.");
+            // Must be x.y.z
+
+            if (installedParts.length != 3) return;
+            if (availableParts.length != 3) return;
+
+            // Convert to xxxyyyzzz
+            String installedVersion = String.format("%03d%03d%03d", Utils.s2i(installedParts[0]), Utils.s2i(installedParts[1]), Utils.s2i(installedParts[2]));
+            String availableVersion = String.format("%03d%03d%03d", Utils.s2i(availableParts[0]), Utils.s2i(availableParts[1]), Utils.s2i(availableParts[2]));
+
+            if (Utils.s2i(installedVersion) >= Utils.s2i(availableVersion)) return;
+            
+            JButton upgrade = new JButton("A new version is available.");
+            upgrade.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent evt) {
+                    Utils.browse(website);
+                }
+            });
+
+            AudiobookRecorder.window.statusBar.add(upgrade);
+            AudiobookRecorder.window.statusBar.revalidate();
+
+        } catch (Exception ignored) {
+            ignored.printStackTrace();
+        }
+
+    }
+}

src/uk/co/majenko/audiobookrecorder/Waveform.java

@@ -2,17 +2,20 @@ package uk.co.majenko.audiobookrecorder;
 
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelListener;
 import javax.swing.JPanel;
+import java.util.TreeMap;
 import java.util.ArrayList;
 import java.awt.Graphics;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 import java.awt.Dimension;
 import java.awt.Color;
 import java.awt.Cursor;
 
-public class Waveform extends JPanel implements MouseListener, MouseMotionListener {
+public class Waveform extends JPanel implements MouseListener, MouseMotionListener, MouseWheelListener {
 
-    double[][] samples = null;
+    Sentence sentence = null;
 
     int leftMarker = 0;
     int rightMarker = 0;
@@ -29,6 +32,8 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
     boolean displayCut = false;
     boolean displaySplit = false;
 
+    boolean displayGainCurve = false;
+
     int dragging = 0;
 
     int step = 1;
@@ -39,21 +44,31 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
 
     String loadedId = null;
 
-    ArrayList<MarkerDragListener> markerDragListeners;
-
     public Waveform() {
         super();
         addMouseListener(this);
         addMouseMotionListener(this);
-        markerDragListeners = new ArrayList<MarkerDragListener>();
+        addMouseWheelListener(this);
     }
 
-    public void addMarkerDragListener(MarkerDragListener l) {
+    public void setSentence(Sentence s) {
-        if (markerDragListeners.indexOf(l) == -1) {
+        sentence = s;
-            markerDragListeners.add(l);
+        playMarker = 0;
-        }
+        displayCut = false;
+        displaySplit = false;
+        updateMarkers();
     }
 
+    public void updateMarkers() {
+        if (sentence != null) {
+            leftMarker = sentence.getStartOffset();
+            rightMarker = sentence.getEndOffset();
+            leftAltMarker = sentence.getStartCrossing();
+            rightAltMarker = sentence.getEndCrossing();
+        }
+        repaint();
+    } 
+
     public void paintComponent(Graphics g) {
         Dimension size = getSize();
 
@@ -82,7 +97,8 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
 
         double scale = (h/2);
 
-        if (samples != null) {
+        if (sentence != null) {
+            double[][] samples = sentence.getDoubleAudioData(true);
 
             int num = samples[Sentence.LEFT].length;
             step = num / zoomFactor / w;
@@ -173,51 +189,30 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
             for (int i = 0; i < h; i += 2) {
                 g.drawLine((playMarker - offset) / step, i, (playMarker - offset) / step, i);
             }
+
+            if (displayGainCurve) {
+                int x1 = 0;
+                double y1 = 1.0;
+                g.setColor(new Color(200, 200, 200));
+                TreeMap<Integer, Double> points = sentence.getGainPoints();
+                for (Integer loc : points.keySet()) {
+                    int x2 = loc;
+                    double y2 = points.get(loc);
+
+                    g.fillRect((x1 - offset) / step - 1, h - (int)((double)h / 2.0 * y1) - 1, 3, 3);
+
+                    g.drawLine((x1 - offset) / step, h - (int)((double)h / 2.0 * y1), (x2 - offset) / step, h - (int)((double)h / 2.0 * y2));
+                    x1 = x2;
+                    y1 = y2;
+                }
+                g.fillRect((x1 - offset) / step - 1, h - (int)((double)h / 2.0 * y1) - 1, 3, 3);
+                g.drawLine((x1 - offset) / step, h - (int)((double)h / 2.0 * y1), (num - offset) / step, h - (int)((double)h / 2.0 * y1));
+            }
         }
     }
 
-    public void setAltMarkers(int l, int r) {
+    public void setDisplayGainCurve(boolean b) {
-        leftAltMarker = l;
+        displayGainCurve = b;
-        rightAltMarker = r;
-        repaint();
-    }
-
-    public void setMarkers(int l, int r) {
-        leftMarker = l;
-        rightMarker = r;
-        repaint();
-    }
-
-    public void setLeftAltMarker(int l) {
-        leftAltMarker = l;
-        repaint();
-    }
-
-    public void setRightAltMarker(int r) {
-        rightAltMarker = r;
-        repaint();
-    }
-
-    public void setLeftMarker(int l) {
-        leftMarker = l;
-        repaint();
-    }
-
-    public void setRightMarker(int r) {
-        rightMarker = r;
-        repaint();
-    }
-
-    public void clearData() {
-        samples = null;
-        repaint();
-    }
-
-    public void setData(double[][] s) {
-        samples = s;
-        playMarker = 0;
-        displayCut = false;
-        displaySplit = false;
         repaint();
     }
 
@@ -264,46 +259,118 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
 
     public void mouseReleased(MouseEvent e) {
         if (dragging == 1) {
-            MarkerDragEvent evt = new MarkerDragEvent(this, leftMarker);
+            sentence.setStartOffset(leftMarker);
-            for (MarkerDragListener l : markerDragListeners) {
+            sentence.updateCrossings();
-                l.leftMarkerMoved(evt);
+            updateMarkers();
-            }
         } else if (dragging == 2) {
-            MarkerDragEvent evt = new MarkerDragEvent(this, rightMarker);
+            sentence.setEndOffset(rightMarker);
-            for (MarkerDragListener l : markerDragListeners) {
+            sentence.updateCrossings();
-                l.rightMarkerMoved(evt);
+            updateMarkers();
-            }
         }
         dragging = 0;
     }
 
+    public void mouseWheelMoved(MouseWheelEvent e) {
+        if (sentence == null) return;
+        if (sentence.isLocked()) return;
+
+        if (displayGainCurve) {
+            int x = e.getX() * step + offset;
+            int f = -1;
+            int diff = Integer.MAX_VALUE;
+
+            TreeMap<Integer, Double> gc = sentence.getGainPoints();
+            for (Integer loc : gc.keySet()) {
+                int d = Math.abs(loc - x);
+                if (d < diff) {
+                    diff = d;
+                    f = loc;
+                }
+            }
+
+            if (diff / step < 5) {
+                sentence.adjustGainPoint(f, (0 - e.getWheelRotation()) / 100d);
+                repaint();
+                return;
+            }
+        }
+
+        int val = ((int)AudiobookRecorder.window.gainPercent.getValue()) - e.getWheelRotation();
+        if (val < 1) val = 1;
+        AudiobookRecorder.window.gainPercent.setValue(val);
+    }
+
+
     public void mouseClicked(MouseEvent e) {
+        if (displayGainCurve) {
+            if (e.getButton() == MouseEvent.BUTTON1) {
+                Dimension size = getSize();
+
+                int w = size.width;
+                int h = size.height;
+
+                int x = e.getX() * step + offset;
+                double y = (double)(h - e.getY()) / (double)h * 2.0;
+
+                sentence.addGainPoint(x, y);
+                repaint();
+            } else if (e.getButton() == MouseEvent.BUTTON2) {
+                Dimension size = getSize();
+
+                int w = size.width;
+                int h = size.height;
+
+                int x = e.getX() * step + offset;
+                double y = 1.0d;
+
+                sentence.addGainPoint(x, y);
+                repaint();
+            } else if (e.getButton() == MouseEvent.BUTTON3) {
+                int x = e.getX() * step + offset;
+                int f = -1;
+                int diff = Integer.MAX_VALUE;
+
+                TreeMap<Integer, Double> gc = sentence.getGainPoints();
+                for (Integer loc : gc.keySet()) {
+                    int d = Math.abs(loc - x);
+                    if (d < diff) {
+                        diff = d;
+                        f = loc;
+                    }
+                }
+                sentence.removeGainPoint(f);
+                repaint();
+            }
+        }
     }
 
     public void mouseMoved(MouseEvent e) {
         int x = e.getX();
-        if ((x >= ((leftMarker - offset)/step) - 10) && (x <= ((leftMarker - offset)/step) + 10)) {
+        int y = e.getY();
-            setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR));
-            return;
-        }
-        if ((x >= ((rightMarker - offset)/step) - 10) && (x <= ((rightMarker - offset)/step) + 10)) {
-            setCursor(Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR));
-            return;
-        }
-        if (displayCut || displaySplit) {
-            if ((x >= ((cutEntry - offset)/step) - 10) && (x <= ((cutEntry - offset)/step) + 10)) {
-                setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR));
-                return;
-            }
-        } 
 
-        if (displayCut) {
+        if (displayGainCurve) {
+            
+        } else if (displayCut) {
             if ((x >= ((cutExit - offset)/step) - 10) && (x <= ((cutExit - offset)/step) + 10)) {
                 setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR));
                 return;
             }
+        } else {
+            if ((x >= ((leftMarker - offset)/step) - 10) && (x <= ((leftMarker - offset)/step) + 10)) {
+                setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR));
+                return;
+            }
+            if ((x >= ((rightMarker - offset)/step) - 10) && (x <= ((rightMarker - offset)/step) + 10)) {
+                setCursor(Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR));
+                return;
+            }
+            if (displayCut || displaySplit) {
+                if ((x >= ((cutEntry - offset)/step) - 10) && (x <= ((cutEntry - offset)/step) + 10)) {
+                    setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR));
+                    return;
+                }
+            } 
         }
-
         setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
 
     }

src/uk/co/majenko/audiobookrecorder/WorkerThread.java

@@ -5,9 +5,13 @@ import java.util.Queue;
 public class WorkerThread extends Thread {
     private static int instance = 0;
     private final Queue<Runnable> queue;
+    private final QueueMonitor monitor;
+
+    private boolean running = false;
      
-    public WorkerThread(Queue<Runnable> queue) {
+    public WorkerThread(Queue<Runnable> queue, QueueMonitor mon) {
         this.queue = queue;
+        monitor = mon;
         setName("Worker Thread " + (instance++));
     }
      
@@ -30,8 +34,19 @@ public class WorkerThread extends Thread {
                     work = queue.remove();
                 }
  
-                // Process the work item
+                running = true;
+                monitor.repaint();
+                if (work instanceof SentenceJob) {
+                    SentenceJob sj = (SentenceJob)work;
+                    sj.setProcessing();
+                }
                 work.run();
+                if (work instanceof SentenceJob) {
+                    SentenceJob sj = (SentenceJob)work;
+                    sj.setDequeued();
+                }
+                running = false;
+                monitor.repaint();
             }
             catch ( InterruptedException ie ) {
                 ie.printStackTrace();
@@ -40,4 +55,8 @@ public class WorkerThread extends Thread {
         }
         Debug.d(getName(), "died");
     }
+
+    public boolean isRunning() {
+        return running;
+    }
 }