diff --git a/resources/sounds/sounds.properties b/resources/sounds/sounds.properties index 28f063600..b14f48a60 100644 --- a/resources/sounds/sounds.properties +++ b/resources/sounds/sounds.properties @@ -23,3 +23,5 @@ CALL_SECURITY_ON=resources/sounds/zrtpSecure.wav CALL_SECURITY_ERROR=resources/sounds/zrtpAlert.wav WEBCAM_SNAPSHOT=resources/sounds/webcamSnapshot.wav + +TEST_SOUND=resources/sounds/testSound.wav diff --git a/resources/sounds/testSound.wav b/resources/sounds/testSound.wav new file mode 100644 index 000000000..012dbab16 Binary files /dev/null and b/resources/sounds/testSound.wav differ diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java index 27fb316dc..e52cd4b05 100644 --- a/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java +++ b/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java @@ -89,6 +89,13 @@ public class MediaConfigurationImpl private static final String AUDIO_SYSTEM_DISABLED_PROP = "net.java.sip.communicator.impl.neomedia.audiosystem.DISABLED"; + /** + * The name of the sound file used to test the playback and the notification + * devices. + */ + private static final String TEST_SOUND_FILENAME_PROP + = "net.java.sip.communicator.impl.neomedia.TestSoundFilename"; + /** * The thread which updates the capture device as selected by the user. This * prevent the UI to lock while changing the device. @@ -1617,9 +1624,15 @@ public void actionPerformed(ActionEvent e) { AudioNotifierService audioNotifServ = NeomediaActivator.getAudioNotifierService(); + String testSoundFilename + = NeomediaActivator.getConfigurationService() + .getString( + TEST_SOUND_FILENAME_PROP, + NeomediaActivator.getResources().getSoundPath( + "TEST_SOUND") + ); SCAudioClip sound = audioNotifServ.createAudio( - NeomediaActivator.getResources().getSoundPath( - "INCOMING_FILE"), + testSoundFilename, isPlaybackEvent); sound.play(); }