diff --git a/pom.xml b/pom.xml
index 4a00c145..035b5a41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
org.pamguard
Pamguard
- 2.02.06
+ 2.02.06a
Pamguard Java12+
Pamguard for Java 12+, using Maven to control dependcies
www.pamguard.org
diff --git a/src/Acquisition/FileInputSystem.java b/src/Acquisition/FileInputSystem.java
index 31af5a84..1b15482f 100644
--- a/src/Acquisition/FileInputSystem.java
+++ b/src/Acquisition/FileInputSystem.java
@@ -167,6 +167,8 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
private SudListener sudListener;
+ private boolean fullyStopped;
+
public FileInputSystem(AcquisitionControl acquisitionControl) {
this.acquisitionControl = acquisitionControl;
PamSettingManager.getInstance().registerSettings(this);
@@ -738,6 +740,8 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
if (audioStream == null) return false;
dontStop = true;
+
+ fullyStopped = false;
theThread.start();
@@ -780,6 +784,9 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
}
public void systemHasStopped(boolean wasRunning) {
+ if (fullyStopped) {
+ return;
+ }
long stopTime = System.currentTimeMillis();
if (getCurrentFile() == null) {
return;
@@ -788,6 +795,7 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
double analSecs = (stopTime - fileStartTime) / 1000.;
System.out.println(String.format("File %s, SR=%dHz, length=%3.1fs took %3.1fs = %3.1fx real time",
getCurrentFile().getName(), (int)getSampleRate(), fileSecs, analSecs, fileSecs / analSecs));
+ fullyStopped = true;
}
/**
@@ -933,7 +941,7 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
* PamDataUnits from them. Once a unit is created, tell this thread
* to wait until it has been used by the main thread.
*/
- System.out.println("File system start processing");
+// System.out.println("File system start processing");
/*
* File should have been opened in the constructor so just read it
* in in chunks and pass to datablock
diff --git a/src/Acquisition/FolderInputSystem.java b/src/Acquisition/FolderInputSystem.java
index 589b6c45..92ee94d7 100644
--- a/src/Acquisition/FolderInputSystem.java
+++ b/src/Acquisition/FolderInputSystem.java
@@ -150,7 +150,7 @@ public class FolderInputSystem extends FileInputSystem implements PamSettings{
public void actionPerformed(ActionEvent e) {
- System.out.println("Restart later time action");
+// System.out.println("Restart later time action");
newFileTimer.stop();
PamController.getInstance().startLater(false); //don't save settings on restarts
@@ -655,7 +655,7 @@ public class FolderInputSystem extends FileInputSystem implements PamSettings{
if (currentFile < allFiles.size()) {
// only restart if the file ended - not if it stopped
if (getStreamStatus() == STREAM_ENDED) {
- System.out.println(String.format("Start new file timer (file %d/%d)",currentFile+1,allFiles.size()));
+// System.out.println(String.format("Start new file timer (file %d/%d)",currentFile+1,allFiles.size()));
newFileTimer.start();
}
}
@@ -778,7 +778,7 @@ public class FolderInputSystem extends FileInputSystem implements PamSettings{
@Override
public boolean startSystem(AcquisitionControl daqControl) {
- System.out.println("Start system");
+// System.out.println("Start system");
setFolderProgress();
return super.startSystem(daqControl);
}
diff --git a/src/PamController/PamController.java b/src/PamController/PamController.java
index af85a10d..f731b064 100644
--- a/src/PamController/PamController.java
+++ b/src/PamController/PamController.java
@@ -1225,8 +1225,9 @@ public class PamController implements PamControllerInterface, PamSettings {
if (PamCalendar.isSoundFile() == false) {
PamCalendar.setSessionStartTime(PamCalendar.getTimeInMillis());
}
-
- System.out.printf("PAMGUARD Startup took %d milliseconds at time %s\n", startDelay, PamCalendar.formatDateTime(PamCalendar.getSessionStartTime()));
+ if (PamCalendar.isSoundFile() == false) {
+ System.out.printf("PAMGUARD Startup took %d milliseconds at time %s\n", startDelay, PamCalendar.formatDateTime(PamCalendar.getSessionStartTime()));
+ }
guiFrameManager.pamStarted();
return true;
diff --git a/src/PamController/PamguardVersionInfo.java b/src/PamController/PamguardVersionInfo.java
index 68b68f42..47692579 100644
--- a/src/PamController/PamguardVersionInfo.java
+++ b/src/PamController/PamguardVersionInfo.java
@@ -31,7 +31,7 @@ public class PamguardVersionInfo {
* Version number, major version.minorversion.sub-release.
* Note: can't go higher than sub-release 'f'
*/
- static public final String version = "2.02.06";
+ static public final String version = "2.02.06a";
/**
* Release date