Author: bpoussin Date: 2012-09-05 16:41:31 +0200 (Wed, 05 Sep 2012) New Revision: 527 Url: http://forge.codelutin.com/repositories/revision/sammoa/527 Log: - le composant de lecture se met automatiquement listener de son model (SammoaAudioReader) sinon il sert a rien - ferme la fenetre de check ne doit pas fermer l'application Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/FlightBarHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2012-09-05 14:15:58 UTC (rev 526) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/AudioCheck.java 2012-09-05 14:41:31 UTC (rev 527) @@ -1,6 +1,7 @@ package fr.ulr.sammoa.ui.swing; import com.google.common.base.Throwables; +import fr.ulr.sammoa.application.device.audio.SammoaAudioReader; import fr.ulr.sammoa.application.device.audio.SammoaAudioRecorder; import fr.ulr.sammoa.ui.swing.flight.bar.SoundPlayer; import fr.ulr.sammoa.ui.swing.util.SammoaUtil; @@ -59,7 +60,7 @@ protected JButton captureBtn = new JButton("Capture"); protected JButton stopBtn = new JButton("Stop"); protected JButton loadBtn = new JButton("Load"); - protected SoundPlayer playerPanel = new SoundPlayer(); + protected SoundPlayer playerPanel = new SoundPlayer(new SammoaAudioReader()); protected JPanel btnPanelSampleRate = new JPanel(); protected ButtonGroup btnGroupSampleRate = new ButtonGroup(); @@ -134,10 +135,9 @@ //Finish the GUI and make visible setTitle("Sound Test"); - setDefaultCloseOperation(EXIT_ON_CLOSE); + setDefaultCloseOperation(DISPOSE_ON_CLOSE); getContentPane().add(box, "Center"); - pack(); - setVisible(true); + setBounds(0, 0, 400, 400); captureBtn.setEnabled(true); stopBtn.setEnabled(false); @@ -251,8 +251,9 @@ } - public static void main( String args[]) - throws LineUnavailableException, UnsupportedAudioFileException, IOException { - new AudioCheck(); + public static void main( String args[]) { + AudioCheck frame = new AudioCheck(); + frame.setDefaultCloseOperation(EXIT_ON_CLOSE); + frame.setVisible(true); } } \ No newline at end of file Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-09-05 14:15:58 UTC (rev 526) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-09-05 14:41:31 UTC (rev 527) @@ -428,7 +428,8 @@ } public void showAudioCheck() { - new AudioCheck(); + AudioCheck frame = new AudioCheck(); + frame.setVisible(true); } /** Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/FlightBarHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/FlightBarHandler.java 2012-09-05 14:15:58 UTC (rev 526) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/FlightBarHandler.java 2012-09-05 14:41:31 UTC (rev 527) @@ -81,8 +81,6 @@ AudioReader audioReader = flightController.getDeviceManager(AudioReader.class); ui.getSoundPlayer().setReader(audioReader); - audioReader.addDeviceStateListener(ui.getSoundPlayer()); - audioReader.addAudioPositionListener(ui.getSoundPlayer()); } else { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-05 14:15:58 UTC (rev 526) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/bar/SoundPlayer.java 2012-09-05 14:41:31 UTC (rev 527) @@ -54,8 +54,12 @@ // Create a SoundPlayer component for the specified file. public SoundPlayer() { + this(null); + } + + public SoundPlayer(AudioReader reader) { initUI(); -// initAudio(); + setReader(reader); } protected void initUI() { @@ -162,7 +166,16 @@ } public void setReader(AudioReader reader) { + if (this.reader != null) { + this.reader.removeAudioPositionListener(this); + this.reader.removeDeviceStateListener(this); + } this.reader = reader; + if (reader != null) { + reader.addDeviceStateListener(this); + reader.addAudioPositionListener(this); + } + } /** @@ -218,8 +231,6 @@ // Create a SoundPlayer object to play the sound. player = new SoundPlayer(); AudioReader reader = new SammoaAudioReader(); - reader.addDeviceStateListener(player); - reader.addAudioPositionListener(player); player.setReader(reader); player.loadFile(file);