Author: fdesbois Date: 2012-09-05 16:57:12 +0200 (Wed, 05 Sep 2012) New Revision: 528 Url: http://forge.codelutin.com/repositories/revision/sammoa/528 Log: refs #1197 : add date in load method Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java 2012-09-05 14:41:31 UTC (rev 527) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReader.java 2012-09-05 14:57:12 UTC (rev 528) @@ -27,6 +27,7 @@ import javax.sound.sampled.AudioFileFormat; import java.io.File; +import java.util.Date; import java.util.Set; /** @@ -39,8 +40,11 @@ /** @return the {@link AudioFileFormat.Type} used (default is WAV) */ AudioFileFormat.Type getOutputType(); - /** @param file Audio file to load, then you can call start() and stop() */ - void load(File file); + /** + * @param file Audio file to load, then you can call start() and stop() + * @param recordingDate Recording date of the file + */ + void load(File file, Date recordingDate); /** Unload the current audio file */ void unload(); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java 2012-09-05 14:41:31 UTC (rev 527) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/AudioReaderMock.java 2012-09-05 14:57:12 UTC (rev 528) @@ -32,6 +32,7 @@ import javax.sound.sampled.AudioFileFormat; import java.io.File; +import java.util.Date; import java.util.HashSet; import java.util.Set; @@ -61,7 +62,7 @@ } @Override - public void load(File file) { + public void load(File file, Date recordingDate) { Preconditions.checkNotNull(file); Preconditions.checkArgument(file.exists()); unload(); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java 2012-09-05 14:41:31 UTC (rev 527) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java 2012-09-05 14:57:12 UTC (rev 528) @@ -38,6 +38,7 @@ import javax.sound.sampled.Clip; import javax.sound.sampled.DataLine; import java.io.File; +import java.util.Date; import java.util.HashSet; import java.util.Set; import java.util.Timer; @@ -139,7 +140,7 @@ } @Override - public void load(File file) { + public void load(File file, Date recordingDate) { Preconditions.checkNotNull(file); Preconditions.checkArgument(file.exists()); unload(); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2012-09-05 14:41:31 UTC (rev 527) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerValidation.java 2012-09-05 14:57:12 UTC (rev 528) @@ -25,6 +25,7 @@ import com.google.common.base.Objects; import com.google.common.base.Preconditions; +import com.google.common.collect.FluentIterable; import fr.ulr.sammoa.application.device.DeviceManager; import fr.ulr.sammoa.application.device.audio.AudioReader; import fr.ulr.sammoa.persistence.Dates; @@ -177,7 +178,14 @@ newValue, audioReader.getOutputType().getExtension()); if (file.exists()) { - audioReader.load(file); + + Route firstRoute = FluentIterable + .from(routes) + .filter(Routes.withTransectFlight(newValue)) + .first() + .orNull(); + + audioReader.load(file, firstRoute.getBeginTime()); } } }