diff options
| author | Amir Rajan <[email protected]> | 2021-12-10 00:09:48 -0600 |
|---|---|---|
| committer | Amir Rajan <[email protected]> | 2021-12-10 00:09:48 -0600 |
| commit | eaa29e72939f5edf61735ccbb73c36ee89369f65 (patch) | |
| tree | c310fac2e39bd799bf7fc1f73d35c12bcc5187b7 /samples/07_advanced_audio/01_audio_mixer/app/main.rb | |
| parent | 33dfdde9ae03e3218b4796f3595d3b727f626587 (diff) | |
| download | dragonruby-game-toolkit-contrib-eaa29e72939f5edf61735ccbb73c36ee89369f65.tar.gz dragonruby-game-toolkit-contrib-eaa29e72939f5edf61735ccbb73c36ee89369f65.zip | |
Synced with DragonRuby Game Toolkit v3.2.
Diffstat (limited to 'samples/07_advanced_audio/01_audio_mixer/app/main.rb')
| -rw-r--r-- | samples/07_advanced_audio/01_audio_mixer/app/main.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/samples/07_advanced_audio/01_audio_mixer/app/main.rb b/samples/07_advanced_audio/01_audio_mixer/app/main.rb index 3a85d47..9cdc62f 100644 --- a/samples/07_advanced_audio/01_audio_mixer/app/main.rb +++ b/samples/07_advanced_audio/01_audio_mixer/app/main.rb @@ -71,6 +71,7 @@ def render_sources args end def playtime_str t + return "" unless t minutes = (t / 60.0).floor seconds = t - (minutes * 60.0).to_f return minutes.to_s + ':' + seconds.floor.to_s + ((seconds - seconds.floor).to_s + "000")[1..3] @@ -183,7 +184,7 @@ def panel_primitives args, audio_entry results.playtime_slider_rect = progress_bar(args: args, row: 2.5, col: 2, - percentage: audio_entry.playtime / audio_entry.length_, + percentage: (audio_entry.playtime || 1) / (audio_entry.length_ || 1), text: "#{playtime_str(audio_entry.playtime)} / #{playtime_str(audio_entry.length_)}") results.primitives << results.playtime_slider_rect.primitives @@ -320,7 +321,7 @@ def defaults args args.state.sound_files ||= [ { name: :tada, path: "sounds/tada.wav" }, { name: :splash, path: "sounds/splash.wav" }, - { name: :drum, path: "sounds/drum.wav" }, + { name: :drum, path: "sounds/drum.mp3" }, { name: :spring, path: "sounds/spring.wav" }, { name: :music, path: "sounds/music.ogg" } ] |