Released 0.3.4

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

@@ -1 +1 @@
-version=0.3.2
+version=0.3.4

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

@@ -3,6 +3,7 @@ package uk.co.majenko.audiobookrecorder;
 import javax.sound.sampled.*;
 import javax.swing.*;
 import javax.swing.event.*;
+import javax.swing.text.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.nio.file.*;
@@ -32,6 +33,7 @@ import javax.xml.transform.Transformer;
 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.Element;
@@ -39,7 +41,7 @@ import org.w3c.dom.Element;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeEvent;
 
-public class AudiobookRecorder extends JFrame {
+public class AudiobookRecorder extends JFrame implements DocumentListener {
 
     // Settings - tweakable
 
@@ -105,8 +107,17 @@ public class AudiobookRecorder extends JFrame {
     public Waveform sampleWaveform;
     JScrollBar sampleScroll;
     JSplitPane mainSplit;
-    JTextArea notesArea;
-    JScrollPane notesScroll;
+
+    JTabbedPane notesTabs;
+
+    JTextArea bookNotesArea;
+    JScrollPane bookNotesScroll;
+
+    JTextArea chapterNotesArea;
+    JScrollPane chapterNotesScroll;
+
+    JTextArea sentenceNotesArea;
+    JScrollPane sentenceNotesScroll;
 
     JSpinner postSentenceGap;
     JSpinner gainPercent;
@@ -640,10 +651,9 @@ public class AudiobookRecorder extends JFrame {
         centralPanel.getActionMap().put("startRecord", new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
                 if (!getLock()) return;
-                if (getFocusOwner() == notesArea) {
-                    freeLock();
-                    return;
-                }
+                if (getFocusOwner() == bookNotesArea) { freeLock(); return; }
+                if (getFocusOwner() == chapterNotesArea) { freeLock(); return; }
+                if (getFocusOwner() == sentenceNotesArea) { freeLock(); return; }
                 if (bookTree.isEditing()) {
                     freeLock();
                     return;
@@ -659,10 +669,9 @@ public class AudiobookRecorder extends JFrame {
         centralPanel.getActionMap().put("startRecordShort", new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
                 if (!getLock()) return;
-                if (getFocusOwner() == notesArea) {
-                    freeLock();
-                    return;
-                }
+                if (getFocusOwner() == bookNotesArea) { freeLock(); return; }
+                if (getFocusOwner() == chapterNotesArea) { freeLock(); return; }
+                if (getFocusOwner() == sentenceNotesArea) { freeLock(); return; }
                 if (bookTree.isEditing()) {
                     freeLock();
                     return;
@@ -678,10 +687,9 @@ public class AudiobookRecorder extends JFrame {
         centralPanel.getActionMap().put("startRecordNewPara", new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
                 if (!getLock()) return;
-                if (getFocusOwner() == notesArea) {
-                    freeLock();
-                    return;
-                }
+                if (getFocusOwner() == bookNotesArea) { freeLock(); return; }
+                if (getFocusOwner() == chapterNotesArea) { freeLock(); return; }
+                if (getFocusOwner() == sentenceNotesArea) { freeLock(); return; }
                 if (bookTree.isEditing()) {
                     freeLock();
                     return;
@@ -697,10 +705,9 @@ public class AudiobookRecorder extends JFrame {
         centralPanel.getActionMap().put("startRecordNewSection", new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
                 if (!getLock()) return;
-                if (getFocusOwner() == notesArea) {
-                    freeLock();
-                    return;
-                }
+                if (getFocusOwner() == bookNotesArea) { freeLock(); return; }
+                if (getFocusOwner() == chapterNotesArea) { freeLock(); return; }
+                if (getFocusOwner() == sentenceNotesArea) { freeLock(); return; }
                 if (bookTree.isEditing()) {
                     freeLock();
                     return;
@@ -716,10 +723,9 @@ public class AudiobookRecorder extends JFrame {
         centralPanel.getActionMap().put("startRerecord", new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
                 if (!getLock()) return;
-                if (getFocusOwner() == notesArea) {
-                    freeLock();
-                    return;
-                }
+                if (getFocusOwner() == bookNotesArea) { freeLock(); return; }
+                if (getFocusOwner() == chapterNotesArea) { freeLock(); return; }
+                if (getFocusOwner() == sentenceNotesArea) { freeLock(); return; }
                 if (bookTree.isEditing()) {
                     freeLock();
                     return;
@@ -734,9 +740,9 @@ public class AudiobookRecorder extends JFrame {
         });
         centralPanel.getActionMap().put("stopRecord", new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
-                if (getFocusOwner() == notesArea) {
-                    return;
-                }
+                if (getFocusOwner() == bookNotesArea) { return; }
+                if (getFocusOwner() == chapterNotesArea) { return; }
+                if (getFocusOwner() == sentenceNotesArea) { return; }
                 if (bookTree.isEditing()) return;
                 stopLock();
                 stopRecording();
@@ -745,9 +751,9 @@ public class AudiobookRecorder extends JFrame {
         });
         centralPanel.getActionMap().put("deleteLast", new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
-                if (getFocusOwner() == notesArea) {
-                    return;
-                }
+                if (getFocusOwner() == bookNotesArea) { return; }
+                if (getFocusOwner() == chapterNotesArea) { return; }
+                if (getFocusOwner() == sentenceNotesArea) { return; }
                 if (bookTree.isEditing()) return;
                 deleteLastRecording();
             }
@@ -755,9 +761,9 @@ public class AudiobookRecorder extends JFrame {
 
         centralPanel.getActionMap().put("startStopPlayback", new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
-                if (getFocusOwner() == notesArea) {
-                    return;
-                }
+                if (getFocusOwner() == bookNotesArea) { return; }
+                if (getFocusOwner() == chapterNotesArea) { return; }
+                if (getFocusOwner() == sentenceNotesArea) { return; }
                 if (bookTree.isEditing()) return;
                 if (playing == null) {
                     playSelectedSentence();
@@ -769,9 +775,9 @@ public class AudiobookRecorder extends JFrame {
 
         centralPanel.getActionMap().put("startPlaybackFrom", new AbstractAction() {
             public void actionPerformed(ActionEvent e) {
-                if (getFocusOwner() == notesArea) {
-                    return;
-                }
+                if (getFocusOwner() == bookNotesArea) { return; }
+                if (getFocusOwner() == chapterNotesArea) { return; }
+                if (getFocusOwner() == sentenceNotesArea) { return; }
                 if (bookTree.isEditing()) return;
                 if (playing == null) {
                     playFromSelectedSentence();
@@ -781,12 +787,30 @@ public class AudiobookRecorder extends JFrame {
 
         mainScroll = new JScrollPane();
 
-        notesArea = new JTextArea();
-        notesArea.setFont(new Font("Monospaced", Font.PLAIN, 10));
-        notesScroll = new JScrollPane();
-        notesScroll.setViewportView(notesArea);
+        bookNotesArea = new JTextArea();
+        bookNotesArea.setFont(new Font("Monospaced", Font.PLAIN, 10));
+        bookNotesScroll = new JScrollPane();
+        bookNotesScroll.setViewportView(bookNotesArea);
 
-        mainSplit = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, mainScroll, notesScroll);
+        chapterNotesArea = new JTextArea();
+        chapterNotesArea.setFont(new Font("Monospaced", Font.PLAIN, 10));
+        chapterNotesArea.getDocument().addDocumentListener(this);
+        chapterNotesScroll = new JScrollPane();
+        chapterNotesScroll.setViewportView(chapterNotesArea);
+
+        sentenceNotesArea = new JTextArea();
+        sentenceNotesArea.setFont(new Font("Monospaced", Font.PLAIN, 10));
+        sentenceNotesArea.getDocument().addDocumentListener(this);
+        sentenceNotesScroll = new JScrollPane();
+        sentenceNotesScroll.setViewportView(sentenceNotesArea);
+
+        notesTabs = new JTabbedPane();
+
+        notesTabs.add("Book", bookNotesScroll);
+        notesTabs.add("Chapter", chapterNotesScroll);
+        notesTabs.add("Phrase", sentenceNotesScroll);
+
+        mainSplit = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, mainScroll, notesTabs);
         centralPanel.add(mainSplit, BorderLayout.CENTER);
 
         mainSplit.addPropertyChangeListener(new PropertyChangeListener() {
@@ -949,6 +973,8 @@ public class AudiobookRecorder extends JFrame {
             // 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);
@@ -1220,6 +1246,7 @@ public class AudiobookRecorder extends JFrame {
                             Chapter c = (Chapter)s.getParent();
                             int idx = bookTreeModel.getIndexOfChild(c, s);
                             bookTreeModel.insertNodeInto(newSentence, c, idx);
+                            bookTree.setSelectionPath(new TreePath(newSentence.getPath()));
                         } catch (Exception ex) {
                             ex.printStackTrace();
                         }
@@ -1298,6 +1325,34 @@ public class AudiobookRecorder extends JFrame {
                     }
                 });
 
+                JMenuObject peaknew = new JMenuObject("Auto-trim new (Peak)", c, new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        JMenuObject o = (JMenuObject)e.getSource();
+                        Chapter chap = (Chapter)o.getObject();
+
+                        ProgressDialog ed = new ProgressDialog("Auto-trimming " + chap.getName());
+
+                        AutoTrimThread t = new AutoTrimThread(chap, ed, AutoTrimThread.Peak, AutoTrimThread.NewOnly);
+                        Thread nt = new Thread(t);
+                        nt.start();
+                        ed.setVisible(true);
+                    }
+                });
+
+                JMenuObject fftnew = new JMenuObject("Auto-trim new (FFT)", c, new ActionListener() {
+                    public void actionPerformed(ActionEvent e) {
+                        JMenuObject o = (JMenuObject)e.getSource();
+                        Chapter chap = (Chapter)o.getObject();
+
+                        ProgressDialog ed = new ProgressDialog("Auto-trimming " + chap.getName());
+
+                        AutoTrimThread t = new AutoTrimThread(chap, ed, AutoTrimThread.FFT, AutoTrimThread.NewOnly);
+                        Thread nt = new Thread(t);
+                        nt.start();
+                        ed.setVisible(true);
+                    }
+                });
+
                 JMenuObject peak = new JMenuObject("Auto-trim all (Peak)", c, new ActionListener() {
                     public void actionPerformed(ActionEvent e) {
                         JMenuObject o = (JMenuObject)e.getSource();
@@ -1305,7 +1360,7 @@ public class AudiobookRecorder extends JFrame {
 
                         ProgressDialog ed = new ProgressDialog("Auto-trimming " + chap.getName());
 
-                        AutoTrimThread t = new AutoTrimThread(chap, ed, AutoTrimThread.Peak);
+                        AutoTrimThread t = new AutoTrimThread(chap, ed, AutoTrimThread.Peak, AutoTrimThread.All);
                         Thread nt = new Thread(t);
                         nt.start();
                         ed.setVisible(true);
@@ -1319,7 +1374,7 @@ public class AudiobookRecorder extends JFrame {
 
                         ProgressDialog ed = new ProgressDialog("Auto-trimming " + chap.getName());
 
-                        AutoTrimThread t = new AutoTrimThread(chap, ed, AutoTrimThread.FFT);
+                        AutoTrimThread t = new AutoTrimThread(chap, ed, AutoTrimThread.FFT, AutoTrimThread.All);
                         Thread nt = new Thread(t);
                         nt.start();
                         ed.setVisible(true);
@@ -1512,6 +1567,8 @@ public class AudiobookRecorder extends JFrame {
                 menu.addSeparator();
                 menu.add(mergeWith);
                 menu.addSeparator();
+                menu.add(peaknew);
+                menu.add(fftnew);
                 menu.add(peak);
                 menu.add(fft);
                 menu.addSeparator();
@@ -1934,6 +1991,8 @@ public class AudiobookRecorder extends JFrame {
             // 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);
@@ -1976,6 +2035,12 @@ public class AudiobookRecorder extends JFrame {
             bookTree.addTreeSelectionListener(new TreeSelectionListener() {
                 public void valueChanged(TreeSelectionEvent e) {
                     DefaultMutableTreeNode n = (DefaultMutableTreeNode)bookTree.getLastSelectedPathComponent();
+
+                    if (n instanceof BookTreeNode) {
+                        BookTreeNode btn = (BookTreeNode)n;
+                        btn.onSelect();
+                    }
+
                     if (n instanceof Sentence) {
                         Sentence s = (Sentence)n;
                         selectedSentence = s;
@@ -2143,6 +2208,11 @@ public class AudiobookRecorder extends JFrame {
         bookTree.addTreeSelectionListener(new TreeSelectionListener() {
             public void valueChanged(TreeSelectionEvent e) {
                 DefaultMutableTreeNode n = (DefaultMutableTreeNode)bookTree.getLastSelectedPathComponent();
+                if (n instanceof BookTreeNode) {
+                    BookTreeNode btn = (BookTreeNode)n;
+                    btn.onSelect();
+                }
+
                 if (n instanceof Sentence) {
                     Sentence s = (Sentence)n;
                     selectedSentence = s;
@@ -2463,11 +2533,17 @@ public class AudiobookRecorder extends JFrame {
 
             int numKids = chapter.getChildCount();
             int kidCount = 0;
+            double lastGain = -1;
+            double variance = Options.getInteger("audio.recording.variance") / 100d;
             for (Enumeration s = chapter.children(); s.hasMoreElements();) {
                 kidCount++;
                 dialog.setProgress(kidCount * 2000 / numKids);
                 Sentence snt = (Sentence)s.nextElement();
-                snt.normalize();
+                if (lastGain == -1) {
+                    lastGain = snt.normalize();
+                } else {
+                    lastGain = snt.normalize(lastGain - variance, lastGain + variance);
+                }
             }
 
             dialog.closeDialog();
@@ -2478,15 +2554,19 @@ public class AudiobookRecorder extends JFrame {
         ProgressDialog dialog;
         Chapter chapter;
         int type;
+        int scope;
 
         public final static int FFT = 0;
         public final static int Peak = 1;
+        public final static int NewOnly = 0;
+        public final static int All = 1;
    
-        public AutoTrimThread(Chapter c, ProgressDialog e, int t) {
+        public AutoTrimThread(Chapter c, ProgressDialog e, int t, int sc) {
             super();
             dialog = e;
             chapter = c;
             type = t;
+            scope = sc;
         }
 
         @SuppressWarnings("unchecked")
@@ -2498,6 +2578,9 @@ public class AudiobookRecorder extends JFrame {
                 kidCount++;
                 dialog.setProgress(kidCount * 2000 / numKids);
                 Sentence snt = (Sentence)s.nextElement();
+                if (scope == NewOnly) {
+                    if (snt.isProcessed()) continue;
+                }
                 switch (type) {
                     case FFT:
                         snt.autoTrimSampleFFT();
@@ -2723,7 +2806,7 @@ public class AudiobookRecorder extends JFrame {
                         play.close();
                     }
                     play = null;
-                    e.printStackTrace();
+//                    e.printStackTrace();
                 }
             }
         });
@@ -3635,8 +3718,12 @@ public class AudiobookRecorder extends JFrame {
 
     public void doSplit(int at) {
         try {
-            Sentence newSentence = selectedSentence.cloneSentence();
+            if (selectedSentence == null) {
+                System.err.println("Selected sentence is NULL in split. That CANNOT happen!");
+                return;
+            }
             Chapter c = (Chapter)selectedSentence.getParent();
+            Sentence newSentence = selectedSentence.cloneSentence();
             int idx = bookTreeModel.getIndexOfChild(c, selectedSentence);
             bookTreeModel.insertNodeInto(newSentence, c, idx);
 
@@ -3687,12 +3774,28 @@ public class AudiobookRecorder extends JFrame {
         System.err.println("Effects Enabled: " + b);
     }
 
-    public void setNotes(String text) {
-        notesArea.setText(text);
+    public void setBookNotes(String text) {
+        bookNotesArea.setText(text);
     }
 
-    public String getNotes() {
-        return notesArea.getText();
+    public void setChapterNotes(String text) {
+        chapterNotesArea.setText(text);
+    }
+
+    public void setSentenceNotes(String text) {
+        sentenceNotesArea.setText(text);
+    }
+
+    public String getBookNotes() {
+        return bookNotesArea.getText();
+    }
+
+    public String getChapterNotes() {
+        return chapterNotesArea.getText();
+    }
+
+    public String getSentenceNotes() {
+        return sentenceNotesArea.getText();
     }
 
     public void openManuscript() {
@@ -3724,4 +3827,74 @@ public class AudiobookRecorder extends JFrame {
         }
     }
 
+    //* DocumentListener
+
+    public void changedUpdate(DocumentEvent e) {
+        javax.swing.text.Document doc = e.getDocument();
+        if (doc == chapterNotesArea.getDocument()) {
+            DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode)bookTree.getLastSelectedPathComponent();
+            if (selectedNode instanceof Sentence) {
+                selectedNode = (DefaultMutableTreeNode)selectedNode.getParent();
+            }
+            if (! (selectedNode instanceof Chapter)) {
+                return;
+            }
+            Chapter c = (Chapter)selectedNode;
+            c.setNotes(chapterNotesArea.getText());
+        } else if (doc == sentenceNotesArea.getDocument()) {
+            DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode)bookTree.getLastSelectedPathComponent();
+            if (! (selectedNode instanceof Sentence)) {
+                return;
+            }
+            Sentence s = (Sentence)selectedNode;
+            s.setNotes(sentenceNotesArea.getText());
+        }
+    }
+
+    public void removeUpdate(DocumentEvent e) {
+        javax.swing.text.Document doc = e.getDocument();
+        if (doc == chapterNotesArea.getDocument()) {
+            DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode)bookTree.getLastSelectedPathComponent();
+            if (selectedNode instanceof Sentence) {
+                selectedNode = (DefaultMutableTreeNode)selectedNode.getParent();
+            }
+            if (! (selectedNode instanceof Chapter)) {
+                return;
+            }
+            Chapter c = (Chapter)selectedNode;
+            c.setNotes(chapterNotesArea.getText());
+        } else if (doc == sentenceNotesArea.getDocument()) {
+            DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode)bookTree.getLastSelectedPathComponent();
+            if (! (selectedNode instanceof Sentence)) {
+                return;
+            }
+            Sentence s = (Sentence)selectedNode;
+            s.setNotes(sentenceNotesArea.getText());
+        }
+    }
+
+    public void insertUpdate(DocumentEvent e) {
+        javax.swing.text.Document doc = e.getDocument();
+        if (doc == chapterNotesArea.getDocument()) {
+            DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode)bookTree.getLastSelectedPathComponent();
+            if (selectedNode instanceof Sentence) {
+                selectedNode = (DefaultMutableTreeNode)selectedNode.getParent();
+            }
+            if (! (selectedNode instanceof Chapter)) {
+                return;
+            }
+            Chapter c = (Chapter)selectedNode;
+            c.setNotes(chapterNotesArea.getText());
+        } else if (doc == sentenceNotesArea.getDocument()) {
+            DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode)bookTree.getLastSelectedPathComponent();
+            if (! (selectedNode instanceof Sentence)) {
+                return;
+            }
+            Sentence s = (Sentence)selectedNode;
+            s.setNotes(sentenceNotesArea.getText());
+        }
+    }
+
+    // DocumentListener *//
+
 }

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

@@ -66,7 +66,7 @@ public class Book extends DefaultMutableTreeNode {
         ACX = getTextNode(root, "acx");
         manuscript = getTextNode(root, "manuscript");
 
-        AudiobookRecorder.window.setNotes(getTextNode(root, "notes"));
+        AudiobookRecorder.window.setBookNotes(getTextNode(root, "notes"));
 
         Element settings = getNode(root, "settings");
         Element audioSettings = getNode(settings, "audio");
@@ -99,8 +99,12 @@ public class Book extends DefaultMutableTreeNode {
     }
 
     public static String getTextNode(Element r, String n) {
+        return getTextNode(r, n, "");
+    }
+
+    public static String getTextNode(Element r, String n, String d) {
         Element node = getNode(r, n);
-        if (node == null) return "";
+        if (node == null) return d;
         return node.getTextContent();
     }
 
@@ -306,7 +310,7 @@ public class Book extends DefaultMutableTreeNode {
         root.appendChild(makeTextNode(doc, "acx", ACX));
         root.appendChild(makeTextNode(doc, "manuscript", manuscript));
 
-        root.appendChild(makeTextNode(doc, "notes", AudiobookRecorder.window.getNotes()));
+        root.appendChild(makeTextNode(doc, "notes", AudiobookRecorder.window.getBookNotes()));
 
         Element settingsNode = doc.createElement("settings");
         root.appendChild(settingsNode);

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();
+}
+

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

@@ -9,17 +9,25 @@ 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.setIconTextGap(5);
         ret.setBorder(new EmptyBorder(0, 0, 0, 0));
         if (value instanceof Sentence) {
             Sentence s = (Sentence)value;
 
+            JPanel p = new JPanel();
+            p.setLayout(new GridBagLayout());
+            GridBagConstraints ctx = new GridBagConstraints();
+
             OverlayIcon icn = new OverlayIcon(Icons.sentence);
 
             if (s.getOverrideText() != null) {
                 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);
@@ -59,17 +67,72 @@ public class BookTreeRenderer extends DefaultTreeCellRenderer {
             }
 
             if (gaptype.equals("sentence")) {
-                ret.setBorder(new EmptyBorder(0, 0, 0, 0));
+                p.setBorder(new EmptyBorder(0, 0, 0, 0));
             } else if (gaptype.equals("continuation")) {
-                ret.setBorder(new EmptyBorder(0, 0, 0, 0));
+                p.setBorder(new EmptyBorder(0, 0, 0, 0));
             } else if (gaptype.equals("paragraph")) {
-                ret.setBorder(new EmptyBorder(0, 0, 7, 0));
+                p.setBorder(new EmptyBorder(0, 0, 7, 0));
             } else if (gaptype.equals("section")) {
-                ret.setBorder(new EmptyBorder(0, 0, 15, 0));
+                p.setBorder(new EmptyBorder(0, 0, 15, 0));
             }
 
+
+            JLabel time = new JLabel(Utils.secToTime(s.getLength(), "mm:ss.SSS") + "     ");
+
+            ctx.gridx = 0;
+            ctx.gridy = 0;
+            ctx.fill = GridBagConstraints.HORIZONTAL;
+            ctx.anchor = GridBagConstraints.LINE_START;
+
+            String effectChain = s.getEffectChain();
+            if ((effectChain == null) || (effectChain.equals("none"))) {
+                ctx.weightx = 1.0d;
+                ctx.gridwidth = 2;
+                p.add(ret, ctx);
+            } else {
+                ctx.weightx = 0.1d;
+                ctx.gridwidth = 1;
+                p.add(ret, ctx);
+                Effect e = AudiobookRecorder.window.effects.get(effectChain);
+                JLabel eff = new JLabel(e.toString() + " ");
+                ctx.weightx = 0.0d;
+                ctx.gridwidth = 1;
+                ctx.gridx = 1;
+                p.add(eff);
+            }
+
+            ctx.weightx = 0.0d;
+            ctx.gridx = 2;
+            ctx.anchor = GridBagConstraints.LINE_END;
+            p.add(time, ctx);
+
+            p.setOpaque(false);
+
+            return p;
+
         } else if (value instanceof Chapter) {
+            Chapter c = (Chapter)value;
+
             ret.setIcon(Icons.chapter);
+
+            JPanel p = new JPanel();
+            p.setLayout(new GridBagLayout());
+            GridBagConstraints ctx = new GridBagConstraints();
+
+            JLabel time = new JLabel(Utils.secToTime(c.getLength(), "mm:ss") + "     ");
+
+            ctx.gridx = 0;
+            ctx.gridy = 0;
+            ctx.fill = GridBagConstraints.HORIZONTAL;
+            ctx.anchor = GridBagConstraints.LINE_START;
+            ctx.weightx = 1.0d;
+            p.add(ret, ctx);
+            ctx.weightx = 0.0d;
+            ctx.gridx = 1;
+            ctx.anchor = GridBagConstraints.LINE_END;
+            p.add(time, ctx);
+            p.setOpaque(false);
+            return p;
         } else if (value instanceof Book) {
             ret.setIcon(((Book)value).getIcon());
         }

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

@@ -26,7 +26,7 @@ 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;
@@ -34,6 +34,8 @@ public class Chapter extends DefaultMutableTreeNode {
     int preGap;
     int postGap;
 
+    String notes;
+
     public Chapter(String i, String chaptername) {
         super(chaptername);
 
@@ -49,6 +51,8 @@ public class Chapter extends DefaultMutableTreeNode {
         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");
@@ -284,6 +288,7 @@ public class Chapter extends DefaultMutableTreeNode {
         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);
@@ -299,4 +304,28 @@ public class Chapter extends DefaultMutableTreeNode {
         return chapterNode;
     }
 
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String t) {
+        notes = t;
+    }
+
+    public void onSelect() {
+        AudiobookRecorder.window.setChapterNotes(notes);
+    }
+
+    public double getLength() {
+        double len = 0;
+        for (Enumeration o = children(); o.hasMoreElements();) {
+            Object ob = (Object)o.nextElement();
+            if (ob instanceof Sentence) {
+                Sentence s = (Sentence)ob;
+                len += s.getLength();
+            }
+        }
+        return len;
+    }
+
 }

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

@@ -34,6 +34,7 @@ public class Options extends JDialog {
     JSpinner shortSentenceGap;
     JSpinner postParagraphGap;
     JSpinner postSectionGap;
+    JSpinner maxGainVariance;
     JTextField ffmpegLocation;
     JComboBox<KVPair> bitRate;
     JComboBox<KVPair> channels;
@@ -301,6 +302,7 @@ public class Options extends JDialog {
         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"));
+        maxGainVariance = addSpinner(optionsPanel, "Maximum gain variance:", 0, 100, 1, getInteger("audio.recording.variance"), "");
 
         addSeparator(optionsPanel);
 
@@ -582,6 +584,7 @@ public class Options extends JDialog {
         defaultPrefs.put("catenation.post-section", "3000");
 
         defaultPrefs.put("audio.recording.trim.fft", "10");
+        defaultPrefs.put("audio.recording.variance", "10");
     
         defaultPrefs.put("path.storage", (new File(System.getProperty("user.home"), "Recordings")).toString());
         defaultPrefs.put("path.archive", (new File(new File(System.getProperty("user.home"), "Recordings"),"archive")).toString());
@@ -718,6 +721,7 @@ public class Options extends JDialog {
         set("editor.external", externalEditor.getText());
         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);
         set("audio.playback.blocksize", ((KVPair)playbackBlockSize.getSelectedItem()).key);
 

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

@@ -41,10 +41,11 @@ 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;
@@ -60,6 +61,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
 
     boolean inSample;
     boolean attention = false;
+    boolean processed = false;
 
     String effectChain = null;
 
@@ -76,7 +78,8 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
     TargetDataLine line;
     AudioInputStream inputStream;
     AudioFormat storedFormat = null;
-    double storedLength = -1d;
+
+    double runtime = -1d;
 
     double[][] audioData = null;
 
@@ -86,20 +89,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() {
@@ -121,6 +130,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);
@@ -170,16 +181,28 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
         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")));
+        crossStartOffset = Utils.s2i(Book.getTextNode(root, "cross-start-offset", "-1"));
+        crossEndOffset = Utils.s2i(Book.getTextNode(root, "end-offset", "-1"));
         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"));
+        runtime = Utils.s2d(Book.getTextNode(root, "time", "-1.000"));
+
+        if ((crossStartOffset == -1) || (crossEndOffset == -1)) {
+            System.err.println("Updating " + id);
+            updateCrossings(true);
+        }
+
+        if (runtime <= 0.01d) getLength();
     }
 
     public boolean startRecording() {
@@ -190,7 +213,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);
@@ -230,6 +253,12 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
             autoTrimSamplePeak(useRaw);
         } else if (tm.equals("fft")) {
             autoTrimSampleFFT(useRaw);
+        } else {
+            startOffset = 0;
+            crossStartOffset = 0;
+            endOffset = sampleSize - 1;
+            crossEndOffset = sampleSize - 1;
+            processed = false;
         }
     }
 
@@ -331,7 +360,8 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
         updateCrossings(useRaw);
         intens = null;
         samples = null;
-
+        processed = true;
+        reloadTree();
     }
 
     public void autoTrimSamplePeak() {
@@ -387,6 +417,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;
+        reloadTree();
     }
 
     public String getId() {
@@ -396,6 +428,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
     public void setText(String t) {
         overrideText = null;
         text = t;
+        reloadTree();
     }
 
     public String getText() {
@@ -428,11 +461,14 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
     }
 
     public String toString() {
+        return text;
+/*
         if (effectChain == null) return text;
         if (effectChain.equals("none")) return text;
         Effect e = AudiobookRecorder.window.effects.get(effectChain);
         if (e == null) return text;
         return text + " (" + e.toString() + ")";
+*/
     }
 
     public boolean isRecording() {
@@ -443,6 +479,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
         if (o instanceof String) {
             String so = (String)o;
             text = so;
+            reloadTree();
         }
     }
 
@@ -476,6 +513,8 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
     public void updateCrossings(boolean useRaw) {
         updateStartCrossing(useRaw);
         updateEndCrossing(useRaw);
+        runtime = -1d;
+        getLength();
     }
 
     public void updateStartCrossing() {
@@ -502,6 +541,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
         if (startOffset != o) {
             startOffset = o;
             crossStartOffset = -1;
+            reloadTree();
         }
     }
 
@@ -517,9 +557,18 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
         if (endOffset != o) {
             endOffset = o;
             crossEndOffset = -1;
+            reloadTree();
         }
     }
 
+    public void setStartCrossing(int o) {
+        crossStartOffset = o;
+    }
+
+    public void setEndCrossing(int o) {
+        crossEndOffset = o;
+    }
+
     public int getSampleSize() {
         if (sampleSize == -1) {
             loadFile();
@@ -545,7 +594,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
     public void doRecognition(StreamSpeechRecognizer recognizer) {
         try {
             setText("[recognising...]");
-            AudiobookRecorder.window.bookTreeModel.reload(this);
+            reloadTree();
 
             byte[] inData = getPCMData();
 
@@ -560,7 +609,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
             recognizer.stopRecognition();
 
             setText(res);
-            AudiobookRecorder.window.bookTreeModel.reload(this);
+            reloadTree();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -596,7 +645,9 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
     }
 
     public void setLocked(boolean l) {
+        if (locked == l) return;
         locked = l;
+        reloadTree();
     }
 
     public boolean isLocked() {
@@ -615,7 +666,6 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
         audioData = null;
         processedAudio = null;
         storedFormat = null;
-        storedLength = -1;
     }
 
     public boolean lockedInCache() {
@@ -671,13 +721,16 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
 
     /* Get the length of the sample in seconds */
     public double getLength() {
-        if (storedLength > -1d) return storedLength;
+        if (runtime > 0.01d) return runtime;
+        File f = getFile();
+        if (!f.exists()) { // Not recorded yet!
+            return 0;
+        }
         AudioFormat format = getAudioFormat();
         float sampleFrequency = format.getFrameRate();
         int length = crossEndOffset - crossStartOffset;
-        double time = (double)length / (double)sampleFrequency;
-        storedLength = time;
-        return time;
+        runtime = (double)length / (double)sampleFrequency;
+        return runtime;
     }
 
     public Sentence cloneSentence() throws IOException {
@@ -688,17 +741,21 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
         }
         sentence.setStartOffset(getStartOffset());
         sentence.setEndOffset(getEndOffset());
+        sentence.setStartCrossing(getStartCrossing());
+        sentence.setEndCrossing(getEndCrossing());
 
         File from = getFile();
         File to = sentence.getFile();
         Files.copy(from.toPath(), to.toPath());
 
-        sentence.updateCrossings();
+//        sentence.updateCrossings();
         return sentence;
     }
 
     public void setAttentionFlag(boolean f) {
+        if (attention == f) return;
         attention = f;
+        reloadTree();
     }
 
     public boolean getAttentionFlag() {
@@ -760,12 +817,24 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
         return gain;
     }
 
-    public void normalize() {
-        if (locked) return;
+    public double normalize(double low, double high) {
+        if (locked) return gain;
+        double max = getPeakValue(true, false);
+        double d = 0.708 / max;
+        if (d > 1d) d = 1d;
+        if (d < low) d = low;
+        if (d > high) d = high;
+        setGain(d);
+        return d;
+    }
+
+    public double normalize() {
+        if (locked) return gain;
         double max = getPeakValue(true, false);
         double d = 0.708 / max;
         if (d > 1d) d = 1d;
         setGain(d);
+        return d;
     }
 
     class ExternalEditor implements Runnable {
@@ -1294,10 +1363,14 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
     }
 
     public void setEffectChain(String key) {
+        if ((effectChain != null) && (effectChain.equals(key))) {
+            return;
+        }
         if ((effectChain != null) && (!effectChain.equals(key))) {
             CacheManager.removeFromCache(this);
         }
         effectChain = key;
+        reloadTree();
     }
 
     public String getEffectChain() {
@@ -1324,6 +1397,7 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
             }
         }
         postGapType = t;
+        reloadTree();
     }
 
     public void resetPostGap() {
@@ -1385,13 +1459,45 @@ public class Sentence extends DefaultMutableTreeNode implements Cacheable {
         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, "cross-start-offset", crossStartOffset));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "cross-end-offset", crossEndOffset));
         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()));
+        sentenceNode.appendChild(Book.makeTextNode(doc, "time", getLength()));
         return sentenceNode;
     }
 
+    public boolean isProcessed() {
+        return processed;
+    }
+
+    public void setProcessed(boolean p) {
+        processed = p;
+        reloadTree();
+    }
+
+    public void setNotes(String n) {
+        notes = n;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void onSelect() {
+        AudiobookRecorder.window.setSentenceNotes(notes);
+    }
+
+    void reloadTree() {
+        if (id.equals("room-noise")) return;
+        if (getParent() == null) return;
+        AudiobookRecorder.window.bookTreeModel.reload(this);
+    }
+
 }

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

@@ -10,6 +10,8 @@ import java.util.*;
 import java.io.*;
 import java.net.*;
 
+import java.text.SimpleDateFormat;
+
 public class Utils {
     public static Image getScaledImage(Image srcImg, int w, int h){
         BufferedImage resizedImg = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
@@ -76,4 +78,12 @@ public class Utils {
             Runtime.getRuntime().freeMemory()
         ));
     }
+
+    public static String secToTime(double sec, String fmt) {
+        Date d = new Date((long)(sec * 1000d));
+        SimpleDateFormat df = new SimpleDateFormat(fmt); 
+        df.setTimeZone(TimeZone.getTimeZone("GMT"));
+        String time = df.format(d); 
+        return time;
+    }
 }