diff --git a/src/main/java/com/codedead/opal/domain/SoundPane.java b/src/main/java/com/codedead/opal/domain/SoundPane.java index 78226e1..20b138a 100644 --- a/src/main/java/com/codedead/opal/domain/SoundPane.java +++ b/src/main/java/com/codedead/opal/domain/SoundPane.java @@ -283,7 +283,7 @@ public void pause() { */ @FXML private void playPause() { - if (this.mediaPlayer.getStatus() == MediaPlayer.Status.PLAYING) { + if (mediaPlayer != null && mediaPlayer.getStatus() == MediaPlayer.Status.PLAYING) { pause(); } else { play(); diff --git a/src/main/resources/audio/brownnoise.mp3 b/src/main/resources/audio/brownnoise.mp3 new file mode 100644 index 0000000..a82bc32 Binary files /dev/null and b/src/main/resources/audio/brownnoise.mp3 differ diff --git a/src/main/resources/audio/pinknoise.mp3 b/src/main/resources/audio/pinknoise.mp3 new file mode 100644 index 0000000..c7b33af Binary files /dev/null and b/src/main/resources/audio/pinknoise.mp3 differ diff --git a/src/main/resources/images/whitenoise.png b/src/main/resources/images/whitenoise.png deleted file mode 100644 index a8acfaf..0000000 Binary files a/src/main/resources/images/whitenoise.png and /dev/null differ diff --git a/src/main/resources/translations/OpalApplication.properties b/src/main/resources/translations/OpalApplication.properties index 2235fc2..067082a 100644 --- a/src/main/resources/translations/OpalApplication.properties +++ b/src/main/resources/translations/OpalApplication.properties @@ -90,3 +90,6 @@ TrayIconError=Unable to create tray icon! Ocean=Ocean Train=Train WhiteNoise=White noise +RadioFrequencyStatic=Radio frequency static +PinkNoise=Pink noise +BrownNoise=Brown noise diff --git a/src/main/resources/translations/OpalApplication_de_DE.properties b/src/main/resources/translations/OpalApplication_de_DE.properties index 0ea9860..3b93103 100644 --- a/src/main/resources/translations/OpalApplication_de_DE.properties +++ b/src/main/resources/translations/OpalApplication_de_DE.properties @@ -90,3 +90,6 @@ TrayIconError=Taskleistensymbol kann nicht erstellt werden! Ocean=Ozean Train=Zug WhiteNoise=Weißes Rauschen +RadioFrequencyStatic=Radiofrequenzstörung +PinkNoise=Pinkes Rauschen +BrownNoise=Braunes Rauschen diff --git a/src/main/resources/translations/OpalApplication_en_US.properties b/src/main/resources/translations/OpalApplication_en_US.properties index 2235fc2..067082a 100644 --- a/src/main/resources/translations/OpalApplication_en_US.properties +++ b/src/main/resources/translations/OpalApplication_en_US.properties @@ -90,3 +90,6 @@ TrayIconError=Unable to create tray icon! Ocean=Ocean Train=Train WhiteNoise=White noise +RadioFrequencyStatic=Radio frequency static +PinkNoise=Pink noise +BrownNoise=Brown noise diff --git a/src/main/resources/translations/OpalApplication_es_ES.properties b/src/main/resources/translations/OpalApplication_es_ES.properties index cf5338a..08b96df 100644 --- a/src/main/resources/translations/OpalApplication_es_ES.properties +++ b/src/main/resources/translations/OpalApplication_es_ES.properties @@ -90,3 +90,6 @@ TrayIconError=¡No se puede crear el icono de la bandeja! Ocean=Océano Train=Tren WhiteNoise=Ruido blanco +RadioFrequencyStatic=Estático de frecuencia de radio +PinkNoise=Ruido rosa +BrownNoise=Ruido marrón diff --git a/src/main/resources/translations/OpalApplication_fr_FR.properties b/src/main/resources/translations/OpalApplication_fr_FR.properties index d62976d..3a7fbc8 100644 --- a/src/main/resources/translations/OpalApplication_fr_FR.properties +++ b/src/main/resources/translations/OpalApplication_fr_FR.properties @@ -90,3 +90,6 @@ TrayIconError=Impossible de créer l'icône de la barre ! Ocean=Océan Train=Train WhiteNoise=Bruit blanc +RadioFrequencyStatic=Bruit blanc de fréquence radio +PinkNoise=Bruit rose +BrownNoise=Bruit brun diff --git a/src/main/resources/translations/OpalApplication_jp_JP.properties b/src/main/resources/translations/OpalApplication_jp_JP.properties index fac653c..5c2db34 100644 --- a/src/main/resources/translations/OpalApplication_jp_JP.properties +++ b/src/main/resources/translations/OpalApplication_jp_JP.properties @@ -90,3 +90,6 @@ TrayIconError=トレイ アイコンを作成できません! Ocean=海洋 Train=訓練 WhiteNoise=ホワイトノイズ +RadioFrequencyStatic=ラジオ周波数の静電気 +PinkNoise=ピンクノイズ +BrownNoise=ブラウンノイズ diff --git a/src/main/resources/translations/OpalApplication_nl_NL.properties b/src/main/resources/translations/OpalApplication_nl_NL.properties index dab8737..a380e26 100644 --- a/src/main/resources/translations/OpalApplication_nl_NL.properties +++ b/src/main/resources/translations/OpalApplication_nl_NL.properties @@ -90,3 +90,6 @@ TrayIconError=Kan geen pictogram in het systeemvak maken! Ocean=Oceaan Train=Trein WhiteNoise=Wit geluid +RadioFrequencyStatic=Radiofrequentie ruis +PinkNoise=Roze geluid +BrownNoise=Bruin geluid diff --git a/src/main/resources/translations/OpalApplication_ru_RU.properties b/src/main/resources/translations/OpalApplication_ru_RU.properties index 91fd342..e189a6b 100644 --- a/src/main/resources/translations/OpalApplication_ru_RU.properties +++ b/src/main/resources/translations/OpalApplication_ru_RU.properties @@ -90,3 +90,6 @@ TrayIconError=Невозможно создать иконку в трее! Ocean=Океан Train=Поезд WhiteNoise=Белый шум +RadioFrequencyStatic=Радиочастотный статический +PinkNoise=Розовый шум +BrownNoise=Коричневый шум diff --git a/src/main/resources/windows/MainWindow.fxml b/src/main/resources/windows/MainWindow.fxml index a31f29d..159a487 100644 --- a/src/main/resources/windows/MainWindow.fxml +++ b/src/main/resources/windows/MainWindow.fxml @@ -152,6 +152,9 @@ + + + @@ -323,7 +326,7 @@ image="/images/rugbyfootball.png"/> -