Author: fdesbois Date: 2012-09-27 11:27:35 +0200 (Thu, 27 Sep 2012) New Revision: 604 Url: http://forge.codelutin.com/repositories/revision/sammoa/604 Log: refs #1512 : no check state on clip alive that breaks when user move the slide in UI Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation/SoundPlayer.java 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-27 08:50:44 UTC (rev 603) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/device/audio/SammoaAudioReader.java 2012-09-27 09:27:35 UTC (rev 604) @@ -99,18 +99,18 @@ */ public void start() { task = new TimerTask() { + @Override public void run() { - Preconditions.checkState(reader.getClip().isActive(), - "Clip is not alive, no position can be fired"); - - // on appele pas setPosition car, sinon on modifie la position dans le clips :( - // alors que c'est lui qu'on surveille et qui fait le changement - long old = reader.audioPosition; - long position = reader.getClip().getMicrosecondPosition()/1000L; - if (old != position) { - reader.audioPosition = position; - reader.firePositionChanged(position); + if (reader.clip.isActive()) { + // on appele pas setPosition car, sinon on modifie la position dans le clips :( + // alors que c'est lui qu'on surveille et qui fait le changement + long old = reader.audioPosition; + long position = reader.getClip().getMicrosecondPosition()/1000L; + if (old != position) { + reader.audioPosition = position; + reader.firePositionChanged(position); + } } } }; @@ -233,7 +233,7 @@ if (clip != null) { long old = audioPosition; this.audioPosition = position; - if (old != position ) { + if (old != position) { clip.setMicrosecondPosition(position * 1000L); firePositionChanged(position); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation/SoundPlayer.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation/SoundPlayer.java 2012-09-27 08:50:44 UTC (rev 603) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/validation/SoundPlayer.java 2012-09-27 09:27:35 UTC (rev 604) @@ -147,7 +147,7 @@ @Override public void mousePressed(MouseEvent e) { - inPlay= getAudioReader().getState() == DeviceState.RUNNING; + inPlay = getAudioReader().getState() == DeviceState.RUNNING; if (inPlay) { reader.stop(); }