nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-21 22:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84 from PAMGuard/main

Browse Source 
Merge from main
This commit is contained in:
Douglas Gillespie 2024-07-12 16:38:11 +01:00 committed by GitHub
commit f24dd9bb91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pom.xml
View File

@ -100,7 +100,8 @@
<excludes> <excludes>
<exclude>META-INF/*.SF</exclude> <!-- get rid of manifests from library jars - also done in orig ant build file --> <exclude>META-INF/*.SF</exclude> <!-- get rid of manifests from library jars - also done in orig ant build file -->
<exclude>META-INF/*.DSA</exclude> <exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude> <exclude>META-INF/*.RSA</exclude>
<exclude>test/resources/**</exclude>
</excludes> </excludes>
</filter> </filter>
</filters> </filters>
@ -180,6 +181,24 @@
</executions> </executions>
</plugin> </plugin>
<!-- Exclude the resource folder from build
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<resources>
<resource>
<directory>src/Resources</directory>
<excludes>
<exclude>src/test/resources/**</exclude>
</excludes>
</resource>
</resources>
</configuration>
</plugin>-->
</plugins> </plugins>
@ -308,7 +327,7 @@
<dependency> <dependency>
<groupId>io.github.macster110</groupId> <groupId>io.github.macster110</groupId>
<artifactId>jdl4pam</artifactId> <artifactId>jdl4pam</artifactId>
<version>0.0.99a</version> <version>0.0.99b</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/gov.nist.math/jama --> <!-- https://mvnrepository.com/artifact/gov.nist.math/jama -->

2
src/Acquisition/FileInputSystem.java
View File

@ -603,7 +603,7 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
audioStream.close(); audioStream.close();
} }
System.out.println("FileInputSystem - prepareInputFile"); // System.out.println("FileInputSystem - prepareInputFile");
audioStream = PamAudioFileManager.getInstance().getAudioInputStream(currentFile); audioStream = PamAudioFileManager.getInstance().getAudioInputStream(currentFile);