Skip to content

feature/static_sounds #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CodeDead merged 1 commit into from
Apr 2, 2023
Merged

feature/static_sounds #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/codedead/opal/domain/SoundPane.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Binary file added src/main/resources/audio/brownnoise.mp3
View file
Open in desktop
Binary file not shown.
Binary file added src/main/resources/audio/pinknoise.mp3
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/images/whitenoise.png
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions src/main/resources/translations/OpalApplication.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions src/main/resources/translations/OpalApplication_de_DE.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions src/main/resources/translations/OpalApplication_en_US.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions src/main/resources/translations/OpalApplication_es_ES.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions src/main/resources/translations/OpalApplication_fr_FR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions src/main/resources/translations/OpalApplication_jp_JP.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,6 @@ TrayIconError=トレイ アイコンを作成できません!
Ocean=海洋
Train=訓練
WhiteNoise=ホワイトノイズ
RadioFrequencyStatic=ラジオ周波数の静電気
PinkNoise=ピンクノイズ
BrownNoise=ブラウンノイズ
3 changes: 3 additions & 0 deletions src/main/resources/translations/OpalApplication_nl_NL.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions src/main/resources/translations/OpalApplication_ru_RU.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,6 @@ TrayIconError=Невозможно создать иконку в трее!
Ocean=Океан
Train=Поезд
WhiteNoise=Белый шум
RadioFrequencyStatic=Радиочастотный статический
PinkNoise=Розовый шум
BrownNoise=Коричневый шум
63 changes: 51 additions & 12 deletions src/main/resources/windows/MainWindow.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@
<RowConstraints/>
<RowConstraints/>
<RowConstraints/>
<RowConstraints/>
<RowConstraints/>
<RowConstraints/>
</rowConstraints>

<columnConstraints>
Expand Down Expand Up @@ -323,7 +326,7 @@
image="/images/rugbyfootball.png"/>
</GridPane>

<Label GridPane.rowIndex="9" GridPane.columnIndex="1" text="%Other">
<Label GridPane.rowIndex="9" GridPane.columnIndex="1" text="%RadioFrequencyStatic">
<font>
<Font name="System Bold" size="14"/>
</font>
Expand All @@ -347,10 +350,6 @@
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
</rowConstraints>

<columnConstraints>
Expand All @@ -362,23 +361,63 @@
image="/images/radio.png"/>
<SoundPane GridPane.rowIndex="1" name="%WhiteNoise"
mediaKey="whitenoise" mediaPath="/audio/whitenoise.mp3"
image="/images/whitenoise.png"/>
<SoundPane GridPane.rowIndex="2" name="%Fantasy"
image="/images/radio.png"/>
<SoundPane GridPane.rowIndex="2" name="%PinkNoise"
mediaKey="pinknoise" mediaPath="/audio/pinknoise.mp3"
image="/images/radio.png"/>
<SoundPane GridPane.rowIndex="3" name="%BrownNoise"
mediaKey="brownnoise" mediaPath="/audio/brownnoise.mp3"
image="/images/radio.png"/>
</GridPane>

<Label GridPane.rowIndex="12" GridPane.columnIndex="1" text="%Other">
<font>
<Font name="System Bold" size="14"/>
</font>
<GridPane.margin>
<Insets left="5" right="5" top="10"/>
</GridPane.margin>
</Label>

<Separator GridPane.rowIndex="13" GridPane.columnIndex="1">
<GridPane.margin>
<Insets bottom="3.0" left="5" right="5"/>
</GridPane.margin>
</Separator>

<GridPane GridPane.rowIndex="14" GridPane.columnIndex="1">
<GridPane.margin>
<Insets bottom="10"/>
</GridPane.margin>
<rowConstraints>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
</rowConstraints>

<columnConstraints>
<ColumnConstraints hgrow="ALWAYS"/>
</columnConstraints>

<SoundPane GridPane.rowIndex="0" name="%Fantasy"
mediaKey="fantasy" mediaPath="/audio/fantasy.mp3"
image="/images/star.png"/>
<SoundPane GridPane.rowIndex="3" name="%Zen"
<SoundPane GridPane.rowIndex="1" name="%Zen"
mediaKey="zen" mediaPath="/audio/zen.mp3"
image="/images/zen.png"/>
<SoundPane GridPane.rowIndex="4" name="%Sleepy"
<SoundPane GridPane.rowIndex="2" name="%Sleepy"
mediaKey="sleepy" mediaPath="/audio/sleepy.mp3"
image="/images/sleepy.png"/>
<SoundPane GridPane.rowIndex="5" name="%Gong"
<SoundPane GridPane.rowIndex="3" name="%Gong"
mediaKey="gong" mediaPath="/audio/gong.mp3"
image="/images/gong.png"/>
<SoundPane GridPane.rowIndex="6" name="%Space"
<SoundPane GridPane.rowIndex="4" name="%Space"
mediaKey="space" mediaPath="/audio/space.mp3"
image="/images/space.png"/>
<SoundPane GridPane.rowIndex="7" name="%Train"
<SoundPane GridPane.rowIndex="5" name="%Train"
mediaKey="train" mediaPath="/audio/train.mp3"
image="/images/train.png"/>
</GridPane>
Expand Down