Skip to content

feature/zoo-sound #23

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
Jan 14, 2022
Merged

feature/zoo-sound #23

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
1 change: 1 addition & 0 deletions src/main/java/com/codedead/opal/controller/AudioController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public AudioController(final IAudioTimer audioTimer) throws URISyntaxException {
mediaPlayers.put("frogs", new MediaPlayer(new Media(Objects.requireNonNull(getClass().getResource("/audio/frogs.mp3")).toURI().toString())));
mediaPlayers.put("zen", new MediaPlayer(new Media(Objects.requireNonNull(getClass().getResource("/audio/zen.mp3")).toURI().toString())));
mediaPlayers.put("coffee", new MediaPlayer(new Media(Objects.requireNonNull(getClass().getResource("/audio/coffee.mp3")).toURI().toString())));
mediaPlayers.put("zoo", new MediaPlayer(new Media(Objects.requireNonNull(getClass().getResource("/audio/zoo.mp3")).toURI().toString())));

mediaVolumes = new HashMap<>();
for (final Map.Entry<String, MediaPlayer> entry : mediaPlayers.entrySet()) {
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/codedead/opal/controller/MainWindowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

public final class MainWindowController implements IAudioTimer {

@FXML
private SoundPane snpZoo;
@FXML
private SoundPane snpCoffee;
@FXML
Expand Down Expand Up @@ -293,6 +295,7 @@ private void initialize() {
snpFrogs.getSlider().valueProperty().addListener((observableValue, oldValue, newValue) -> audioController.setPlayerVolume("frogs", newValue.doubleValue() / 100));
snpZen.getSlider().valueProperty().addListener((observableValue, oldValue, newValue) -> audioController.setPlayerVolume("zen", newValue.doubleValue() / 100));
snpCoffee.getSlider().valueProperty().addListener((observableValue, oldValue, newValue) -> audioController.setPlayerVolume("coffee", newValue.doubleValue() / 100));
snpZoo.getSlider().valueProperty().addListener((observableValue, oldValue, newValue) -> audioController.setPlayerVolume("zoo", newValue.doubleValue() / 100));

mniTimerEnabled.setOnAction(e ->
{
Expand Down Expand Up @@ -355,6 +358,7 @@ private void openSoundPreset(final String filePath) {
case "frogs" -> snpFrogs.getSlider().setValue(entry.getValue() * 100);
case "zen" -> snpZen.getSlider().setValue(entry.getValue() * 100);
case "coffee" -> snpCoffee.getSlider().setValue(entry.getValue() * 100);
case "zoo" -> snpZoo.getSlider().setValue(entry.getValue() * 100);
default -> logger.info("Unknown key found: {}", entry.getKey());
}
}
Expand Down Expand Up @@ -418,6 +422,7 @@ private void resetAction() {
snpFrogs.getSlider().setValue(0);
snpZen.getSlider().setValue(0);
snpCoffee.getSlider().setValue(0);
snpZoo.getSlider().setValue(0);
}

/**
Expand Down
Binary file added src/main/resources/audio/zoo.mp3
View file
Open in desktop
Binary file not shown.
Binary file added src/main/resources/images/zoo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 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 @@ -66,3 +66,4 @@ Cave=Cave
Frogs=Frogs
Zen=Zen
Coffee=Coffee
Zoo=Zoo
1 change: 1 addition & 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 @@ -66,3 +66,4 @@ Cave=Cave
Frogs=Frogs
Zen=Zen
Coffee=Coffee
Zoo=Zoo
1 change: 1 addition & 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 @@ -66,3 +66,4 @@ Cave=Grotte
Frogs=Crapauds
Zen=Zen
Coffee=Caf�
Zoo=Zoo
1 change: 1 addition & 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 @@ -66,3 +66,4 @@ Cave=Grot
Frogs=Kikkers
Zen=Zen
Coffee=Koffie
Zoo=Zoo
3 changes: 3 additions & 0 deletions src/main/resources/windows/MainWindow.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
<RowConstraints vgrow="ALWAYS"/>
</rowConstraints>

<columnConstraints>
Expand All @@ -123,6 +124,8 @@
image="/images/cave.png"/>
<SoundPane fx:id="snpFrogs" GridPane.rowIndex="7" volume="0" name="%Frogs"
image="/images/frogs.png"/>
<SoundPane fx:id="snpZoo" GridPane.rowIndex="8" volume="0" name="%Zoo"
image="/images/zoo.png"/>
</GridPane>

<Label GridPane.rowIndex="2" GridPane.columnIndex="1" text="%Office">
Expand Down