andrew
/
BlockBookBinder
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 4 Wiki Activity

Added finish sound and countdown in title.

This commit is contained in:
Andrew Lalis 2020-11-09 13:55:54 +01:00
parent 53122afcf5
commit e5bc16a6a4
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/nl/andrewlalis/blockbookbinder/control/export/BookExporter.java
View File

@ -15,6 +15,7 @@ import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection; import java.awt.datatransfer.StringSelection;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.logging.Level; import java.util.logging.Level;
@ -48,6 +49,7 @@ public class BookExporter implements Runnable {
// Some sound clips to play as user feedback. // Some sound clips to play as user feedback.
private final Clip beepClip; private final Clip beepClip;
private final Clip beginningExportClip; private final Clip beginningExportClip;
private final Clip finishClip;
public BookExporter(ExportToBookDialog dialog, ExportStatusPanel exportStatusPanel, Book book, boolean autoPaste, int autoPasteDelay) { public BookExporter(ExportToBookDialog dialog, ExportStatusPanel exportStatusPanel, Book book, boolean autoPaste, int autoPasteDelay) {
this.dialog = dialog; this.dialog = dialog;
@ -57,6 +59,7 @@ public class BookExporter implements Runnable {
this.autoPasteDelay = autoPasteDelay; this.autoPasteDelay = autoPasteDelay;
this.beepClip = this.loadAudioClip(ApplicationProperties.getProp("export_dialog.beep_sound")); this.beepClip = this.loadAudioClip(ApplicationProperties.getProp("export_dialog.beep_sound"));
this.beginningExportClip = this.loadAudioClip(ApplicationProperties.getProp("export_dialog.beginning_export")); this.beginningExportClip = this.loadAudioClip(ApplicationProperties.getProp("export_dialog.beginning_export"));
this.finishClip = this.loadAudioClip(ApplicationProperties.getProp("export_dialog.finish_sound"));
this.clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); this.clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
this.pagePasteListener = new PagePasteListener(this); this.pagePasteListener = new PagePasteListener(this);
if (this.autoPaste) { // Only initialize the robot if we'll need it. if (this.autoPaste) { // Only initialize the robot if we'll need it.
@ -83,6 +86,8 @@ public class BookExporter implements Runnable {
if (inStartPhase && currentTime - lastAudioPlayedAt > 1000) { if (inStartPhase && currentTime - lastAudioPlayedAt > 1000) {
this.playAudioClip(this.beepClip); this.playAudioClip(this.beepClip);
lastAudioPlayedAt = currentTime; lastAudioPlayedAt = currentTime;
int secondsLeft = (START_DELAY) - (int) (currentTime - startTime) / 1000;
this.updateStatusLabel("Starting in " + secondsLeft + " seconds.");
} }
// Otherwise, export one page. // Otherwise, export one page.
if (!inStartPhase && this.nextPageRequested) { if (!inStartPhase && this.nextPageRequested) {
@ -90,6 +95,7 @@ public class BookExporter implements Runnable {
// If this is the first time we're exporting, play a sound. // If this is the first time we're exporting, play a sound.
if (lastPageExportedAt == 0) { if (lastPageExportedAt == 0) {
this.initStatusPanel(); this.initStatusPanel();
this.updateStatusLabel("Exporting.");
this.initNativeListener(); this.initNativeListener();
this.playAudioClip(this.beginningExportClip); this.playAudioClip(this.beginningExportClip);
} }
@ -103,6 +109,7 @@ public class BookExporter implements Runnable {
this.updateStatusProgressBar(nextPageToExport); this.updateStatusProgressBar(nextPageToExport);
// If we've reached the end of the book, stop the exporter. // If we've reached the end of the book, stop the exporter.
if (nextPageToExport >= this.book.getPageCount()) { if (nextPageToExport >= this.book.getPageCount()) {
this.playAudioClip(this.finishClip);
this.addStatusMessage("Export finished: " + this.book.getPageCount() + " pages exported."); this.addStatusMessage("Export finished: " + this.book.getPageCount() + " pages exported.");
if (!this.autoPaste) { if (!this.autoPaste) {
this.stopNativeListener(); this.stopNativeListener();
@ -215,7 +222,7 @@ public class BookExporter implements Runnable {
if (fileInputStream == null) { if (fileInputStream == null) {
return null; return null;
} }
AudioInputStream ais = AudioSystem.getAudioInputStream(fileInputStream); AudioInputStream ais = AudioSystem.getAudioInputStream(new BufferedInputStream(fileInputStream));
clip.open(ais); clip.open(ais);
return clip; return clip;
} catch (LineUnavailableException | IOException | UnsupportedAudioFileException e) { } catch (LineUnavailableException | IOException | UnsupportedAudioFileException e) {

1
src/main/resources/application.properties
View File

@ -7,6 +7,7 @@ export_dialog.min_width=400
export_dialog.min_height=300 export_dialog.min_height=300
export_dialog.beep_sound=sound/andrew_beep.wav export_dialog.beep_sound=sound/andrew_beep.wav
export_dialog.beginning_export=sound/beginning_export.wav export_dialog.beginning_export=sound/beginning_export.wav
export_dialog.finish_sound=sound/LOZFDS_Fanfare.wav
about_dialog.min_width=600 about_dialog.min_width=600
about_dialog.min_height=800 about_dialog.min_height=800

BIN
src/main/resources/sound/LOZFDS_Fanfare.wav Normal file
View File

Binary file not shown.