MajenkoProjects/AudiobookRecorder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed exception on empty gainpoints after recording

Browse Source
This commit is contained in:
Matt Jenkins
2024-04-07 15:50:58 +01:00
parent 09436a17d8
commit 89e83f978b
6 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ExampleExportProfiles/librivox-noinit.abprof Normal file
View File

@@ -0,0 +1,21 @@
<profile>
<code>librivox-noinit</code>
<name>LibriVox.org (Without initials)</name>
<export>
<bitrate>128000</bitrate>
<channels>1</channels>
<samples>44100</samples>
<format>{chapter.name:lower}_{book.author.short:lower}_{file.bitrate.kb}kb</format>
</export>
<gaps>
<pre-chapter>500</pre-chapter>
<post-chapter>5000</post-chapter>
<post-sentence>400</post-sentence>
<followon>100</followon>
<post-paragraph>1000</post-paragraph>
<post-section>1200</post-section>
</gaps>
<audio>
<rms>-19</rms>
</audio>
</profile>

21
ExampleExportProfiles/librivox-spc.abprof Normal file
View File

@@ -0,0 +1,21 @@
<profile>
<code>librivox-spc</code>
<name>LibriVox.org Short Poetry Collection</name>
<export>
<bitrate>128000</bitrate>
<channels>1</channels>
<samples>44100</samples>
<format>{book.title:lower}_{chapter.name:lower}_{narrator.initials:lower}_{file.bitrate.kb}kb</format>
</export>
<gaps>
<pre-chapter>500</pre-chapter>
<post-chapter>5000</post-chapter>
<post-sentence>400</post-sentence>
<followon>100</followon>
<post-paragraph>1000</post-paragraph>
<post-section>1200</post-section>
</gaps>
<audio>
<rms>-19</rms>
</audio>
</profile>

0
ExampleExportFilters/librivox.abprof → ExampleExportProfiles/librivox.abprof
View File

7
src/uk/co/majenko/audiobookrecorder/Book.java
View File

@@ -252,8 +252,11 @@ public class Book extends BookTreeNode {
public Chapter getChapter(int n) { public Chapter getChapter(int n) {
Debug.trace(); Debug.trace();
if (n == 0) return null; Object o = getChildAt(n);
return (Chapter)getChildAt(n); if (o instanceof Chapter) {
return (Chapter)o;
}
return null;
} }
public Chapter addChapter() { public Chapter addChapter() {

2
src/uk/co/majenko/audiobookrecorder/Chapter.java
View File

@@ -100,7 +100,7 @@ public class Chapter extends BookTreeNode {
public int getSequenceNumber() { public int getSequenceNumber() {
Book book = getBook(); Book book = getBook();
int i = 1; int i = 0;
while (true) { while (true) {
Chapter c = book.getChapter(i); Chapter c = book.getChapter(i);
if (c == null) { if (c == null) {

16
src/uk/co/majenko/audiobookrecorder/Sentence.java
View File

@@ -106,7 +106,7 @@ public class Sentence extends BookTreeNode implements Cacheable {
double[] waveProfile = null; double[] waveProfile = null;
TreeMap<Integer, Double> gainPoints = null; TreeMap<Integer, Double> gainPoints = new TreeMap<Integer, Double>();
RecordingThread recordingThread; RecordingThread recordingThread;
@@ -241,7 +241,6 @@ public class Sentence extends BookTreeNode implements Cacheable {
autoTrimSample(); autoTrimSample();
} }
gainPoints = new TreeMap<Integer, Double>();
Element gp = Book.getNode(root, "gainpoints"); Element gp = Book.getNode(root, "gainpoints");
if (gp != null) { if (gp != null) {
NodeList points = gp.getElementsByTagName("gainpoint"); NodeList points = gp.getElementsByTagName("gainpoint");
@@ -1901,16 +1900,10 @@ public class Sentence extends BookTreeNode implements Cacheable {
public TreeMap<Integer, Double> getGainPoints() { public TreeMap<Integer, Double> getGainPoints() {
Debug.trace(); Debug.trace();
if (gainPoints == null) {
gainPoints = new TreeMap<Integer, Double>();
}
return gainPoints; return gainPoints;
} }
public void addGainPoint(Integer loc, Double g) { public void addGainPoint(Integer loc, Double g) {
if (gainPoints == null) {
gainPoints = new TreeMap<Integer, Double>();
}
gainPoints.put(loc, g); gainPoints.put(loc, g);
refreshAllData(); refreshAllData();
} }
@@ -1925,10 +1918,6 @@ public class Sentence extends BookTreeNode implements Cacheable {
} }
public void adjustGainPoint(Integer loc, Double adj, boolean reload) { public void adjustGainPoint(Integer loc, Double adj, boolean reload) {
if (gainPoints == null) {
gainPoints = new TreeMap<Integer, Double>();
return;
}
Double gp = gainPoints.get(loc); Double gp = gainPoints.get(loc);
if (gp == null) return; if (gp == null) return;
gp += adj; gp += adj;
@@ -2048,10 +2037,11 @@ public class Sentence extends BookTreeNode implements Cacheable {
final int window = 500; final int window = 500;
public double[] getWaveProfile() { public synchronized double[] getWaveProfile() {
if (waveProfile != null) return waveProfile; if (waveProfile != null) return waveProfile;
double[][] samples = getProcessedAudioData(); double[][] samples = getProcessedAudioData();
if (samples[LEFT].length == 0) return null; if (samples[LEFT].length == 0) return null;
System.out.println(String.format("Sample length: %d", samples[LEFT].length));
waveProfile = new double[samples[LEFT].length]; waveProfile = new double[samples[LEFT].length];
double rt = 0; double rt = 0;