Released 0.3.3

Added book/chapter/phrase notes area tabs
Add processed flag for batch processing of new recordings
2020-01-17 14:16:31 +00:00 · 2020-01-17 12:31:25 +00:00 · 2020-01-15 11:35:49 +00:00 · 2020-01-12 23:43:08 +00:00 · 2020-01-12 22:46:15 +00:00 · 2020-01-12 15:23:16 +00:00
40 changed files with 2244 additions and 345 deletions
--- a/ExampleFilters/alien.eff
+++ b/ExampleFilters/alien.eff
@@ -1,7 +1,4 @@
 <effect name="Alien">
-    <biquad type="notch" fc="28" q="20" gain="-50" />
-    <biquad type="notch" fc="91" q="20" gain="-50" />
-    <biquad type="notch" fc="120" q="20" gain="-50" />
-    <biquad type="lowpass" fc="10000" q="1" gain="-10" />
-    <lfo frequency="100" depth="0.5" />
+    <!--biquad type="lowpass" fc="10000" q="1" gain="-10" /-->
+    <lfo frequency="50" depth="1.0" waveform="triangle" mode="replace"/>
 </effect>
--- a/ExampleFilters/bigecho.eff
+++ b/ExampleFilters/bigecho.eff
@@ -1,7 +1,4 @@
 <effect name="Big Echo">
-    <biquad type="notch" fc="28" q="20" gain="-50" />
-    <biquad type="notch" fc="91" q="20" gain="-50" />
-    <biquad type="notch" fc="120" q="20" gain="-50" />
    <delayline>
        <delay samples="22000" gain="0.2" pan="-0.3">
            <biquad type="highpass" fc="300" q="1" gain="0" />
--- a/ExampleFilters/cuthumagc.eff
+++ b/ExampleFilters/cuthumagc.eff
@@ -3,5 +3,5 @@
    <biquad type="notch" fc="91" q="20" gain="-50" />
    <biquad type="notch" fc="120" q="20" gain="-50" />
    <biquad type="lowpass" fc="10000" q="1" gain="-10" />
-    <agc ceiling="0.666" limit="1" attack="0.1" decay="0.01" />
+    <agc ceiling="0.666" limit="1.5" attack="0.08" decay="0.01" />
 </effect>
--- a/ExampleFilters/cuthumagcstereo.eff
+++ b/ExampleFilters/cuthumagcstereo.eff
@@ -0,0 +1,15 @@
+<effect name="Cut Computer Hum (with AGC and Stereo)">
+    <biquad type="notch" fc="28" q="20" gain="-50" />
+    <biquad type="notch" fc="91" q="20" gain="-50" />
+    <biquad type="notch" fc="120" q="20" gain="-50" />
+    <biquad type="lowpass" fc="10000" q="1" gain="-10" />
+    <delayline wetonly="false">
+        <delay samples="-100" gain="0.1" pan="-1.0">
+            <biquad type="highpass" fc="300" q="1" gain="0" />
+        </delay>
+        <delay samples="100" gain="0.1" pan="1.0">
+            <biquad type="highpass" fc="300" q="1" gain="0" />
+        </delay>
+    </delayline>
+    <agc ceiling="0.666" limit="1.5" attack="0.1" decay="0.01" />
+</effect>
--- a/ExampleFilters/ethereal.eff
+++ b/ExampleFilters/ethereal.eff
@@ -1,7 +1,4 @@
 <effect name="Ethereal Voice">
-    <biquad type="notch" fc="28" q="20" gain="-50" />
-    <biquad type="notch" fc="91" q="20" gain="-50" />
-    <biquad type="notch" fc="120" q="20" gain="-50" />
    <amplifier gain="0.1" />
    <delayline>
        <delay samples="2000" gain="1.0" pan="-0.3">
--- a/ExampleFilters/largeroom.eff
+++ b/ExampleFilters/largeroom.eff
@@ -1,7 +1,4 @@
 <effect name="Large Room (quiet)">
-    <biquad type="notch" fc="28" q="20" gain="-50" />
-    <biquad type="notch" fc="91" q="20" gain="-50" />
-    <biquad type="notch" fc="120" q="20" gain="-50" />
    <biquad type="lowpass" fc="10000" q="1" gain="-10" />
    <delayline>
        <delay samples="5500" gain="0.2" pan="-0.3">
--- a/ExampleFilters/largeroomloud.eff
+++ b/ExampleFilters/largeroomloud.eff
@@ -1,7 +1,4 @@
 <effect name="Large Room (loud)">
-    <biquad type="notch" fc="28" q="20" gain="-50" />
-    <biquad type="notch" fc="91" q="20" gain="-50" />
-    <biquad type="notch" fc="120" q="20" gain="-50" />
    <biquad type="lowpass" fc="10000" q="1" gain="-10" />
    <delayline>
        <delay samples="5500" gain="0.2" pan="-0.3">
--- a/ExampleFilters/panleft.eff
+++ b/ExampleFilters/panleft.eff
@@ -0,0 +1,3 @@
+<effect name="Pan Left">
+    <pan pan="-0.4" />
+</effect>
--- a/ExampleFilters/panright.eff
+++ b/ExampleFilters/panright.eff
@@ -0,0 +1,3 @@
+<effect name="Pan Right">
+    <pan pan="0.4" />
+</effect>
--- a/ExampleFilters/phone.eff
+++ b/ExampleFilters/phone.eff
@@ -1,7 +1,4 @@
 <effect name="Telephone">
-    <biquad type="notch" fc="28" q="20" gain="-50" />
-    <biquad type="notch" fc="91" q="20" gain="-50" />
-    <biquad type="notch" fc="120" q="20" gain="-50" />
    <biquad type="lowshelf" fc="400" q="10" gain="-20" />
    <biquad type="highshelf" fc="8000" q="10" gain="-20" />
    <delayline>
--- a/ExampleFilters/radio.eff
+++ b/ExampleFilters/radio.eff
@@ -1,14 +1,12 @@
 <effect name="Radio">
-    <biquad type="notch" fc="28" q="20" gain="-50" />
-    <biquad type="notch" fc="91" q="20" gain="-50" />
-    <biquad type="notch" fc="120" q="20" gain="-50" />
-    <amplifier gain="0.1" />
-    <biquad type="peak" fc="1000" q="10" gain="45" />
-    <lfo frequency="5000" depth="0.3" />
-    <clipping clip="0.3" />
+    <amplifier gain="0.5" />
+    <biquad type="peak" fc="1000" q="10" gain="25" />
+    <lfo frequency="3000" depth="0.3" waveform="sine" mode="add" />
+    <clipping clip="0.9" />
    <biquad type="highshelf" fc="8000" q="1" gain="-20" />
    <delayline>
        <delay samples="100" gain="0.7" />
        <delay samples="200" gain="0.5" />
    </delayline>
+    <amplifier gain="0.3" />
 </effect>
--- a/ExampleFilters/robotic.eff
+++ b/ExampleFilters/robotic.eff
@@ -1,7 +1,4 @@
 <effect name="Robotic">
-    <biquad type="notch" fc="28" q="20" gain="-50" />
-    <biquad type="notch" fc="91" q="20" gain="-50" />
-    <biquad type="notch" fc="120" q="20" gain="-50" />
    <biquad type="lowshelf" fc="100" q="2" gain="-20" />
    <delayline>
        <delay samples="400" gain="1" pan="-0.3" />
