diff --git a/ant-libs/jarbundler-2.3.2.jar b/ant-libs/jarbundler-2.3.2.jar index 31fe985..3553f59 100644 Binary files a/ant-libs/jarbundler-2.3.2.jar and b/ant-libs/jarbundler-2.3.2.jar differ diff --git a/launch4j/demo/ConsoleApp/ConsoleApp.jar b/launch4j/demo/ConsoleApp/ConsoleApp.jar index 40b5f97..2ddc626 100644 Binary files a/launch4j/demo/ConsoleApp/ConsoleApp.jar and b/launch4j/demo/ConsoleApp/ConsoleApp.jar differ diff --git a/launch4j/demo/SimpleApp/SimpleApp.jar b/launch4j/demo/SimpleApp/SimpleApp.jar index d6bfdc9..4a71422 100644 Binary files a/launch4j/demo/SimpleApp/SimpleApp.jar and b/launch4j/demo/SimpleApp/SimpleApp.jar differ diff --git a/launch4j/launch4j.jar b/launch4j/launch4j.jar index 70ff93e..eadd38a 100644 Binary files a/launch4j/launch4j.jar and b/launch4j/launch4j.jar differ diff --git a/launch4j/lib/ant.jar b/launch4j/lib/ant.jar index 4f70c07..bb35823 100644 Binary files a/launch4j/lib/ant.jar and b/launch4j/lib/ant.jar differ diff --git a/launch4j/lib/commons-beanutils.jar b/launch4j/lib/commons-beanutils.jar index b1b89c9..ba49450 100644 Binary files a/launch4j/lib/commons-beanutils.jar and b/launch4j/lib/commons-beanutils.jar differ diff --git a/launch4j/lib/commons-logging.jar b/launch4j/lib/commons-logging.jar index b73a80f..46de424 100644 Binary files a/launch4j/lib/commons-logging.jar and b/launch4j/lib/commons-logging.jar differ diff --git a/launch4j/lib/formsrt.jar b/launch4j/lib/formsrt.jar index e0de6ec..b11af4c 100644 Binary files a/launch4j/lib/formsrt.jar and b/launch4j/lib/formsrt.jar differ diff --git a/launch4j/lib/foxtrot.jar b/launch4j/lib/foxtrot.jar index f39103a..0460567 100644 Binary files a/launch4j/lib/foxtrot.jar and b/launch4j/lib/foxtrot.jar differ diff --git a/launch4j/lib/jgoodies-common.jar b/launch4j/lib/jgoodies-common.jar index e67347f..d69ad4b 100644 Binary files a/launch4j/lib/jgoodies-common.jar and b/launch4j/lib/jgoodies-common.jar differ diff --git a/launch4j/lib/jgoodies-forms.jar b/launch4j/lib/jgoodies-forms.jar index a6a8126..eeda722 100644 Binary files a/launch4j/lib/jgoodies-forms.jar and b/launch4j/lib/jgoodies-forms.jar differ diff --git a/launch4j/lib/jgoodies-looks.jar b/launch4j/lib/jgoodies-looks.jar index 65e32e1..177ee47 100644 Binary files a/launch4j/lib/jgoodies-looks.jar and b/launch4j/lib/jgoodies-looks.jar differ diff --git a/launch4j/lib/xstream.jar b/launch4j/lib/xstream.jar index 392e1c9..47f526a 100644 Binary files a/launch4j/lib/xstream.jar and b/launch4j/lib/xstream.jar differ diff --git a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java index c1086a7..36815bb 100644 --- a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java +++ b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java @@ -91,7 +91,6 @@ public class AudiobookRecorder extends JFrame { public Configuration sphinxConfig; public StreamSpeechRecognizer recognizer; - public static AudiobookRecorder window; void initSphinx() { @@ -2054,7 +2053,7 @@ public class AudiobookRecorder extends JFrame { String name = AudiobookRecorder.this.book.getName(); File storageDir = new File(Options.get("path.storage")); File bookDir = new File(storageDir, name); - File archiveDir = new File(storageDir, "archive"); + File archiveDir = new File(Options.get("path.archive")); ArrayList fileList = gatherFiles(bookDir); @@ -2139,7 +2138,7 @@ public class AudiobookRecorder extends JFrame { } public void openArchive() { - JFileChooser jc = new JFileChooser(new File(Options.get("path.storage"), "archive")); + JFileChooser jc = new JFileChooser(new File(Options.get("path.archive"))); FileNameExtensionFilter filter = new FileNameExtensionFilter("Audiobook Archives", "abz"); jc.addChoosableFileFilter(filter); jc.setFileFilter(filter); diff --git a/src/uk/co/majenko/audiobookrecorder/Options.java b/src/uk/co/majenko/audiobookrecorder/Options.java index d28fd5d..0f3b334 100644 --- a/src/uk/co/majenko/audiobookrecorder/Options.java +++ b/src/uk/co/majenko/audiobookrecorder/Options.java @@ -22,6 +22,7 @@ public class Options extends JDialog { JComboBox bitDepth; JComboBox trimMethod; JTextField storageFolder; + JTextField archiveFolder; JSpinner preChapterGap; JSpinner postChapterGap; JSpinner postSentenceGap; @@ -256,6 +257,7 @@ public class Options extends JDialog { playbackList = addDropdown(optionsPanel, "Playback device:", getPlaybackMixerList(), get("audio.playback.device")); addSeparator(optionsPanel); storageFolder = addFilePath(optionsPanel, "Storage folder:", get("path.storage"), true); + archiveFolder = addFilePath(optionsPanel, "Archive folder:", get("path.archive"), true); addSeparator(optionsPanel); @@ -462,6 +464,7 @@ public class Options extends JDialog { defaultPrefs.put("catenation.post-paragraph", "2000"); 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()); defaultPrefs.put("path.ffmpeg", ""); defaultPrefs.put("audio.export.bitrate", "256000"); @@ -598,6 +601,7 @@ public class Options extends JDialog { set("audio.recording.trim", ((KVPair)trimMethod.getSelectedItem()).key); set("audio.playback.device", ((KVPair)playbackList.getSelectedItem()).key); set("path.storage", storageFolder.getText()); + set("path.archive", archiveFolder.getText()); set("path.ffmpeg", ffmpegLocation.getText()); set("catenation.pre-chapter", preChapterGap.getValue()); set("catenation.post-chapter", postChapterGap.getValue());