Skip to content

Commit 2772ca4

Browse files
moved sound library requires to actual conditional sections of music module
1 parent 44dcf46 commit 2772ca4

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

lib/gemwarrior/misc/music.rb

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
# lib/gemwarrior/misc/music.rb
22
# Music cues using win32-sound
33

4-
require 'feep'
5-
require 'win32/sound'
6-
7-
require_relative 'musical_notes'
8-
94
module Gemwarrior
105
module Music
116
def self.cue(sequence)
127
# if Windows, use superior win32-sound library
138
if OS.windows?
9+
require 'win32/sound'
1410
threads = []
1511

1612
Thread.start {
@@ -25,10 +21,13 @@ def self.cue(sequence)
2521
}
2622
# otherwise, use inferior feep library
2723
else
24+
require 'feep'
25+
require_relative 'musical_notes'
26+
2827
feep_defaults = {
29-
:frequencies => '440',
30-
:waveform => 'sine',
31-
:volume => 0.3,
28+
:frequencies => '440',
29+
:waveform => 'sine',
30+
:volume => 0.3,
3231
:duration => 500,
3332
:notext => true
3433
}
@@ -38,9 +37,9 @@ def self.cue(sequence)
3837
seq = feep_defaults.merge(seq)
3938

4039
Feep::Base.new({
41-
:freq_or_note => seq[:frequencies],
42-
:waveform => seq[:waveform],
43-
:volume => seq[:volume],
40+
:freq_or_note => seq[:frequencies],
41+
:waveform => seq[:waveform],
42+
:volume => seq[:volume],
4443
:duration => seq[:duration],
4544
:notext => seq[:notext]
4645
})

lib/gemwarrior/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# Version of Gem Warrior
33

44
module Gemwarrior
5-
VERSION = '0.9.26'
5+
VERSION = '0.9.27'
66
end

0 commit comments

Comments
 (0)