--- a/ExampleFilters/stereochorus.eff
+++ b/ExampleFilters/stereochorus.eff
@@ -0,0 +1,10 @@
+<effect name="Stereo Chorus">
+    <delayline>
+        <delay samples="2000" gain="0.1" pan="-0.3">
+            <biquad type="highpass" fc="300" q="1" gain="0" />
+        </delay>
+        <delay samples="4000" gain="0.1" pan="0.3">
+            <biquad type="highpass" fc="300" q="1" gain="0" />
+        </delay>
+    </delayline>
+</effect>
--- a/resources/uk/co/majenko/audiobookrecorder/config.txt
+++ b/resources/uk/co/majenko/audiobookrecorder/config.txt
@@ -1 +1 @@
-version=0.1.9
+version=0.3.3
--- a/resources/uk/co/majenko/audiobookrecorder/icons/cut.png
+++ b/resources/uk/co/majenko/audiobookrecorder/icons/cut.png
--- a/resources/uk/co/majenko/audiobookrecorder/icons/disable-effects.png
+++ b/resources/uk/co/majenko/audiobookrecorder/icons/disable-effects.png
--- a/resources/uk/co/majenko/audiobookrecorder/icons/do-cut.png
+++ b/resources/uk/co/majenko/audiobookrecorder/icons/do-cut.png
--- a/resources/uk/co/majenko/audiobookrecorder/icons/manuscript.png
+++ b/resources/uk/co/majenko/audiobookrecorder/icons/manuscript.png
--- a/resources/uk/co/majenko/audiobookrecorder/icons/play-to.png
+++ b/resources/uk/co/majenko/audiobookrecorder/icons/play-to.png
--- a/resources/uk/co/majenko/audiobookrecorder/icons/split.png
+++ b/resources/uk/co/majenko/audiobookrecorder/icons/split.png
--- a/src/com/jtattoo/plaf/AbstractTheme.java
+++ b/src/com/jtattoo/plaf/AbstractTheme.java
@@ -795,7 +795,7 @@ public abstract class AbstractTheme extends MetalTheme {
    public FontUIResource getControlTextFont() {
        if (controlFont == null) {
            if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) {
-                controlFont = new FontUIResource(DIALOG, Font.BOLD, 14);
+                controlFont = new FontUIResource(DIALOG, Font.PLAIN, 14); // bold
            } else {
                controlFont = new FontUIResource(DIALOG, Font.PLAIN, 12);
            }
@@ -806,7 +806,7 @@ public abstract class AbstractTheme extends MetalTheme {
    public FontUIResource getSystemTextFont() {
        if (systemFont == null) {
            if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) {
-                systemFont = new FontUIResource(DIALOG, Font.BOLD, 14);
+                systemFont = new FontUIResource(DIALOG, Font.PLAIN, 14); // bold
            } else {
                systemFont = new FontUIResource(DIALOG, Font.PLAIN, 12);
            }
@@ -817,7 +817,7 @@ public abstract class AbstractTheme extends MetalTheme {
    public FontUIResource getUserTextFont() {
        if (userFont == null) {
            if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) {
-                userFont = new FontUIResource(DIALOG, Font.BOLD, 14);
+                userFont = new FontUIResource(DIALOG, Font.PLAIN, 14); // bold
            } else {
                userFont = new FontUIResource(DIALOG, Font.PLAIN, 12);
            }
@@ -828,7 +828,7 @@ public abstract class AbstractTheme extends MetalTheme {
    public FontUIResource getMenuTextFont() {
        if (menuFont == null) {
            if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) {
-                menuFont = new FontUIResource(DIALOG, Font.BOLD, 14);
+                menuFont = new FontUIResource(DIALOG, Font.PLAIN, 14); // bold
            } else {
                menuFont = new FontUIResource(DIALOG, Font.PLAIN, 12);
            }
@@ -839,9 +839,9 @@ public abstract class AbstractTheme extends MetalTheme {
    public FontUIResource getWindowTitleFont() {
        if (windowTitleFont == null) {
            if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) {
-                windowTitleFont = new FontUIResource(DIALOG, Font.BOLD, 14);
+                windowTitleFont = new FontUIResource(DIALOG, Font.PLAIN, 14); // bold
            } else {
-                windowTitleFont = new FontUIResource(DIALOG, Font.BOLD, 12);
+                windowTitleFont = new FontUIResource(DIALOG, Font.PLAIN, 12); // bold
            }
        }
        return windowTitleFont;
@@ -850,7 +850,7 @@ public abstract class AbstractTheme extends MetalTheme {
    public FontUIResource getSubTextFont() {
        if (smallFont == null) {
            if (JTattooUtilities.isLinux() && JTattooUtilities.isHiresScreen()) {
-                smallFont = new FontUIResource(DIALOG, Font.BOLD, 12);
+                smallFont = new FontUIResource(DIALOG, Font.PLAIN, 12); // bold
            } else {
                smallFont = new FontUIResource(DIALOG, Font.PLAIN, 10);
            }
--- a/src/com/jtattoo/plaf/hifi/HiFiDefaultTheme.java
+++ b/src/com/jtattoo/plaf/hifi/HiFiDefaultTheme.java
@@ -125,11 +125,11 @@ public class HiFiDefaultTheme extends AbstractTheme {
        tooltipForegroundColor = white;
        tooltipBackgroundColor = new ColorUIResource(24, 24, 24);
        
-        controlFont = new FontUIResource("Dialog", Font.BOLD, 12);
-        systemFont = new FontUIResource("Dialog", Font.BOLD, 12);
-        userFont = new FontUIResource("Dialog", Font.BOLD, 12);
-        menuFont = new FontUIResource("Dialog", Font.BOLD, 12);
-        windowTitleFont = new FontUIResource("Dialog", Font.BOLD, 12);
+        controlFont = new FontUIResource("Dialog", Font.PLAIN, 12); // bold
+        systemFont = new FontUIResource("Dialog", Font.PLAIN, 12); // bold
+        userFont = new FontUIResource("Dialog", Font.PLAIN, 12); // bold
+        menuFont = new FontUIResource("Dialog", Font.PLAIN, 12); // bold
+        windowTitleFont = new FontUIResource("Dialog", Font.PLAIN, 12); // bold
        smallFont = new FontUIResource("Dialog", Font.PLAIN, 10);
    }

--- a/src/com/jtattoo/plaf/hifi/HiFiLookAndFeel.java
+++ b/src/com/jtattoo/plaf/hifi/HiFiLookAndFeel.java
@@ -42,18 +42,18 @@ public class HiFiLookAndFeel extends AbstractLookAndFeel {
    private static final Properties giantFontProps = new Properties();

    static {
-        smallFontProps.setProperty("controlTextFont", "Dialog bold 10");
-        smallFontProps.setProperty("systemTextFont", "Dialog bold 10");
+        smallFontProps.setProperty("controlTextFont", "Dialog 10"); // bold
+        smallFontProps.setProperty("systemTextFont", "Dialog 10"); // bold
        smallFontProps.setProperty("userTextFont", "Dialog 10");
-        smallFontProps.setProperty("menuTextFont", "Dialog bold 10");
-        smallFontProps.setProperty("windowTitleFont", "Dialog bold 10");
+        smallFontProps.setProperty("menuTextFont", "Dialog 10"); // bold
+        smallFontProps.setProperty("windowTitleFont", "Dialog 10"); // bold
        smallFontProps.setProperty("subTextFont", "Dialog 8");

-        largeFontProps.setProperty("controlTextFont", "Dialog bold 14");
-        largeFontProps.setProperty("systemTextFont", "Dialog bold 14");
-        largeFontProps.setProperty("userTextFont", "Dialog bold 14");
-        largeFontProps.setProperty("menuTextFont", "Dialog bold 14");
-        largeFontProps.setProperty("windowTitleFont", "Dialog bold 14");
+        largeFontProps.setProperty("controlTextFont", "Dialog 14"); // bold
+        largeFontProps.setProperty("systemTextFont", "Dialog 14"); // bold
+        largeFontProps.setProperty("userTextFont", "Dialog 14"); // bold
+        largeFontProps.setProperty("menuTextFont", "Dialog 14"); // bold
+        largeFontProps.setProperty("windowTitleFont", "Dialog 14"); // bold
        largeFontProps.setProperty("subTextFont", "Dialog 12");

        giantFontProps.setProperty("controlTextFont", "Dialog 18");
--- a/src/uk/co/majenko/audiobookrecorder/AGC.java
+++ b/src/uk/co/majenko/audiobookrecorder/AGC.java
@@ -47,6 +47,7 @@ public class AGC implements Effect {

            gain += factor;
            if (gain > limit) gain = limit;
+            if (gain < 0) gain = 0;

            samples[i][Sentence.LEFT] *= gain;
            samples[i][Sentence.RIGHT] *= gain;
--- a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
+++ b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
--- a/src/uk/co/majenko/audiobookrecorder/Book.java
+++ b/src/uk/co/majenko/audiobookrecorder/Book.java
@@ -10,6 +10,20 @@ import java.nio.file.*;
 import javax.swing.tree.*;
 import javax.sound.sampled.*;

+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+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.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+
 public class Book extends DefaultMutableTreeNode {
    
    String name;
@@ -17,6 +31,9 @@ public class Book extends DefaultMutableTreeNode {
    String genre;
    String comment;
    String ACX;
+    String manuscript;
+
+    String defaultEffect = "none";

    int sampleRate;
    int channels;
@@ -31,7 +48,60 @@ public class Book extends DefaultMutableTreeNode {

        prefs = p;
        name = bookname;
-        AudiobookRecorder.window.setTitle("AudioBook Recorder :: " + name);
+        AudiobookRecorder.window.setTitle("AudioBook Recorder :: " + name); // This should be in the load routine!!!!
+    }
+
+    public Book(Element root) {
+        super(getTextNode(root, "title"));
+
+        name = getTextNode(root, "title");
+        AudiobookRecorder.window.setTitle("AudioBook Recorder :: " + name); // This should be in the load routine!!!!
+    }
+
+    public void loadBookXML(Element root, DefaultTreeModel model) {
+        name = getTextNode(root, "title");
+        author = getTextNode(root, "author");
+        genre = getTextNode(root, "genre");
+        comment = getTextNode(root, "comment");
+        ACX = getTextNode(root, "acx");
+        manuscript = getTextNode(root, "manuscript");
+
+        AudiobookRecorder.window.setBookNotes(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!!!!
+
+        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, model);
+            model.insertNodeInto(newChapter, this, getChildCount());
+        }
+    }
+
+    public static Element getNode(Element r, String n) {
+        NodeList nl = r.getElementsByTagName(n);
+        if (nl == null) return null;
+        if (nl.getLength() == 0) return null;
+        return (Element)nl.item(0);
+    }
+
+    public static String getTextNode(Element r, String n) {
+        Element node = getNode(r, n);
+        if (node == null) return "";
+        return node.getTextContent();
    }

    public void setAuthor(String a) { author = a; }
@@ -115,8 +185,12 @@ public class Book extends DefaultMutableTreeNode {
        }
    }

+    public File getBookPath() {
+        return new File(Options.get("path.storage"), name);
+    }
+
    public void renameBook(String newName) {
-        File oldDir = new File(Options.get("path.storage"), name);
+        File oldDir = getBookPath();
        File newDir = new File(Options.get("path.storage"), newName);

        if (newDir.exists()) {
@@ -206,4 +280,118 @@ public class Book extends DefaultMutableTreeNode {
        return out;
    }

+    public void purgeBackups() {
+        for (Enumeration o = children(); o.hasMoreElements();) {
+            Object ob = (Object)o.nextElement();
+            if (ob instanceof Chapter) {
+                Chapter c = (Chapter)ob;
+                c.purgeBackups();
+            }
+        }
+    }
+
+    public Document buildDocument() throws ParserConfigurationException {
+        DocumentBuilderFactory dbFactory =
+        DocumentBuilderFactory.newInstance();
+        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+        Document doc = dBuilder.newDocument();
+
+        Element root = doc.createElement("book");
+        doc.appendChild(root);
+
+        root.appendChild(makeTextNode(doc, "title", name));
+        root.appendChild(makeTextNode(doc, "author", author));
+        root.appendChild(makeTextNode(doc, "comment", comment));
+        root.appendChild(makeTextNode(doc, "genre", genre));
+        root.appendChild(makeTextNode(doc, "acx", ACX));
+        root.appendChild(makeTextNode(doc, "manuscript", manuscript));
+
+        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);
+        
+        effectsNode.appendChild(makeTextNode(doc, "default", defaultEffect));
+
+        Element chaptersNode = doc.createElement("chapters");
+
+        root.appendChild(chaptersNode);
+
+        for (Enumeration o = children(); o.hasMoreElements();) {
+            Object ob = (Object)o.nextElement();
+            if (ob instanceof Chapter) {
+                Chapter c = (Chapter)ob;
+                chaptersNode.appendChild(c.getChapterXML(doc));
+            }
+        }
+
+        return doc;
+    }
+
+    public static Element makeTextNode(Document doc, String name, String text) {
+        Element node = doc.createElement(name);
+        Text tnode = doc.createTextNode(text == null ? "" : text);
+        node.appendChild(tnode);
+        return node;
+    }
+
+    public static Element makeTextNode(Document doc, String name, Integer text) {
+        Element node = doc.createElement(name);
+        Text tnode = doc.createTextNode(Integer.toString(text));
+        node.appendChild(tnode);
+        return node;
+    }
+
+    public static Element makeTextNode(Document doc, String name, Double text) {
+        Element node = doc.createElement(name);
+        Text tnode = doc.createTextNode(String.format("%.8f", text));
+        node.appendChild(tnode);
+        return node;
+    }
+
+    public static Element makeTextNode(Document doc, String name, Boolean text) {
+        Element node = doc.createElement(name);
+        Text tnode = doc.createTextNode(text ? "true" : "false");
+        node.appendChild(tnode);
+        return node;
+    }
+
+    public String getDefaultEffect() {
+        return defaultEffect;
+    }
+
+    public void setDefaultEffect(String eff) {
+        defaultEffect = eff;
+    }
+
+    public void setManuscript(File f) {
+        manuscript = f.getName();
+        File dst = new File(getBookPath(), manuscript);
+
+        try {
+            Files.copy(f.toPath(), dst.toPath());
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public File getManuscript() {
+        if (manuscript == null) return null;
+        if (manuscript.equals("")) return null;
+        File f = new File(getBookPath(), manuscript);
+        if (f.exists()) { 
+            return f;
+        }
+        return null;
+    }
 }
--- a/src/uk/co/majenko/audiobookrecorder/BookPanel.java
+++ b/src/uk/co/majenko/audiobookrecorder/BookPanel.java
@@ -9,6 +9,20 @@ import javax.swing.border.*;
 import java.util.*;
 import java.io.*;

+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+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.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+
 public class BookPanel extends JPanel {
    String name;
    String author;
@@ -25,6 +39,7 @@ public class BookPanel extends JPanel {
    JPanel panel;

    File root;
+    File configFile;

    boolean highlight = false;

@@ -36,13 +51,78 @@ public class BookPanel extends JPanel {
        try {
            root = r;
            Properties props = new Properties();
-            props.loadFromXML(new FileInputStream(new File(root, "audiobook.abk")));
+
+            configFile = new File(root, "audiobook.abx");
+
+            if (configFile.exists()) {
+                loadXMLData(configFile);
+            } else {
+                configFile = new File(root, "audiobook.abk");
+                props.loadFromXML(new FileInputStream(configFile));
                loadBookData(props, null);
+            }
        } catch (Exception e) {
            e.printStackTrace();
        }
    }

+    public BookPanel(String n, String a, String g, String c, ImageIcon i) {
+        name = n;
+        author = a;
+        genre = g;
+        comment = c;
+        cover = i;
+        if (i != null) {
+            cover = i;
+            resizedCover = Utils.getScaledImage(cover.getImage(), 75, 75);
+            iconLabel = new JLabel(new ImageIcon(resizedCover));
+        } else {
+            cover = null;
+            resizedCover = null;
+            iconLabel = new JLabel("");
+        }
+        populate();
+    }
+
+    public void loadXMLData(File inputFile) {
+        try {
+            DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+            Document doc = dBuilder.parse(inputFile);
+            doc.getDocumentElement().normalize();
+
+            Element rootnode = doc.getDocumentElement();
+
+            name = Book.getTextNode(rootnode, "title");
+            author = Book.getTextNode(rootnode, "author");
+            genre = Book.getTextNode(rootnode, "genre");
+            comment = Book.getTextNode(rootnode, "comment");
+
+            File icon = new File(root, "coverart.png");
+            if (!icon.exists()) {
+                icon = new File(root, "coverart.jpg");
+            }
+            if (!icon.exists()) {
+                icon = new File(root, "coverart.gif");
+            }
+
+            if (icon.exists()) {
+                cover = new ImageIcon(icon.getAbsolutePath());
+                resizedCover = Utils.getScaledImage(cover.getImage(), 75, 75);
+                iconLabel = new JLabel(new ImageIcon(resizedCover));
+            } else {
+                cover = null;
+                resizedCover = null;
+                iconLabel = new JLabel("");
+            }
+
+            populate();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
+    }
+
    public void loadBookData(Properties props, ImageIcon i) {
        try {
            name = props.getProperty("book.name");
@@ -71,7 +151,12 @@ public class BookPanel extends JPanel {
                resizedCover = Utils.getScaledImage(cover.getImage(), 75, 75);
                iconLabel = new JLabel(new ImageIcon(resizedCover));
            }
+            populate();
+        } catch (Exception e) {
+        }
+    }

+    void populate() {
        iconLabel.setSize(new Dimension(75, 75));
        iconLabel.setPreferredSize(new Dimension(75, 75));

@@ -100,12 +185,10 @@ public class BookPanel extends JPanel {
        panel.setOpaque(true);
        setBackground(new Color(0x20, 0x20, 0x20));
        setOpaque(true);
-        } catch (Exception e) {
-        }
    }

    public File getConfigFile() {
-        return new File(root, "audiobook.abk");
+        return configFile;
    }

    public void highlight() {
--- a/src/uk/co/majenko/audiobookrecorder/BookTreeNode.java
+++ b/src/uk/co/majenko/audiobookrecorder/BookTreeNode.java
@@ -0,0 +1,20 @@
+package uk.co.majenko.audiobookrecorder;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+
+public abstract class BookTreeNode extends DefaultMutableTreeNode {
+
+    public BookTreeNode(String t) {
+        super(t);
+    }
+
+    public BookTreeNode() {
+        super("");
+    }
+
+    public abstract void setNotes(String t);
+    public abstract String getNotes();
+
+    public abstract void onSelect();
+}
+
--- a/src/uk/co/majenko/audiobookrecorder/BookTreeRenderer.java
+++ b/src/uk/co/majenko/audiobookrecorder/BookTreeRenderer.java
@@ -3,11 +3,14 @@ package uk.co.majenko.audiobookrecorder;
 import javax.swing.*;
 import javax.swing.tree.*;
 import java.awt.*;
+import javax.swing.border.*;

 public class BookTreeRenderer extends DefaultTreeCellRenderer {

    public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) {
        JLabel ret = (JLabel) super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
+        ret.setIconTextGap(0);
+        ret.setBorder(new EmptyBorder(0, 0, 0, 0));
        if (value instanceof Sentence) {
            Sentence s = (Sentence)value;

@@ -17,13 +20,17 @@ public class BookTreeRenderer extends DefaultTreeCellRenderer {
                ret.setText(s.getOverrideText());
            }

+            if (!s.isProcessed()) {
+                ret.setForeground(new Color(0x88, 0x88, 0x88));
+            }
+
            if (s.getAttentionFlag()) {
                ret.setForeground(new Color(0xFF, 0xFF, 0x00));
                icn.add(Overlays.attention, OverlayIcon.TOP_LEFT);
            } 

            if (s.isLocked()) {
-                ret.setForeground(new Color(0x00, 0x80, 0xFF));
+                ret.setForeground(new Color(0x30, 0xb0, 0xFF));
                icn.add(Overlays.locked, OverlayIcon.BOTTOM_LEFT);
            } 

@@ -31,6 +38,10 @@ public class BookTreeRenderer extends DefaultTreeCellRenderer {
                icn.add(Overlays.important, OverlayIcon.TOP_RIGHT);
            } 

+            if (s.getEndOffset() == s.getSampleSize() - 1) {
+                icn.add(Overlays.important, OverlayIcon.TOP_RIGHT);
+            }
+
            if (s.getEffectChain() != null) {
                if (!s.getEffectChain().equals("none")) {
                    icn.add(Overlays.filter, OverlayIcon.BOTTOM_RIGHT);
@@ -39,6 +50,28 @@ public class BookTreeRenderer extends DefaultTreeCellRenderer {

            ret.setIcon(icn);

+            String gaptype = s.getPostGapType();
+            DefaultMutableTreeNode prev = s.getPreviousSibling();
+            String prevtype = "sentence";
+            if (prev instanceof Sentence) {
+                Sentence s2 = (Sentence)prev;
+                prevtype = s2.getPostGapType();
+            }
+
+            if (prevtype.equals("continuation")) {
+                ret.setIconTextGap(20);
+            }
+
+            if (gaptype.equals("sentence")) {
+                ret.setBorder(new EmptyBorder(0, 0, 0, 0));
+            } else if (gaptype.equals("continuation")) {
+                ret.setBorder(new EmptyBorder(0, 0, 0, 0));
+            } else if (gaptype.equals("paragraph")) {
+                ret.setBorder(new EmptyBorder(0, 0, 7, 0));
+            } else if (gaptype.equals("section")) {
+                ret.setBorder(new EmptyBorder(0, 0, 15, 0));
+            }
+
        } else if (value instanceof Chapter) {
            ret.setIcon(Icons.chapter);
        } else if (value instanceof Book) {
--- a/src/uk/co/majenko/audiobookrecorder/CacheManager.java
+++ b/src/uk/co/majenko/audiobookrecorder/CacheManager.java
@@ -13,13 +13,14 @@ public class CacheManager {
            if (ob.lockedInCache()) {
                cache.add(ob);
            } else {
+                if (ob instanceof Sentence) {
+                    Sentence s = (Sentence)ob;
+                }
                ob.clearCache();
            }
        }

        cache.add(c);
-
-        System.gc();
    }

    public static void setCacheSize(int c) {
@@ -27,7 +28,17 @@ public class CacheManager {
    }

    public static void removeFromCache(Cacheable c) {
+        if (c instanceof Sentence) {
+            Sentence s = (Sentence)c;
+        }
        cache.remove(c);
        c.clearCache();
    }
+
+    public static void purgeCache() {
+        for (Cacheable c : cache) {
+            c.clearCache();
+        }
+        cache.clear();
+    }
 }
--- a/src/uk/co/majenko/audiobookrecorder/Chapter.java
+++ b/src/uk/co/majenko/audiobookrecorder/Chapter.java
@@ -12,8 +12,21 @@ import it.sauronsoftware.jave.*;
 import com.mpatric.mp3agic.*;
 import javax.sound.sampled.*;

+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+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.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;

-public class Chapter extends DefaultMutableTreeNode {
+public class Chapter extends BookTreeNode {
    
    String name;
    String id;
@@ -21,6 +34,8 @@ public class Chapter extends DefaultMutableTreeNode {
    int preGap;
    int postGap;

+    String notes;
+
    public Chapter(String i, String chaptername) {
        super(chaptername);

@@ -28,7 +43,25 @@ public class Chapter extends DefaultMutableTreeNode {
        name = chaptername;
        preGap = Options.getInteger("catenation.pre-chapter");
        postGap = Options.getInteger("catenation.post-chapter");
+    }

+    public Chapter(Element root, DefaultTreeModel model) {
+
+        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);
+            model.insertNodeInto(newSentence, this, getChildCount());
+        }
    }

    public String getId() {
@@ -116,7 +149,7 @@ public class Chapter extends DefaultMutableTreeNode {
        audioAttributes.setCodec("libmp3lame");
        audioAttributes.setBitRate(Options.getInteger("audio.export.bitrate"));
        audioAttributes.setSamplingRate(Options.getInteger("audio.export.samplerate"));
-        audioAttributes.setChannels(2); //new Integer(2));
+        audioAttributes.setChannels(Options.getInteger("audio.export.channels")); //new Integer(2));
        attributes.setFormat("mp3");
        attributes.setAudioAttributes(audioAttributes);

@@ -232,5 +265,55 @@ public class Chapter extends DefaultMutableTreeNode {
        return out;
    }

+    public void resetPostGaps() {
+        for (Enumeration s = children(); s.hasMoreElements();) {
+            Sentence snt = (Sentence)s.nextElement();
+            snt.resetPostGap();
+        }
+    }
+
+    public void purgeBackups() {
+        for (Enumeration o = children(); o.hasMoreElements();) {
+            Object ob = (Object)o.nextElement();
+            if (ob instanceof Sentence) {
+                Sentence s = (Sentence)ob;
+                s.purgeBackups();
+            }
+        }
+    }
+
+    public Element getChapterXML(Document doc) {
+        Element chapterNode = doc.createElement("chapter");
+        chapterNode.setAttribute("id", id);
+        chapterNode.appendChild(Book.makeTextNode(doc, "name", name));
+        chapterNode.appendChild(Book.makeTextNode(doc, "pre-gap", preGap));
+        chapterNode.appendChild(Book.makeTextNode(doc, "post-gap", postGap));
+        chapterNode.appendChild(Book.makeTextNode(doc, "notes", notes));
+
+        Element sentencesNode = doc.createElement("sentences");
+        chapterNode.appendChild(sentencesNode);
+
+        for (Enumeration o = children(); o.hasMoreElements();) {
+            Object ob = (Object)o.nextElement();
+            if (ob instanceof Sentence) {
+                Sentence s = (Sentence)ob;
+                sentencesNode.appendChild(s.getSentenceXML(doc));
+            }
+        }
+
+        return chapterNode;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String t) {
+        notes = t;
+    }
+
+    public void onSelect() {
+        AudiobookRecorder.window.setChapterNotes(notes);
+    }

 }
--- a/src/uk/co/majenko/audiobookrecorder/Debug.java
+++ b/src/uk/co/majenko/audiobookrecorder/Debug.java
@@ -0,0 +1,12 @@
+package uk.co.majenko.audiobookrecorder;
+
+public class Debug {
+    static long timestamp;
+
+    static void debug(String msg) {
+        long now = System.currentTimeMillis();
+        long diff = now - timestamp;
+        timestamp = now;
+        System.err.println(String.format("%8d - %s", diff, msg));
+    }
+}
--- a/src/uk/co/majenko/audiobookrecorder/FlashPanel.java
+++ b/src/uk/co/majenko/audiobookrecorder/FlashPanel.java
@@ -27,6 +27,8 @@ public class FlashPanel extends JPanel {
    public void setFlash(boolean f) {
        flash = f;

+        col = true;
+
        for (Component o : getComponents()) {
            ((JComponent)o).setVisible(!f);
        }
@@ -42,7 +44,7 @@ public class FlashPanel extends JPanel {
        if (col) {
            g.setColor(Color.RED);
        } else {
-            g.setColor(Color.BLACK);
+            g.setColor(Color.GREEN);
        }
        Dimension d = getSize();
        g.fillRect(0, 0, d.width, d.height);
--- a/src/uk/co/majenko/audiobookrecorder/Icons.java
+++ b/src/uk/co/majenko/audiobookrecorder/Icons.java
@@ -33,4 +33,10 @@ public class Icons {
    static public final ImageIcon dollar      = new ImageIcon(Icons.class.getResource("icons/dollar.png"));
    static public final ImageIcon attention   = new ImageIcon(Icons.class.getResource("icons/attention.png"));
    static public final ImageIcon normalize   = new ImageIcon(Icons.class.getResource("icons/normalize.png"));
+    static public final ImageIcon split       = new ImageIcon(Icons.class.getResource("icons/split.png"));
+    static public final ImageIcon cut         = new ImageIcon(Icons.class.getResource("icons/cut.png"));
+    static public final ImageIcon docut       = new ImageIcon(Icons.class.getResource("icons/do-cut.png"));
+    static public final ImageIcon playto      = new ImageIcon(Icons.class.getResource("icons/play-to.png"));
+    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"));
 }
--- a/src/uk/co/majenko/audiobookrecorder/LFO.java
+++ b/src/uk/co/majenko/audiobookrecorder/LFO.java
@@ -9,37 +9,73 @@ public class LFO implements Effect {
    double depth;
    double sampleRate;
    double sampleStep;
+    int waveform;
+    double duty;
+    int mode;
+
+    public static final int SINE = 0;
+    public static final int COSINE = 1;
+    public static final int SQUARE = 2;
+    public static final int TRIANGLE = 3;
+    public static final int SAWTOOTH = 4;
+
+    public static final int ADD = 0;
+    public static final int REPLACE = 1;

    public LFO(double f, double d) {
-        frequency = f;
-        depth = d;
-        phase = 0;
+        this(f, d, 0, SINE, Math.PI, REPLACE);
    }

    public LFO(double f, double d, double p) {
+        this(f, d, p, SINE, Math.PI, REPLACE);
+    }
+
+    public LFO(double f, double d, double p, int w) {
+        this(f, d, p, w, Math.PI, REPLACE);
+    }
+
+    public LFO(double f, double d, double p, int w, double dty) {
+        this(f, d, p, w, dty, REPLACE);
+    }
+
+    public LFO(double f, double d, double p, int w, double dty, int m) {
        frequency = f;
        depth = d;
        phase = p;
+        waveform = w;
+        duty = dty;
+        mode = m;
    }

    public void process(double[][] samples) {
        for (double[] sample : samples) {
-            double v = Math.sin(phase);
+            double v = 0;
+            switch (waveform) {
+                case SINE: v = Math.sin(phase); break;
+                case COSINE: v = Math.cos(phase); break;
+                case SQUARE: v = (phase > duty) ? 1d : 0d; break;
+                case TRIANGLE: v = (phase < Math.PI) ? (phase / Math.PI) : (1d - ((phase - Math.PI) / Math.PI)); break;
+                case SAWTOOTH: v = (phase / (Math.PI*2d)); break;
+            }
            phase += sampleStep;
            if (phase > (Math.PI * 2d)) {
                phase -= (Math.PI * 2d);
            }

-//        // Make it between 0 and 1.
-//        v = 1d + v;
-//        v /= 2d;
-
            // Multiply it by the gain factor
            v *= depth;

            // Apply it to the sample
+            switch (mode) {
+                case REPLACE:
+                    sample[Sentence.LEFT] = (sample[Sentence.LEFT] * v);
+                    sample[Sentence.RIGHT] = (sample[Sentence.RIGHT] * v);
+                    break;
+                case ADD:
                    sample[Sentence.LEFT] += (sample[Sentence.LEFT] * v);
                    sample[Sentence.RIGHT] += (sample[Sentence.RIGHT] * v);
+                    break;
+            }
        }
    }

--- a/src/uk/co/majenko/audiobookrecorder/MainToolBar.java
+++ b/src/uk/co/majenko/audiobookrecorder/MainToolBar.java
@@ -14,9 +14,15 @@ public class MainToolBar extends JToolBar {
    JButtonSpacePlay recordRoomNoise;
    JButtonSpacePlay playSentence;
    JButtonSpacePlay playonSentence;
+    JButtonSpacePlay playtoSentence;
    JButtonSpacePlay stopPlaying;
    JButtonSpacePlay eq;
-    JToggleButton mic;
+    JButtonSpacePlay openManuscript;
+    JToggleButtonSpacePlay mic;
+
+    JComboBox<String> playbackSpeed;
+
+    JToggleButtonSpacePlay disableEffects;

    AudiobookRecorder root;

@@ -78,6 +84,14 @@ public class MainToolBar extends JToolBar {
        });
        add(playonSentence);

+        playtoSentence = new JButtonSpacePlay(Icons.playto, "Play sentence to cut", new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                root.playToSelectedSentence();
+            }
+        });
+        add(playtoSentence);
+        playtoSentence.setEnabled(false);
+
        stopPlaying = new JButtonSpacePlay(Icons.stop, "Stop playing", new ActionListener() {
            public void actionPerformed(ActionEvent e) {
                root.stopPlaying();
@@ -89,6 +103,7 @@ public class MainToolBar extends JToolBar {
        eq = new JButtonSpacePlay(Icons.eq, "Reload Effects", new ActionListener() {
            public void actionPerformed(ActionEvent e) {
                root.loadEffects();
+                CacheManager.purgeCache();
            }
        });

@@ -118,10 +133,64 @@ public class MainToolBar extends JToolBar {
            }
        });

+        
        add(mic);

+        addSeparator();
+
+        disableEffects = new JToggleButtonSpacePlay(Icons.disable, "Disable effects", new ActionListener() {
+            Color bgCol = null;
+            public void actionPerformed(ActionEvent e) {
+                JToggleButton b = (JToggleButton)e.getSource();
+                if (b.isSelected()) {
+                    root.setEffectsEnabled(false);
+                    bgCol = b.getBackground();
+                    b.setBackground(Color.RED);
+                } else {
+                    root.setEffectsEnabled(true);
+                    if (bgCol != null) {
+                        b.setBackground(bgCol);
+                    }
+                }
+            }
+        });
+
+        add(disableEffects);
+
+        addSeparator();
+
+        add(new JLabel("Playback speed: "));
+        playbackSpeed = new JComboBox<String>(new String[] {
+            "0.75x",
+            "1.00x",
+            "1.25x",
+            "1.50x",
+            "1.75x"
+        });
+        playbackSpeed.setFocusable(false);
+
+        playbackSpeed.setSelectedIndex(1);
+        add(playbackSpeed);
+
+        addSeparator();
+        openManuscript = new JButtonSpacePlay(Icons.manuscript, "Open Manuscript", new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                root.openManuscript();
+            }
+        });
+        add(openManuscript);
+

        setFloatable(false);
    }

+    public void enablePlayTo(boolean b) {
+        playtoSentence.setEnabled(b);
+    }
+
+    public float getPlaybackSpeed() {
+        int v = playbackSpeed.getSelectedIndex();
+        return 0.75f + (0.25f * v);
+    }
+
 }
--- a/src/uk/co/majenko/audiobookrecorder/OpenBookPanel.java
+++ b/src/uk/co/majenko/audiobookrecorder/OpenBookPanel.java
@@ -86,10 +86,16 @@ public class OpenBookPanel extends JPanel {
                for (File b : dir.listFiles()) {
                    if (b == null) continue;
                    if (!b.isDirectory()) continue;
-                    File xml = new File(b, "audiobook.abk");
+                    File xml = new File(b, "audiobook.abx");
                    if (xml.exists()) {
                        BookPanel book = new BookPanel(b);
                        model.addBook(book);
+                    } else {
+                        xml = new File(b, "audiobook.abk");
+                        if (xml.exists()) {
+                            BookPanel book = new BookPanel(b);
+                            model.addBook(book);
+                        }
                    }
                }
            }
--- a/src/uk/co/majenko/audiobookrecorder/Options.java
+++ b/src/uk/co/majenko/audiobookrecorder/Options.java
@@ -24,6 +24,8 @@ public class Options extends JDialog {
    JComboBox<KVPair> rateList;
    JComboBox<KVPair> bitDepth;
    JComboBox<KVPair> trimMethod;
+    JComboBox<KVPair> fftBlockSize;
+    JComboBox<KVPair> playbackBlockSize;
    JTextField storageFolder;
    JTextField archiveFolder;
    JSpinner preChapterGap;
@@ -34,6 +36,7 @@ public class Options extends JDialog {
    JSpinner postSectionGap;
    JTextField ffmpegLocation;
    JComboBox<KVPair> bitRate;
+    JComboBox<KVPair> channels;
    JComboBox<KVPair> exportRate;
    JCheckBox enableParsing;
    JSpinner cacheSize;
@@ -297,10 +300,12 @@ public class Options extends JDialog {
        bitDepth = addDropdown(optionsPanel, "Sample resolution:", getResolutionList(), get("audio.recording.resolution"));
        trimMethod = addDropdown(optionsPanel, "Auto-trim method:", getTrimMethods(), get("audio.recording.trim"));
        fftThreshold = addSpinner(optionsPanel, "FFT threshold:", 0, 100, 1, getInteger("audio.recording.trim.fft"), "");
+        fftBlockSize = addDropdown(optionsPanel, "FFT Block size:", getFFTBlockSizes(), get("audio.recording.trim.blocksize"));

        addSeparator(optionsPanel);

        playbackList = addDropdown(optionsPanel, "Playback device:", getPlaybackMixerList(), get("audio.playback.device"));
+        playbackBlockSize = addDropdown(optionsPanel, "Playback Block size:", getPlaybackBlockSizes(), get("audio.playback.blocksize"));
        addSeparator(optionsPanel);
        storageFolder = addFilePath(optionsPanel, "Storage folder:", get("path.storage"), true);
        archiveFolder = addFilePath(optionsPanel, "Archive folder:", get("path.archive"), true);
@@ -318,6 +323,7 @@ public class Options extends JDialog {

        ffmpegLocation = addFilePath(optionsPanel, "FFMPEG location:", get("path.ffmpeg"), false);
        bitRate = addDropdown(optionsPanel, "Export bitrate:", getBitrates(), get("audio.export.bitrate"));
+        channels = addDropdown(optionsPanel, "Export channels:", getChannelCountList(), get("audio.export.channels"));
        exportRate = addDropdown(optionsPanel, "Export sample rate:", getSampleRateList(), get("audio.export.samplerate"));
        

@@ -565,6 +571,8 @@ public class Options extends JDialog {
        } else {
            defaultPrefs.put("audio.playback.device", "");
        }
+        defaultPrefs.put("audio.recording.trim.blocksize", "4096");
+        defaultPrefs.put("audio.playback.blocksize", "4096");

        defaultPrefs.put("catenation.pre-chapter", "1000");
        defaultPrefs.put("catenation.post-chapter", "1500");
@@ -580,6 +588,7 @@ public class Options extends JDialog {
        defaultPrefs.put("path.ffmpeg", "");

        defaultPrefs.put("audio.export.bitrate", "256000");
+        defaultPrefs.put("audio.export.channels", "2");
        defaultPrefs.put("audio.export.samplerate", "44100");
        defaultPrefs.put("process.sphinx", "false");

@@ -703,11 +712,14 @@ public class Options extends JDialog {
        set("catenation.post-paragraph", postParagraphGap.getValue());
        set("catenation.post-section", postSectionGap.getValue());
        set("audio.export.bitrate", ((KVPair)bitRate.getSelectedItem()).key);
+        set("audio.export.channels", ((KVPair)channels.getSelectedItem()).key);
        set("audio.export.samplerate", ((KVPair)exportRate.getSelectedItem()).key);
        set("process.sphinx", enableParsing.isSelected());
        set("editor.external", externalEditor.getText());
        set("cache.size", cacheSize.getValue());
        set("audio.recording.trim.fft", fftThreshold.getValue());
+        set("audio.recording.trim.blocksize", ((KVPair)fftBlockSize.getSelectedItem()).key);
+        set("audio.playback.blocksize", ((KVPair)playbackBlockSize.getSelectedItem()).key);

        set("effects.ethereal.offset", etherealOffset.getValue());
        set("effects.ethereal.iterations", etherealIterations.getValue());
@@ -782,6 +794,31 @@ public class Options extends JDialog {
        return pairs;
    }

+    public static KVPair[] getFFTBlockSizes() {
+        KVPair[] pairs = new KVPair[8];
+        pairs[0] = new KVPair<String, String>("1024", "1024");
+        pairs[1] = new KVPair<String, String>("2048", "2048");
+        pairs[2] = new KVPair<String, String>("4096", "4096");
+        pairs[3] = new KVPair<String, String>("8192", "8192");
+        pairs[4] = new KVPair<String, String>("16384", "16384");
+        pairs[5] = new KVPair<String, String>("32768", "32768");
+        pairs[6] = new KVPair<String, String>("65536", "65537");
+        pairs[7] = new KVPair<String, String>("131072", "131072");
+        return pairs;
+    }
+
+    public static KVPair[] getPlaybackBlockSizes() {
+        KVPair[] pairs = new KVPair[8];
+        pairs[0] = new KVPair<String, String>("1024", "1024");
+        pairs[1] = new KVPair<String, String>("2048", "2048");
+        pairs[2] = new KVPair<String, String>("4096", "4096");
+        pairs[3] = new KVPair<String, String>("8192", "8192");
+        pairs[4] = new KVPair<String, String>("16384", "16384");
+        pairs[5] = new KVPair<String, String>("32768", "32768");
+        pairs[6] = new KVPair<String, String>("65536", "65537");
+        pairs[7] = new KVPair<String, String>("131072", "131072");
+        return pairs;
+    }

    public static void createEffectChains() {
        effectChains = new ArrayList<EffectGroup>();
--- a/src/uk/co/majenko/audiobookrecorder/Sentence.java
+++ b/src/uk/co/majenko/audiobookrecorder/Sentence.java
@@ -29,16 +29,29 @@ import org.json.*;

 import java.util.Timer;

+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+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.Element;
+import org.w3c.dom.Text;

-public class Sentence extends DefaultMutableTreeNode implements Cacheable {
+public class Sentence extends BookTreeNode implements Cacheable {

    String text;
    String id;
+    String notes;
    int postGap;
    int startOffset = 0;
    int endOffset = 0;
    int crossStartOffset = -1;
    int crossEndOffset = -1;
+    String postGapType = "none";

    int sampleSize = -1;

@@ -48,6 +61,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {

    boolean inSample;
    boolean attention = false;
+    boolean processed = false;

    String effectChain = null;

@@ -74,20 +88,26 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {

    boolean effectEthereal = false;

+    public void setSampleSize(int s) {
+        sampleSize = s;
+    }
+
    static class RecordingThread implements Runnable {

        boolean running = false;
        boolean recording = false;
+        Sentence sent = null;

        File tempFile;
        File wavFile;

        AudioFormat format;

-        public RecordingThread(File tf, File wf, AudioFormat af) {
+        public RecordingThread(File tf, File wf, AudioFormat af, Sentence s) {
            tempFile = tf;
            wavFile = wf;
            format = af;
+            sent = s;
        }

        public void run() {
@@ -109,6 +129,8 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
                fos.write(buf, 0, nr);
                fos.close();

+                sent.setSampleSize(len / format.getFrameSize());
+
                FileInputStream fis = new FileInputStream(tempFile);
                AudioInputStream ais = new AudioInputStream(fis, format, len / format.getFrameSize());
                fos = new FileOutputStream(wavFile);
@@ -154,6 +176,24 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
        postGap = Options.getInteger("catenation.post-sentence");
    }

+    public Sentence(Element root) {
+        super("");
+        id = root.getAttribute("id");
+        text = Book.getTextNode(root, "text");
+        notes = Book.getTextNode(root, "notes");
+        setUserObject(text);
+        setPostGap(Utils.s2i(Book.getTextNode(root, "post-gap")));
+        setStartOffset(Utils.s2i(Book.getTextNode(root, "start-offset")));
+        setEndOffset(Utils.s2i(Book.getTextNode(root, "end-offset")));
+        setLocked(Utils.s2b(Book.getTextNode(root, "locked")));
+        setAttentionFlag(Utils.s2b(Book.getTextNode(root, "attention")));
+        setGain(Utils.s2d(Book.getTextNode(root, "gain")));
+        setEffectChain(Book.getTextNode(root, "effect"));
+        setPostGapType(Book.getTextNode(root, "gaptype"));
+        sampleSize = Utils.s2i(Book.getTextNode(root, "samples"));
+        processed = Utils.s2b(Book.getTextNode(root, "processed"));
+    }
+
    public boolean startRecording() {
        if (AudiobookRecorder.window.microphone == null) {
            JOptionPane.showMessageDialog(AudiobookRecorder.window, "Microphone not started. Start the microphone first.", "Error", JOptionPane.ERROR_MESSAGE);
@@ -162,7 +202,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {

        CacheManager.removeFromCache(this);

-        recordingThread = new RecordingThread(getTempFile(), getFile(), Options.getAudioFormat());
+        recordingThread = new RecordingThread(getTempFile(), getFile(), Options.getAudioFormat(), this);

        Thread rc = new Thread(recordingThread);
        rc.setDaemon(true);
@@ -183,16 +223,8 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {

        CacheManager.removeFromCache(this);

-        audioData = null;
-        processedAudio = null;
-
        if (!id.equals("room-noise")) {
-            String tm = Options.get("audio.recording.trim");
-            if (tm.equals("peak")) {
-                autoTrimSamplePeak(true);
-            } else if (tm.equals("fft")) {
-                autoTrimSampleFFT(true);
-            }
+            autoTrimSample(true);
            if (Options.getBoolean("process.sphinx")) {
                recognise();
            }
@@ -200,6 +232,25 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {

    }

+    public void autoTrimSample() {
+        autoTrimSample(false);
+    }
+
+    public void autoTrimSample(boolean useRaw) {
+        String tm = Options.get("audio.recording.trim");
+        if (tm.equals("peak")) {
+            autoTrimSamplePeak(useRaw);
+        } else if (tm.equals("fft")) {
+            autoTrimSampleFFT(useRaw);
+        } else {
+            startOffset = 0;
+            crossStartOffset = 0;
+            endOffset = sampleSize - 1;
+            crossEndOffset = sampleSize - 1;
+            processed = false;
+        }
+    }
+
    public static final int FFTBuckets = 1024;

    public void autoTrimSampleFFT() {
@@ -216,21 +267,21 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
            samples = getProcessedAudioData();
        }
        if (samples == null) {
-            System.err.println("Error: loading data failed!");
            return;
        }

+        int fftSize = Options.getInteger("audio.recording.trim.blocksize");

-        int blocks = samples.length / 4096 + 1;
+        int blocks = samples.length / fftSize + 1;

        int[] intens = new int[blocks];
        int block = 0;

-        for (int i = 0; i < samples.length; i+= 4096) {
-            double[] real = new double[4096];
-            double[] imag = new double[4096];
+        for (int i = 0; i < samples.length; i+= fftSize) {
+            double[] real = new double[fftSize];
+            double[] imag = new double[fftSize];

-            for (int j = 0; j < 4096; j++) {
+            for (int j = 0; j < fftSize; j++) {
                if (i + j < samples.length) {
                    real[j] = (samples[i+j][LEFT] + samples[i+j][RIGHT]) / 2d;
                    imag[j] = 0;
@@ -242,14 +293,14 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {

            double[] buckets = FFT.fft(real, imag, true);
            double av = 0;
-            for (int j = 1; j < 2048; j++) {
+            for (int j = 1; j < fftSize/2; j++) {
                av += Math.abs(buckets[j]);
            }
-            av /= 2047d;
+            av /= (fftSize / 2);

            intens[block] = 0;

-            for (int j = 2; j < 4096; j += 2) {
+            for (int j = 2; j < fftSize; j += 2) {
                double d = Math.abs(av - buckets[j]);
                if (d > 0.05) {
                    intens[block]++;
@@ -273,7 +324,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
            start = 0;
        }

-        startOffset = start * 4096;
+        startOffset = start * fftSize;
        if (startOffset < 0) startOffset = 0;
        if (startOffset >= samples.length) startOffset = samples.length;

@@ -290,16 +341,16 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
            end = blocks - 1;
        }

-        endOffset = end * 4096;
+        endOffset = (end+1) * fftSize;

-        if (endOffset <= startOffset) endOffset = startOffset + 4096;
+        if (endOffset <= startOffset) endOffset = startOffset + fftSize;
        if (endOffset < 0) endOffset = 0;
        if (endOffset >= samples.length) endOffset = samples.length;
        updateCrossings(useRaw);
        intens = null;
        samples = null;
-        System.gc();
-
+        processed = true;
+        AudiobookRecorder.window.bookTreeModel.reload(this);
    }

    public void autoTrimSamplePeak() {
@@ -333,7 +384,8 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
            startOffset = 0;
        }

-        startOffset -= 4096;
+        int fftSize = Options.getInteger("audio.recording.trim.blocksize");
+        startOffset -= fftSize;

        for (int i = samples.length-1; i >= 0; i--) {
            endOffset = i;
@@ -344,9 +396,9 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
            }
        }

-        endOffset += 4096;
+        endOffset += fftSize;

-        if (endOffset <= startOffset) endOffset = startOffset + 4096;
+        if (endOffset <= startOffset) endOffset = startOffset + fftSize;
        if (endOffset <= 0) {
            endOffset = samples.length-1;
        }
@@ -354,6 +406,8 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
        if (startOffset < 0) startOffset = 0;
        if (endOffset >= samples.length) endOffset = samples.length-1;
        updateCrossings(useRaw);
+        processed = true;
+        AudiobookRecorder.window.bookTreeModel.reload(this);
    }

    public String getId() {
@@ -363,6 +417,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
    public void setText(String t) {
        overrideText = null;
        text = t;
+        AudiobookRecorder.window.bookTreeModel.reload(this);
    }

    public String getText() {
@@ -410,6 +465,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
        if (o instanceof String) {
            String so = (String)o;
            text = so;
+            AudiobookRecorder.window.bookTreeModel.reload(this);
        }
    }

@@ -469,6 +525,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
        if (startOffset != o) {
            startOffset = o;
            crossStartOffset = -1;
+            AudiobookRecorder.window.bookTreeModel.reload(this);
        }
    }

@@ -484,6 +541,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
        if (endOffset != o) {
            endOffset = o;
            crossEndOffset = -1;
+            AudiobookRecorder.window.bookTreeModel.reload(this);
        }
    }

@@ -564,6 +622,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {

    public void setLocked(boolean l) {
        locked = l;
+        AudiobookRecorder.window.bookTreeModel.reload(this);
    }

    public boolean isLocked() {
@@ -666,6 +725,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {

    public void setAttentionFlag(boolean f) {
        attention = f;
+        AudiobookRecorder.window.bookTreeModel.reload(this);
    }

    public boolean getAttentionFlag() {
@@ -673,17 +733,21 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
    }

    public double getPeakValue() {
-        return getPeakValue(false);
+        return getPeakValue(false, true);
    }

    public double getPeakValue(boolean useRaw) {
+        return getPeakValue(useRaw, true);
+    }
+
+    public double getPeakValue(boolean useRaw, boolean applyGain) {
        double oldGain = gain;
        gain = 1.0d;
        double[][] samples = null;
        if (useRaw) {
            samples = getRawAudioData();
        } else {
-            samples = getProcessedAudioData();
+            samples = getProcessedAudioData(true, applyGain);
        }
        gain = oldGain;
        if (samples == null) {
@@ -711,8 +775,10 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
        if (g <= 0.0001d) g = 1.0d;
        if (g == gain) return;

-        if (gain != g) {
-            clearCache();
+        int gint = (int)(g * 100d);
+        int gainint = (int)(gain * 100d);
+        if (gint != gainint) {
+            CacheManager.removeFromCache(this);
        }
        gain = g;
    }
@@ -723,7 +789,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {

    public void normalize() {
        if (locked) return;
-        double max = getPeakValue();
+        double max = getPeakValue(true, false);
        double d = 0.708 / max;
        if (d > 1d) d = 1d;
        setGain(d);
@@ -758,7 +824,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
                proc.waitFor();
            } catch (Exception e) { 
            }
-            clearCache();
+            CacheManager.removeFromCache(Sentence.this);
            AudiobookRecorder.window.updateWaveform();
        }
    }
@@ -784,7 +850,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
            }
        }
        if (backupNumber == -1) {
-            System.err.println("Out of backup space!");
+            debug("Out of backup space!");
            return;
        }

@@ -848,7 +914,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
                }
            }

-            clearCache();
+            CacheManager.removeFromCache(Sentence.this);
            AudiobookRecorder.window.updateWaveform();
        }
    }
@@ -891,7 +957,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
            e.printStackTrace();
        }
        
-        clearCache();
+        CacheManager.removeFromCache(this);
        AudiobookRecorder.window.updateWaveform();
    }

@@ -899,7 +965,6 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
        long len = s.getFrameLength();
        int frameSize = format.getFrameSize();
        int chans = format.getChannels();
-        int bytes = frameSize / chans;

        byte[] frame = new byte[frameSize];
        double[][] samples = new double[(int)len][2];
@@ -916,26 +981,163 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
                int right = (rh << 8) | rl;
                if ((left & 0x8000) == 0x8000) left |= 0xFFFF0000;
                if ((right & 0x8000) == 0x8000) right |= 0xFFFF0000;
-                samples[(int)fno][LEFT] = (double)left / 32768d;
-                samples[(int)fno][RIGHT] = (double)right / 32768d;
+                samples[(int)fno][LEFT] = (double)left / 32767d;
+                samples[(int)fno][RIGHT] = (double)right / 32767d;
            } else {
                int l = frame[0] >= 0 ? frame[0] : 256 + frame[0];
                int h = frame[1] >= 0 ? frame[1] : 256 + frame[1];
                int mono = (h << 8) | l;
                if ((mono & 0x8000) == 0x8000) mono |= 0xFFFF0000;
-                samples[(int)fno][LEFT] = (double)mono / 32768d;
-                samples[(int)fno][RIGHT] = (double)mono / 32768d;
+                samples[(int)fno][LEFT] = (double)mono / 32767d;
+                samples[(int)fno][RIGHT] = (double)mono / 32767d;
            }
        }

        return samples;
    }

+    public void writeDoubleDataS16LE(double[][] samples, AudioFormat format) throws IOException {
+        int chans = format.getChannels();
+
+        int frames = samples.length;
+
+        byte[] buffer;
+        
+        if (chans == 2) {
+            int buflen = frames * 4;
+            buffer = new byte[buflen];
+
+            for (int i = 0; i < frames; i++) {
+                double left = samples[i][LEFT];
+                double right = samples[i][RIGHT];
+                int off = i * 4;
+                left *= 32767d;
+                right *= 32767d;
+                int li = (int)left;
+                int ri = (int)right;
+
+                if (li > 32767) li = 32767;
+                if (li < -32767) li = -32767;
+                if (ri > 32767) ri = 32767;
+                if (ri < -32767) ri = -32767;
+
+                buffer[off + 0] = (byte)(li & 0xFF);
+                buffer[off + 1] = (byte)((li >> 8) & 0xFF);
+                buffer[off + 2] = (byte)(ri & 0xFF);
+                buffer[off + 3] = (byte)((ri >> 8) & 0xFF);
+            }
+        } else {
+            int buflen = frames * 2;
+            buffer = new byte[buflen];
+
+            for (int i = 0; i < frames; i++) {
+                double left = samples[i][LEFT];
+                double right = samples[i][RIGHT];
+                double mono = (left + right) / 2d;
+                int off = i * 2;
+                mono *= 32767d;
+                int mi = (int)mono;
+     
+                if (mi > 32767) mi = 32767;
+                if (mi < -32767) mi = -32767;
+
+                buffer[off + 0] = (byte)(mi & 0xFF);
+                buffer[off + 1] = (byte)((mi >> 8) & 0xFF);
+            }
+        }
+
+        backup();
+        ByteArrayInputStream bis = new ByteArrayInputStream(buffer);
+        AudioInputStream ais = new AudioInputStream(bis, format, frames);
+        File wavFile = getFile();
+        FileOutputStream fos = new FileOutputStream(wavFile);
+        AudioSystem.write(ais, AudioFileFormat.Type.WAVE, fos);
+        fos.close();
+        ais.close();
+    }
+
+    public void writeDoubleDataS24LE(double[][] samples, AudioFormat format) throws IOException {
+        int chans = format.getChannels();
+
+        int frames = samples.length;
+
+        byte[] buffer;
+
+        if (chans == 2) {
+            int buflen = frames * 6;
+            buffer = new byte[buflen];
+
+            for (int i = 0; i < frames; i++) {
+                double left = samples[i][LEFT];
+                double right = samples[i][RIGHT];
+                int off = i * 6;
+                left *= 8388607d;
+                right *= 8388607d;
+                int li = (int)left;
+                int ri = (int)right;
+
+                if (li > 8388607) li = 8388607;
+                if (li < -8388607) li = -8388607;
+                if (ri > 8388607) ri = 8388607;
+                if (ri < -8388607) ri = -8388607;
+
+                buffer[off + 0] = (byte)(li & 0xFF);
+                buffer[off + 1] = (byte)((li >> 8) & 0xFF);
+                buffer[off + 2] = (byte)((li >> 16) & 0xFF);
+                buffer[off + 3] = (byte)(ri & 0xFF);
+                buffer[off + 4] = (byte)((ri >> 8) & 0xFF);
+                buffer[off + 5] = (byte)((ri >> 16) & 0xFF);
+            }
+        } else {
+            int buflen = frames * 3;
+            buffer = new byte[buflen];
+
+            for (int i = 0; i < frames; i++) {
+                double left = samples[i][LEFT];
+                double right = samples[i][RIGHT];
+                double mono = (left + right) / 2d;
+                int off = i * 3;
+                mono *= 8388607d;
+                int mi = (int)mono;
+    
+                if (mi > 8388607) mi = 8388607;
+                if (mi < -8388607) mi = -8388607;
+
+                buffer[off + 0] = (byte)(mi & 0xFF);
+                buffer[off + 1] = (byte)((mi >> 8) & 0xFF);
+                buffer[off + 2] = (byte)((mi >> 16) & 0xFF);
+            }
+        }
+
+        backup();
+        ByteArrayInputStream bis = new ByteArrayInputStream(buffer);
+        AudioInputStream ais = new AudioInputStream(bis, format, frames);
+        File wavFile = getFile();
+        FileOutputStream fos = new FileOutputStream(wavFile);
+        AudioSystem.write(ais, AudioFileFormat.Type.WAVE, fos);
+        fos.close();
+        ais.close();
+    }
+
+    public void writeAudioData(double[][] samples) throws IOException {
+        AudioFormat format = getAudioFormat();
+
+        switch (format.getSampleSizeInBits()) {
+            case 16:
+                writeDoubleDataS16LE(samples, format);
+                break;
+            case 24:
+                writeDoubleDataS24LE(samples, format);
+                break;
+        }
+
+        CacheManager.removeFromCache(this);
+    }
+
    public double[][] getDoubleDataS24LE(AudioInputStream s, AudioFormat format) throws IOException {
        long len = s.getFrameLength();
        int frameSize = format.getFrameSize();
        int chans = format.getChannels();
-        int bytes = frameSize / chans;

        byte[] frame = new byte[frameSize];
        double[][] samples = new double[(int)len][2];
@@ -955,16 +1157,16 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
                int right = (rh << 16) | (rm << 8) | rl;
                if ((left & 0x800000) == 0x800000) left |= 0xFF000000;
                if ((right & 0x800000) == 0x800000) right |= 0xFF000000;
-                samples[(int)fno][LEFT] = (double)left / 8388608d;
-                samples[(int)fno][RIGHT] = (double)right / 8388608d;
+                samples[(int)fno][LEFT] = (double)left / 8388607d;
+                samples[(int)fno][RIGHT] = (double)right / 8388607d;
            } else {
                int l = frame[0] >= 0 ? frame[0] : 256 + frame[0];
                int m = frame[1] >= 0 ? frame[1] : 256 + frame[1];
                int h = frame[2] >= 0 ? frame[2] : 256 + frame[2];
                int mono = (h << 16) | (m << 8) | l;
                if ((mono & 0x800000) == 0x800000) mono |= 0xFF000000;
-                samples[(int)fno][LEFT] = (double)mono / 8388608d;
-                samples[(int)fno][RIGHT] = (double)mono / 8388608d;
+                samples[(int)fno][LEFT] = (double)mono / 8388607d;
+                samples[(int)fno][RIGHT] = (double)mono / 8388607d;
            }
        }

@@ -979,7 +1181,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
        File f = getFile();
        try {
            if (!f.exists()) {
-                System.err.println("TODO: Race condition: wav file doesn't exist yet");
+                debug("TODO: Race condition: wav file doesn't exist yet");
                return;
            }
            AudioInputStream s = AudioSystem.getAudioInputStream(f);
@@ -1011,8 +1213,18 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
    }

    synchronized public double[][] getProcessedAudioData() {
+        return getProcessedAudioData(true, true);
+    }
+
+    synchronized public double[][] getProcessedAudioData(boolean effectsEnabled) {
+        return getProcessedAudioData(effectsEnabled, true);
+    }
+
+    synchronized public double[][] getProcessedAudioData(boolean effectsEnabled, boolean applyGain) {
        loadFile();
-        if (processedAudio != null) return processedAudio;
+        if (processedAudio != null) {
+            return processedAudio;
+        }

        if (audioData == null) return null;
        processedAudio = new double[audioData.length][2];
@@ -1026,6 +1238,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
        String def = AudiobookRecorder.window.getDefaultEffectsChain();
        Effect eff = AudiobookRecorder.window.effects.get(def);
    
+        if (effectsEnabled) {
            if (eff != null) {
                eff.init(getAudioFormat().getFrameRate());
                eff.process(processedAudio);
@@ -1041,22 +1254,33 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
                    }
                }
            }
+        }

+        if (applyGain) {
            // Add final master gain stage
            for (int i = 0; i < processedAudio.length; i++) {
                processedAudio[i][LEFT] *= gain;
                processedAudio[i][RIGHT] *= gain;
            }
+        }

        return processedAudio;
    }

    public double[][] getDoubleAudioData() {
-        return getProcessedAudioData();
+        return getDoubleAudioData(true);
+    }
+
+    public double[][] getDoubleAudioData(boolean effectsEnabled) {
+        return getProcessedAudioData(effectsEnabled);
    }

    public double[][] getCroppedAudioData() {
-        double[][] inSamples = getDoubleAudioData();
+        return getCroppedAudioData(true);
+    }
+
+    public double[][] getCroppedAudioData(boolean effectsEnabled) {
+        double[][] inSamples = getDoubleAudioData(effectsEnabled);
        if (inSamples == null) return null;
        updateCrossings();

@@ -1071,21 +1295,25 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
    }

    public byte[] getPCMData() {
-        double[][] croppedData = getCroppedAudioData();
+        return getPCMData(true);
+    }
+
+    public byte[] getPCMData(boolean effectsEnabled) {
+        double[][] croppedData = getCroppedAudioData(effectsEnabled);
        if (croppedData == null) return null;
        int length = croppedData.length;
        byte[] pcmData = new byte[length * 4];
        for (int i = 0; i < length; i++) {
-            double sd = croppedData[i][LEFT] * 32768d;
+            double sd = croppedData[i][LEFT] * 32767d;
            int si = (int)sd;
            if (si > 32767) si = 32767;
-            if (si < -32768) si = -32768;
+            if (si < -32767) si = -32767;
            pcmData[i * 4] = (byte)(si & 0xFF);
            pcmData[(i * 4) + 1] = (byte)((si & 0xFF00) >> 8);
-            sd = croppedData[i][RIGHT] * 32768d;
+            sd = croppedData[i][RIGHT] * 32767d;
            si = (int)sd;
            if (si > 32767) si = 32767;
-            if (si < -32768) si = -32768;
+            if (si < -32767) si = -32767;
            pcmData[(i * 4) + 2] = (byte)(si & 0xFF);
            pcmData[(i * 4) + 3] = (byte)((si & 0xFF00) >> 8);
        }
@@ -1094,13 +1322,128 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {

    public void setEffectChain(String key) {
        if ((effectChain != null) && (!effectChain.equals(key))) {
-            clearCache();
+            CacheManager.removeFromCache(this);
        }
        effectChain = key;
+        AudiobookRecorder.window.bookTreeModel.reload(this);
    }

    public String getEffectChain() {
        if (effectChain == null) return "none";
        return effectChain;
    }
+
+    public String getPostGapType() {
+        return postGapType;
+    }
+
+    public void setPostGapType(String t) {
+        if (t == null || t.equals("none")) {
+            if (getPostGap() == Options.getInteger("catenation.short-sentence")) {
+                t = "continuation";
+            } else if (getPostGap() == Options.getInteger("catenation.post-paragraph")) {
+                t = "paragraph";
+            } else if (getPostGap() == Options.getInteger("catenation.post-section")) {
+                t = "section";
+            } else if (getPostGap() == Options.getInteger("catenation.post-sentence")) {
+                t = "sentence";
+            } else {
+                t = "sentence";
+            }
+        }
+        postGapType = t;
+        AudiobookRecorder.window.bookTreeModel.reload(this);
+    }
+
+    public void resetPostGap() {
+        if (postGapType == null) {
+            postGapType = "sentence";
+        }
+        if (postGapType.equals("continuation")) {
+            setPostGap(Options.getInteger("catenation.short-sentence"));
+        } else if (postGapType.equals("paragraph")) {
+            setPostGap(Options.getInteger("catenation.post-paragraph"));
+        } else if (postGapType.equals("section")) {
+            setPostGap(Options.getInteger("catenation.post-section"));
+        } else {
+            setPostGap(Options.getInteger("catenation.post-sentence"));
+        } 
+
+    }
+
+    public void debug(String txt) {
+        Debug.debug(String.format("%s: %s", id, txt));
+    }
+
+    public TreeMap<String, String> getSentenceData() {
+
+        TreeMap<String, String> out = new TreeMap<String, String>();
+
+        out.put("id", getId());
+        out.put("text", getText());
+        out.put("post-gap", Integer.toString(getPostGap()));
+        out.put("start-offset", Integer.toString(getStartOffset()));
+        out.put("end-offset", Integer.toString(getEndOffset()));
+        out.put("locked", isLocked() ? "true" : "false");
+        out.put("attention", getAttentionFlag() ? "true" : "false");
+        out.put("gain", String.format("%.8f", getGain()));
+        out.put("effect", getEffectChain());
+        out.put("gaptype", getPostGapType());
+//        out.put("samples", Integer.toString(getSampleSize()));
+
+        return out;
+    }
+
+    public void purgeBackups() {
+        File whereto = getFile().getParentFile();
+        String name = getFile().getName();
+
+        File[] files = whereto.listFiles();
+        for (File f : files) {
+            String fn = f.getName();
+            if (fn.startsWith("backup-") && fn.endsWith("-" + name)) {
+                f.delete();
+            }
+        }
+    }
+
+    public Element getSentenceXML(Document doc) {
+        Element sentenceNode = doc.createElement("sentence");
+        sentenceNode.setAttribute("id", getId());
+        sentenceNode.appendChild(Book.makeTextNode(doc, "text", getText()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "post-gap", getPostGap()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "start-offset", getStartOffset()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "end-offset", getEndOffset()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "locked", isLocked()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "attention", getAttentionFlag()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "gain", getGain()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "effect", getEffectChain()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "gaptype", getPostGapType()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "samples", getSampleSize()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "processed", isProcessed()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "notes", getNotes()));
+        return sentenceNode;
+    }
+
+    public boolean isProcessed() {
+        return processed;
+    }
+
+    public void setProcessed(boolean p) {
+        processed = p;
+        AudiobookRecorder.window.bookTreeModel.reload(this);
+    }
+
+    public void setNotes(String n) {
+        notes = n;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void onSelect() {
+        AudiobookRecorder.window.setSentenceNotes(notes);
+    }
+
 }
--- a/src/uk/co/majenko/audiobookrecorder/Waveform.java
+++ b/src/uk/co/majenko/audiobookrecorder/Waveform.java
@@ -21,6 +21,11 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
    int leftAltMarker = 0;
    int rightAltMarker = 0;

+    int cutEntry = 0;
+    int cutExit = 0;
+    boolean displayCut = false;
+    boolean displaySplit = false;
+
    int dragging = 0;

    int step = 1;
@@ -92,6 +97,7 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
                double lmax = 0;

                for (int o = 0; o < step; o++) {
+                    if (offset + (n * step) + o >= samples.length) break;
                    double sample = (samples[offset + (n * step) + o][Sentence.LEFT] + samples[offset + (n * step) + o][Sentence.RIGHT]) / 2d;
                    if (sample >= 0) {
                        have += sample;
@@ -133,7 +139,7 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
                g.drawLine(n, (int)(h/2 + lave), n, (int)(h/2 - have));
            }

-            g.setColor(new Color(255, 0, 0, 32));
+            g.setColor(new Color(255, 0, 0, 64));
            g.fillRect(0, 0, (leftAltMarker - offset)/step, h);
            g.fillRect((rightAltMarker - offset)/step, 0, (num - rightAltMarker) / step , h);

@@ -145,6 +151,19 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
            g.drawLine((leftMarker - offset)/step, 0, (leftMarker - offset)/step, h);
            g.drawLine((rightMarker - offset)/step, 0, (rightMarker - offset)/step, h);

+            if (displayCut || displaySplit) {
+                g.setColor(new Color(0, 255, 255));
+                g.drawLine((cutEntry - offset)/step, 0, (cutEntry - offset)/step, h);
+            }
+
+            if (displayCut) {
+                g.setColor(new Color(0, 255, 255));
+                g.drawLine((cutExit - offset)/step, 0, (cutExit - offset)/step, h);
+                
+                g.setColor(new Color(0, 255, 255, 80));
+                g.fillRect((cutEntry - offset)/step, 0, ((cutExit - offset) - (cutEntry - offset))/step , h);
+            }
+
            g.setColor(new Color(0, 255, 255));
            for (int i = 0; i < h; i += 2) {
                g.drawLine((playMarker - offset) / step, i, (playMarker - offset) / step, i);
@@ -192,6 +211,8 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
    public void setData(double[][] s) {
        samples = s;
        playMarker = 0;
+        displayCut = false;
+        displaySplit = false;
        repaint();
    }

@@ -221,6 +242,19 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
            dragging = 2;
            return;
        }
+        if (displayCut || displaySplit) {
+            if ((x >= ((cutEntry - offset)/step) - 10) && (x <= ((cutEntry - offset)/step) + 10)) {
+                dragging = 3;
+                return;
+            }
+        }
+        if (displayCut) {
+            if ((x >= ((cutExit - offset)/step) - 10) && (x <= ((cutExit - offset)/step) + 10)) {
+                dragging = 4;
+                return;
+            }
+        }
+        
    }

    public void mouseReleased(MouseEvent e) {
@@ -251,6 +285,19 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
            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 ((x >= ((cutExit - offset)/step) - 10) && (x <= ((cutExit - offset)/step) + 10)) {
+                setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR));
+                return;
+            }
+        }

        setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));

@@ -270,6 +317,18 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
            if (rightMarker < leftMarker) {
                rightMarker = leftMarker;
            }
+        } else if (dragging == 3) {
+            cutEntry = (x * step) + offset;
+            if (displayCut) {
+                if (cutEntry > cutExit) {
+                    cutEntry = cutExit;
+                }
+            }
+        } else if (dragging == 4) {
+            cutExit = (x * step) + offset;
+            if (cutExit < cutEntry) {
+                cutExit = cutEntry;
+            }
        }

        repaint();
@@ -299,4 +358,33 @@ public class Waveform extends JPanel implements MouseListener, MouseMotionListen
        playMarker = leftAltMarker + m;
        repaint();
    }
+
+    public void setDisplayCut(boolean c) {
+        displayCut = c;
+        displaySplit = false;
+        if (displayCut) {
+            int d = rightMarker - leftMarker;
+            cutEntry = leftMarker + (d / 3);
+            cutExit = leftMarker + (d / 3 * 2);
+        }
+        repaint();
+    }
+
+    public void setDisplaySplit(boolean c) {
+        displayCut = false;
+        displaySplit = c;
+        if (displaySplit) {
+            int d = rightMarker - leftMarker;
+            cutEntry = leftMarker + (d / 2);
+        }
+        repaint();
+    }
+
+    public int getCutStart() {
+        return cutEntry;
+    }
+
+    public int getCutEnd() {
+        return cutExit;
+    }
 }
Author	SHA1	Message	Date
Matt Jenkins	4896ee7a65	Released 0.3.3	2020-01-17 14:16:31 +00:00
Matt Jenkins	ce3eb7165a	Added book/chapter/phrase notes area tabs	2020-01-17 12:31:25 +00:00
Matt Jenkins	4de00b8fac	Add processed flag for batch processing of new recordings	2020-01-15 11:35:49 +00:00
Matt Jenkins	ebe777bdc5	Released 0.3.2	2020-01-12 23:43:08 +00:00
Matt Jenkins	3b5cacb8ad	Added import / open manuscript file	2020-01-12 22:46:15 +00:00
Matt Jenkins	db7d297dbc	Improve controls spacing	2020-01-12 15:23:16 +00:00
Matt Jenkins	2f9abf7629	Fix split location problem	2020-01-12 15:01:22 +00:00
Matt Jenkins	b6063d2fed	Fix tree redraw on split resize	2020-01-12 13:15:52 +00:00
Matt Jenkins	e1f566f0c8	Released 0.3.1	2020-01-12 12:23:14 +00:00
Matt Jenkins	9fa892a6fd	Added missing IDs in xml files	2020-01-12 12:22:58 +00:00
Matt Jenkins	1572e163ef	Added notes panel	2020-01-12 10:38:16 +00:00
Matt Jenkins	2791691057	Switch book data file to full XML	2020-01-11 20:45:07 +00:00
Matt Jenkins	575537ae66	Fix normalize	2020-01-11 12:31:59 +00:00
Matt Jenkins	fde4a597c7	Released 0.2.2	2020-01-10 20:23:43 +00:00
Matt Jenkins	e69ae52f50	Updated example filters	2020-01-10 18:55:46 +00:00
Matt Jenkins	8bdb06749f	Improvements to LFO	2020-01-10 18:29:22 +00:00
Matt Jenkins	0cfd066f4f	Released 0.2.1	2019-12-18 11:31:43 +00:00
Matt Jenkins	217ccb915a	Added mono/stereo export option	2019-12-16 15:54:34 +00:00
Matt Jenkins	1dd3e9d86f	Add purge backup files menu entry	2019-11-28 14:32:11 +00:00
Matt Jenkins	d3d81d71fe	Remove play stop/start	2019-11-28 12:19:31 +00:00
Matt Jenkins	80c110afa9	Added playback block size option	2019-10-13 20:11:07 +01:00
Matt Jenkins	1c08b9a51d	Purge cache when changing base effect or reloading effects	2019-09-08 22:37:27 +01:00
Matt Jenkins	4ad30106b6	Move save population to sentence	2019-09-08 22:36:58 +01:00
Matt Jenkins	9100d0e35a	Improvements to AGC limiting	2019-09-08 22:36:37 +01:00
Matt Jenkins	b8dea19c30	Make splits continuations and have single playback always 1.00x	2019-09-08 12:30:52 +01:00
Matt Jenkins	671f2b9270	Added adjustable FFT block size	2019-09-07 21:24:46 +01:00
Matt Jenkins	d619fb2f4d	Added playback speed option	2019-09-07 20:34:02 +01:00
Matt Jenkins	3eb6704f2f	Released 0.2.0	2019-09-05 00:21:04 +01:00
Matt Jenkins	cd24beb8a6	Removed pointless garbage collection calls. Massive speedup	2019-09-05 00:20:29 +01:00
Matt Jenkins	fa287305eb	Use 100* integer for gain comparison	2019-09-03 00:12:45 +01:00
Matt Jenkins	3fb656b693	Add small visual gap for paragraphs	2019-09-03 00:12:26 +01:00
Matt Jenkins	f514993525	Added global effects disable and fixed caching problems	2019-09-02 21:44:44 +01:00
Matt Jenkins	81787260c9	Lighten font and make flashing panel alternate red/green	2019-08-27 17:14:17 +01:00
Matt Jenkins	f9ad396228	Added chapter and book level resetting of post gaps	2019-08-25 14:08:25 +01:00
Matt Jenkins	8976f2e359	Add post gap classification	2019-08-25 13:41:46 +01:00
Matt Jenkins	187c3edaf6	Add waveform split and cut functionality	2019-08-14 19:58:06 +01:00