From 7ee4d1ea76b14a0bd87fac9ccade40099d550d12 Mon Sep 17 00:00:00 2001
From: Matt Jenkins <matt@majenko.co.uk>
Date: Mon, 10 Sep 2018 17:56:32 +0100
Subject: [PATCH] Added reprocess audio button to waveform display

---
 .../majenko/audiobookrecorder/icons/redo.png  | Bin 0 -> 1176 bytes
 .../audiobookrecorder/AudiobookRecorder.java  |  20 ++++++++++++++++++
 .../co/majenko/audiobookrecorder/Icons.java   |   4 ++++
 3 files changed, 24 insertions(+)
 create mode 100644 resources/uk/co/majenko/audiobookrecorder/icons/redo.png

diff --git a/resources/uk/co/majenko/audiobookrecorder/icons/redo.png b/resources/uk/co/majenko/audiobookrecorder/icons/redo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2fd06b455d739870db0a24e66ee8dd971edbaac
GIT binary patch
literal 1176
zcmV;J1ZVq+P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX000DENkl<Zc-qa=
z1C(296o%m@8QZpPI~g;{*i+lKZQHgPjHB9a*R^e)@9tCM+H2)G{P!Do0PwRSmin5I
zA~KO2A#Xi$oJ=ES#Nub>xa|IyqQ#NR{oc(wl8ExQJdD3F3>)5FhQ04^#_CrWVZhnW
z5S~aw)Jne(Xl>=A89O2;ACsXk2Cc}Bq^)60@2j0K{ncSu@zw-ve18g7yf@+j_IT|(
z(=qe)5g2f@8!~oAF*LJ>TrWN;z{Xcsf{wp<G5Tu0gpZ+j`cQNbCcoPISIu~BFecp}
ziJG<o)V3F5)ZM=5f2%VaW}Xf2$vw`;z+2rh@MazQ->iAg;9H&OUj1{|29QBF>oMw1
zUyQijht6x!`$oqnVK!P5yDpgNd#y9-E(%e5vFL&NOCqFe65-Y44!z@g;2q<^N@9V~
zHb2yy&qvqG#prtJp)REJB{6zjZ+IAf^bveiudG5TEzZ~QAIR3E!cJxj^HU}WZw*7X
zIs^IYT*S3U!BcJrPl*+BRB@<1mxtQ3d8j&@i;A;3=y9#~Nw_k8Q#ey~z66PF(GMgk
zVqta4f(dN#VJe%85x+K+iCpIQRpe5?uM+6EL0JxgA{b$E2NbFjP^L*ov04D3Dh=JQ
zRX+*O&N`5W3{?t(n*x3$-?>VizqXTDepS&@#4h@f)DRuwO5Q6unT^sj$w+JVKu&uI
z#L5&DDiV>ah)0*J<xj%$+LmH?OFh4ElexY@uInAsQwbX5KZ{)(#L)eUXTD%*?xAF+
z^Q9~lw}qih8IKZ00z~cc$Y>2g3_Vf(W#N<X$2ILjSf8}IWOd4_+47{-QO*(0t~^QV
zj}gm!zoGlu&xGF{b+ZB8uN0u?6(M?F6`{vfF}htTLYD`GsFdfk;oI!u4@(=fp>tH{
zxYjZ4Em}vlR#13h&XEK*{4M(tJQMCsJ|PT?K6iHiqAQV0eB&OxJ<(x4%nuqL>2S2e
z3^I-k;UA26HF{M5yRhre{q0NS8JwQCgxbXyQ@M3l@;E)N6my=v&xU6tZH{1Kj`_$b
z*q?MKwZR8n=ks?&vEeV+I5B>9aLA2fJx7_TuE_~q?$13j8!n4n703t<MBJlbB@yW!
z<K>v1)Z?e_4BC*gHso~dLhpld^Ssu?&-KhKmI^q7uT*pM&xL8bO3n1_B*r|mlX{$=
z3!BqtawB7F)T;rzoyTb%<0hM&(2JpgFn5``AAh@dLdsH~eEve8Ou;;_P~qt`UeVcL
zPH3||$G_2r>n^k4(%P59?1o-RXu^E2aiX2k<1G&8M_HdT^mUb)d(fa$M6;uLLaVEO
zYP*NFK;g+FFGYNtY<@n>N}J+ho_8?Wso&i^XD5k?gOA+GCal?kjT)pYytMOFe!L=e
zzzcz2_WTJwidwP_8(s-C$vG2f6w~6Y&u{nCE>QV#OEtj{qJJj*M2aGTGw5!GcEOn>
q-rzf#+=h!$52AlL{PX@N;hz98yE?r;YuXV20000<MNUMnLSTZ4R!Cm}

literal 0
HcmV?d00001

diff --git a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
index 569a1ed..0c0a649 100644
--- a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
+++ b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
@@ -60,6 +60,8 @@ public class AudiobookRecorder extends JFrame {
     JSpinner endOffset;
     JSpinner postSentenceGap;
 
+    JButton reprocessAudio;
+
     Thread playingThread = null;
 
     Random rng = new Random();
@@ -228,6 +230,22 @@ public class AudiobookRecorder extends JFrame {
     
         sampleControl.add(sampleWaveform, BorderLayout.CENTER);
 
+        reprocessAudio = new JButton(Icons.redo);
+        reprocessAudio.setToolTipText("Reprocess Audio");
+        reprocessAudio.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if (selectedSentence != null) {
+                    selectedSentence.autoTrimSample();
+                    selectedSentence.recognise();
+                    sampleWaveform.setData(selectedSentence.getAudioData());
+                    sampleWaveform.setMarkers(selectedSentence.getStartOffset(), selectedSentence.getEndOffset());
+                    startOffset.setValue(selectedSentence.getStartOffset());
+                    endOffset.setValue(selectedSentence.getEndOffset());
+                    postSentenceGap.setValue(selectedSentence.getPostGap());
+                }
+            }
+        });
+
         startOffset = new JSpinner(new SteppedNumericSpinnerModel(0, 0, 1, 0));
         startOffset.setPreferredSize(new Dimension(100, 20));
         endOffset = new JSpinner(new SteppedNumericSpinnerModel(0, 0, 1, 0));
@@ -265,6 +283,8 @@ public class AudiobookRecorder extends JFrame {
         });
 
         JPanel controls = new JPanel();
+        controls.add(reprocessAudio);
+
         controls.add(new JLabel("Start Offset:"));
 
         JButton startFastDown = new JButton("<<");
diff --git a/src/uk/co/majenko/audiobookrecorder/Icons.java b/src/uk/co/majenko/audiobookrecorder/Icons.java
index dc9ce1d..a528f74 100644
--- a/src/uk/co/majenko/audiobookrecorder/Icons.java
+++ b/src/uk/co/majenko/audiobookrecorder/Icons.java
@@ -17,6 +17,8 @@ public class Icons {
     static public ImageIcon recordRoom;
     static public ImageIcon save;
 
+    static public ImageIcon redo;
+
     static void loadIcons() {
         book = new ImageIcon(Icons.class.getResource("icons/book.png"));
         chapter = new ImageIcon(Icons.class.getResource("icons/chapter.png"));
@@ -32,6 +34,8 @@ public class Icons {
         recordRoom = new ImageIcon(Icons.class.getResource("icons/record-room.png"));
         save = new ImageIcon(Icons.class.getResource("icons/save.png"));
 
+        redo = new ImageIcon(Icons.class.getResource("icons/redo.png"));
+
     }
 }