This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 6c08e82 Fixes #6115 Merge branch 'feature/6115_ajout_RTP' into develop adds 0bdf1e6 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) adds 0ea56dc joue un bip à la réception d'une donnée de l'ychtiomètre et 3 bips différents en cas d'erreur (refs #7063) adds c8c6ee9 ajout de la tonalité nulle dans la conf (refs #7063) adds 01ef1c5 ajout de la lecture des nombres mais il reste un problème de lecture de certains nombres (2000 cm par exemple, mais je ne sais pas pourquoi) (refs #7063) adds 108a2ef correction de la lecture des voix (fixes #7063) adds c1520e9 ajout de l'option pour lire ou non les mesures et les bips (fixes #7063) adds 024dbe9 ajout des headers de license manquantes adds e3a6167 Utilisation d'un vrai objet Java pour jouer les son (SoundEngine) et revue du threading (See #7063) adds fe0b300 correction de l'algo de lecture de nombres (refs #7063) adds 3fc8d00 Suppression de la notification sonore en mode rafale si cela ne vient pas de l'ichtyomètre new d43ec31 fixes #7063 Merge branch 'feature/7063' into develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d43ec31f4d7fde345b91c3107d48544a7edbc9c7 Merge: 6c08e82 3fc8d00 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 20 17:50:04 2016 +0100 fixes #7063 Merge branch 'feature/7063' into develop Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 21 +++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 36 ++++ .../java/fr/ifremer/tutti/util/BeepFrequency.java | 33 ++++ .../i18n/tutti-persistence_en_GB.properties | 8 + .../i18n/tutti-persistence_fr_FR.properties | 5 + .../src/main/filtered-resources/log4j.properties | 1 + .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 9 + .../swing/content/config/TuttiConfigUIHandler.java | 38 +++-- .../frequency/SpeciesFrequencyUIHandler.java | 9 +- .../actions/ApplySpeciesFrequencyRafaleAction.java | 9 +- .../ifremer/tutti/ui/swing/util/SoundEngine.java | 126 ++++++++++++++ .../fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 186 +++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 8 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 8 + tutti-ui-swing/src/main/resources/sounds/,.wav | Bin 0 -> 29038 bytes tutti-ui-swing/src/main/resources/sounds/0.wav | Bin 0 -> 21626 bytes tutti-ui-swing/src/main/resources/sounds/1.wav | Bin 0 -> 9636 bytes tutti-ui-swing/src/main/resources/sounds/10.wav | Bin 0 -> 20536 bytes tutti-ui-swing/src/main/resources/sounds/100.wav | Bin 0 -> 14214 bytes tutti-ui-swing/src/main/resources/sounds/1000.wav | Bin 0 -> 17048 bytes tutti-ui-swing/src/main/resources/sounds/11.wav | Bin 0 -> 15086 bytes tutti-ui-swing/src/main/resources/sounds/12.wav | Bin 0 -> 19010 bytes tutti-ui-swing/src/main/resources/sounds/13.wav | Bin 0 -> 22280 bytes tutti-ui-swing/src/main/resources/sounds/14.wav | Bin 0 -> 30564 bytes tutti-ui-swing/src/main/resources/sounds/15.wav | Bin 0 -> 21844 bytes tutti-ui-swing/src/main/resources/sounds/16.wav | Bin 0 -> 20536 bytes tutti-ui-swing/src/main/resources/sounds/17.wav | Bin 0 -> 29910 bytes tutti-ui-swing/src/main/resources/sounds/18.wav | Bin 0 -> 30782 bytes tutti-ui-swing/src/main/resources/sounds/19.wav | Bin 0 -> 31872 bytes tutti-ui-swing/src/main/resources/sounds/2.wav | Bin 0 -> 12252 bytes tutti-ui-swing/src/main/resources/sounds/20.wav | Bin 0 -> 12252 bytes tutti-ui-swing/src/main/resources/sounds/21.wav | Bin 0 -> 25986 bytes tutti-ui-swing/src/main/resources/sounds/22.wav | Bin 0 -> 24242 bytes tutti-ui-swing/src/main/resources/sounds/23.wav | Bin 0 -> 26640 bytes tutti-ui-swing/src/main/resources/sounds/24.wav | Bin 0 -> 31218 bytes tutti-ui-swing/src/main/resources/sounds/25.wav | Bin 0 -> 34270 bytes tutti-ui-swing/src/main/resources/sounds/26.wav | Bin 0 -> 33398 bytes tutti-ui-swing/src/main/resources/sounds/27.wav | Bin 0 -> 32308 bytes tutti-ui-swing/src/main/resources/sounds/28.wav | Bin 0 -> 31654 bytes tutti-ui-swing/src/main/resources/sounds/29.wav | Bin 0 -> 34052 bytes tutti-ui-swing/src/main/resources/sounds/3.wav | Bin 0 -> 17048 bytes tutti-ui-swing/src/main/resources/sounds/30.wav | Bin 0 -> 24896 bytes tutti-ui-swing/src/main/resources/sounds/31.wav | Bin 0 -> 30564 bytes tutti-ui-swing/src/main/resources/sounds/32.wav | Bin 0 -> 26640 bytes tutti-ui-swing/src/main/resources/sounds/33.wav | Bin 0 -> 28384 bytes tutti-ui-swing/src/main/resources/sounds/34.wav | Bin 0 -> 32962 bytes tutti-ui-swing/src/main/resources/sounds/35.wav | Bin 0 -> 36014 bytes tutti-ui-swing/src/main/resources/sounds/36.wav | Bin 0 -> 35142 bytes tutti-ui-swing/src/main/resources/sounds/37.wav | Bin 0 -> 34270 bytes tutti-ui-swing/src/main/resources/sounds/38.wav | Bin 0 -> 33398 bytes tutti-ui-swing/src/main/resources/sounds/39.wav | Bin 0 -> 35796 bytes tutti-ui-swing/src/main/resources/sounds/4.wav | Bin 0 -> 19228 bytes tutti-ui-swing/src/main/resources/sounds/40.wav | Bin 0 -> 27948 bytes tutti-ui-swing/src/main/resources/sounds/41.wav | Bin 0 -> 33616 bytes tutti-ui-swing/src/main/resources/sounds/42.wav | Bin 0 -> 29692 bytes tutti-ui-swing/src/main/resources/sounds/43.wav | Bin 0 -> 31436 bytes tutti-ui-swing/src/main/resources/sounds/44.wav | Bin 0 -> 36014 bytes tutti-ui-swing/src/main/resources/sounds/45.wav | Bin 0 -> 39066 bytes tutti-ui-swing/src/main/resources/sounds/46.wav | Bin 0 -> 38412 bytes tutti-ui-swing/src/main/resources/sounds/47.wav | Bin 0 -> 37322 bytes tutti-ui-swing/src/main/resources/sounds/48.wav | Bin 0 -> 36450 bytes tutti-ui-swing/src/main/resources/sounds/49.wav | Bin 0 -> 38848 bytes tutti-ui-swing/src/main/resources/sounds/5.wav | Bin 0 -> 23588 bytes tutti-ui-swing/src/main/resources/sounds/50.wav | Bin 0 -> 33180 bytes tutti-ui-swing/src/main/resources/sounds/51.wav | Bin 0 -> 36450 bytes tutti-ui-swing/src/main/resources/sounds/52.wav | Bin 0 -> 32526 bytes tutti-ui-swing/src/main/resources/sounds/53.wav | Bin 0 -> 34270 bytes tutti-ui-swing/src/main/resources/sounds/54.wav | Bin 0 -> 38848 bytes tutti-ui-swing/src/main/resources/sounds/55.wav | Bin 0 -> 42118 bytes tutti-ui-swing/src/main/resources/sounds/56.wav | Bin 0 -> 41246 bytes tutti-ui-swing/src/main/resources/sounds/57.wav | Bin 0 -> 40156 bytes tutti-ui-swing/src/main/resources/sounds/58.wav | Bin 0 -> 39284 bytes tutti-ui-swing/src/main/resources/sounds/59.wav | Bin 0 -> 41682 bytes tutti-ui-swing/src/main/resources/sounds/6.wav | Bin 0 -> 22280 bytes tutti-ui-swing/src/main/resources/sounds/60.wav | Bin 0 -> 35578 bytes tutti-ui-swing/src/main/resources/sounds/61.wav | Bin 0 -> 38630 bytes tutti-ui-swing/src/main/resources/sounds/62.wav | Bin 0 -> 34706 bytes tutti-ui-swing/src/main/resources/sounds/63.wav | Bin 0 -> 36232 bytes tutti-ui-swing/src/main/resources/sounds/64.wav | Bin 0 -> 41028 bytes tutti-ui-swing/src/main/resources/sounds/65.wav | Bin 0 -> 44080 bytes tutti-ui-swing/src/main/resources/sounds/66.wav | Bin 0 -> 43208 bytes tutti-ui-swing/src/main/resources/sounds/67.wav | Bin 0 -> 42118 bytes tutti-ui-swing/src/main/resources/sounds/68.wav | Bin 0 -> 41464 bytes tutti-ui-swing/src/main/resources/sounds/69.wav | Bin 0 -> 43644 bytes tutti-ui-swing/src/main/resources/sounds/7.wav | Bin 0 -> 21626 bytes tutti-ui-swing/src/main/resources/sounds/70.wav | Bin 0 -> 41900 bytes tutti-ui-swing/src/main/resources/sounds/71.wav | Bin 0 -> 42772 bytes tutti-ui-swing/src/main/resources/sounds/72.wav | Bin 0 -> 40810 bytes tutti-ui-swing/src/main/resources/sounds/73.wav | Bin 0 -> 41682 bytes tutti-ui-swing/src/main/resources/sounds/74.wav | Bin 0 -> 51710 bytes tutti-ui-swing/src/main/resources/sounds/75.wav | Bin 0 -> 43644 bytes tutti-ui-swing/src/main/resources/sounds/76.wav | Bin 0 -> 41028 bytes tutti-ui-swing/src/main/resources/sounds/77.wav | Bin 0 -> 50402 bytes tutti-ui-swing/src/main/resources/sounds/78.wav | Bin 0 -> 51056 bytes tutti-ui-swing/src/main/resources/sounds/79.wav | Bin 0 -> 52146 bytes tutti-ui-swing/src/main/resources/sounds/8.wav | Bin 0 -> 17484 bytes tutti-ui-swing/src/main/resources/sounds/80.wav | Bin 0 -> 28166 bytes tutti-ui-swing/src/main/resources/sounds/81.wav | Bin 0 -> 35360 bytes tutti-ui-swing/src/main/resources/sounds/82.wav | Bin 0 -> 34270 bytes tutti-ui-swing/src/main/resources/sounds/83.wav | Bin 0 -> 38848 bytes tutti-ui-swing/src/main/resources/sounds/84.wav | Bin 0 -> 43862 bytes tutti-ui-swing/src/main/resources/sounds/85.wav | Bin 0 -> 46696 bytes tutti-ui-swing/src/main/resources/sounds/86.wav | Bin 0 -> 46042 bytes tutti-ui-swing/src/main/resources/sounds/87.wav | Bin 0 -> 44734 bytes tutti-ui-swing/src/main/resources/sounds/88.wav | Bin 0 -> 39938 bytes tutti-ui-swing/src/main/resources/sounds/89.wav | Bin 0 -> 42554 bytes tutti-ui-swing/src/main/resources/sounds/9.wav | Bin 0 -> 20972 bytes tutti-ui-swing/src/main/resources/sounds/90.wav | Bin 0 -> 42118 bytes tutti-ui-swing/src/main/resources/sounds/91.wav | Bin 0 -> 40592 bytes tutti-ui-swing/src/main/resources/sounds/92.wav | Bin 0 -> 40592 bytes tutti-ui-swing/src/main/resources/sounds/93.wav | Bin 0 -> 44080 bytes tutti-ui-swing/src/main/resources/sounds/94.wav | Bin 0 -> 54108 bytes tutti-ui-swing/src/main/resources/sounds/95.wav | Bin 0 -> 45606 bytes tutti-ui-swing/src/main/resources/sounds/96.wav | Bin 0 -> 43644 bytes tutti-ui-swing/src/main/resources/sounds/97.wav | Bin 0 -> 51492 bytes tutti-ui-swing/src/main/resources/sounds/98.wav | Bin 0 -> 52364 bytes tutti-ui-swing/src/main/resources/sounds/99.wav | Bin 0 -> 53454 bytes tutti-ui-swing/src/main/resources/sounds/cm.wav | Bin 0 -> 37322 bytes tutti-ui-swing/src/main/resources/sounds/mm.wav | Bin 0 -> 32090 bytes .../fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 52 ++++++ tutti-ui-swing/src/test/resources/log4j.properties | 2 + 121 files changed, 538 insertions(+), 13 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/util/BeepFrequency.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java create mode 100755 tutti-ui-swing/src/main/resources/sounds/,.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/0.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/1.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/10.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/100.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/1000.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/11.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/12.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/13.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/14.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/15.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/16.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/17.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/18.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/19.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/2.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/20.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/21.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/22.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/23.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/24.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/25.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/26.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/27.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/28.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/29.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/3.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/30.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/31.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/32.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/33.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/34.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/35.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/36.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/37.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/38.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/39.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/4.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/40.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/41.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/42.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/43.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/44.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/45.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/46.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/47.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/48.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/49.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/5.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/50.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/51.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/52.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/53.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/54.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/55.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/56.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/57.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/58.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/59.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/6.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/60.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/61.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/62.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/63.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/64.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/65.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/66.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/67.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/68.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/69.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/7.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/70.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/71.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/72.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/73.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/74.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/75.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/76.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/77.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/78.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/79.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/8.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/80.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/81.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/82.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/83.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/84.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/85.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/86.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/87.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/88.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/89.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/9.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/90.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/91.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/92.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/93.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/94.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/95.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/96.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/97.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/98.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/99.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/cm.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/mm.wav create mode 100644 tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.