RubyGems - win32-sound - Versions diffs - 0.4.2 → 0.5.0 - Mend

win32-sound 0.4.2 → 0.5.0

Files changed (8) hide show

data/.gemtest ADDED Viewed

File without changes

data/CHANGES CHANGED Viewed

@@ -1,3 +1,15 @@
+== 0.5.0 - 28-Jun-2012
+* Now uses FFI instead of win32-api. This means it works with JRuby, too.
+* Corresponding updates to the tests, Rakefile, gemspec, etc.
+* Removed the Sound::Error exception class. If an underlying FFI function
+  fails then a SystemCallError (Errno::XXX) is raised instead.
+== 0.4.3 - 21-May-2011
+* Refactored Rakefile, removing an old gem install task and adding a
+  default task and a clean task.
+* Altered the gemspec, including a platform change to 'universal-win32', and
+  removed a deprecated specification method.
 == 0.4.2 - 6-Aug-2009
 * Changed the license to Artistic 2.0.
 * Updated to use the Windows::Sound module from the windows-pr library.

data/README CHANGED Viewed

@@ -1,63 +1,56 @@
-== Description
-   A library for playing and controlling sounds on MS Windows.
+= Description
+  A library for playing and controlling sounds on MS Windows.
-== Prerequisites
-   * windows-pr 1.0.6 or later
+= Prerequisites
+  * ffi
+  * test-unit 2 (Development only)
-== Installation instructions
-=== Gem installation
-   gem install win32-sound
+= Installation
+  gem install win32-sound
-=== Local installation
-   rake test (optional)
-   rake install (non-gem) or rake install_gem (gem)
+= Synopsis
+  require 'win32/sound'
+  include Win32
-== Synopsis
-   require 'win32/sound'
-   include Win32
+  # Play a wav file
+  Sound.play("somefile.wav")
-   # Play a wav file
-   Sound.play("somefile.wav")
+  # Play a system sound
+  Sound.play("SystemAsterisk",Sound::ALIAS)
-   # Play a system sound
-   Sound.play("SystemAsterisk",Sound::ALIAS)
+  # Get the current volume of the waveform-audio output device.
+  p Sound.volume.join(", ") # left channel, right channel
-   # Get the current volume of the waveform-audio output device.
-   p Sound.volume.join(", ") # left channel, right channel
+= Acknowledgements
+  API ideas derived (or not) from Perl's Win32::Sound module and Python's
+  winsound package.
-== Acknowledgements
-   API ideas derived (or not) from Perl's Win32::Sound module and Python's
-   winsound package.
-== Known Bugs
-   None that I'm aware of. Please report any bugs on the Win32 Utils home
-   page at http://rubyforge.org/projects/win32utils.
+= Known Bugs
+  None that I'm aware of. Please report any bugs on the project page
+  at https://github.com/djberg96/win32-sound.
-== Questions and Comments
-   Please post questions and/or comments on one of the forums on the project
-   page at http://rubyforge.org/projects/win32utils. Click the 'Forums' tab.
-== Future Plans
-   Add ability to retrieve information about WAV files.
-   Add MIDI support?
-== Developer's Notes
-   The MessageBeep() function, which the Python "winsound" module contains,
-   is intentionally omitted here. I felt it was redundant, because you can
-   achieve the same effect with something like this:
-   Sound.play("SystemAsterisk", Sound::ALIAS).
+= Future Plans
+  Add ability to retrieve information about WAV files.
+  Add MIDI support?
+= Developer's Notes
+  The MessageBeep() function, which the Python "winsound" module contains,
+  is intentionally omitted here. I felt it was redundant, because you can
+  achieve the same effect with something like this:
+    Sound.play("SystemAsterisk", Sound::ALIAS).
-== License
-   Artistic 2.0
+= License
+  Artistic 2.0
-== Copyright
-   (C) 2004-2009, Daniel J. Berger, All Rights Reserved
+= Copyright
+  (C) 2004-2012, Daniel J. Berger, All Rights Reserved
-== Warranty
-   This package is provided "as is" and without any express or
-   implied warranties, including, without limitation, the implied
-   warranties of merchantability and fitness for a particular purpose.
+= Warranty
+  This package is provided "as is" and without any express or
+  implied warranties, including, without limitation, the implied
+  warranties of merchantability and fitness for a particular purpose.
-== Author(s)
-   Daniel Berger
-   Park Heesob
+= Author(s)
+  Daniel Berger
+  Park Heesob

data/Rakefile CHANGED Viewed

@@ -1,26 +1,31 @@
 require 'rake'
 require 'rake/testtask'
+require 'rake/clean'
-desc "Install the win32-sound package (non-gem)"
-task :install do
-   dest = File.join(Config::CONFIG['sitelibdir'], 'win32')
-   Dir.mkdir(dest) unless File.exists? dest
-   cp 'lib/win32/sound.rb', dest, :verbose => true
-end
+CLEAN.include("**/*.gem", "**/*.rbc")
+namespace :gem do
+  desc "Create the win32-sound gem"
+  task :create => [:clean] do
+    spec = eval(IO.read("win32-sound.gemspec"))
+    Gem::Builder.new(spec).build
+  end
-desc "Install the win32-sound package as a gem"
-task :install_gem do
-   ruby 'win32-sound.gemspec'
-   file = Dir["*.gem"].first
-   sh "gem install #{file}"
+  desc "Install the win32-sound library"
+  task :install => [:create] do
+    file = Dir["*.gem"].first
+    sh "gem install #{file}"
+  end
 end
 desc 'Run the example program'
 task :example do
-   ruby '-Ilib examples\example_win32_sound.rb'
+  ruby '-Ilib examples\example_win32_sound.rb'
 end
 Rake::TestTask.new do |t|
-   t.warning = true
-   t.verbose = true
+  t.warning = true
+  t.verbose = true
 end
+task :default => :test

data/lib/win32/sound.rb CHANGED Viewed

@@ -1,211 +1,229 @@
-require 'windows/sound'
-require 'windows/error'
+require 'ffi'
 # The Win32 module serves as a namespace only.
 module Win32
-   # The Sound class encapsulates various methods for playing sound as well
-   # as querying or configuring sound related properties.
-   class Sound
-      # The Win32::Sound::Error class is typically raised if any of the
-      # Win32::Sound methods fail.
-      class Error < StandardError; end
-      include Windows::Sound
-      include Windows::Error
-      extend Windows::Sound
-      extend Windows::Error
-      # The version of the win32-sound library
-      VERSION = '0.4.2'
-      LOW_FREQUENCY  = 37
-      HIGH_FREQUENCY = 32767
-      MAX_VOLUME     = 0xFFFF
-      SYNC           = SND_SYNC        # play synchronously (default)
-      ASYNC          = SND_ASYNC       # play asynchronously
-      NODEFAULT      = SND_NODEFAULT   # silence (!default) if sound not found
-      MEMORY         = SND_MEMORY      # pszSound points to a memory file
-      LOOP           = SND_LOOP        # loop the sound until next sndPlaySound
-      NOSTOP         = SND_NOSTOP      # don't stop any currently playing sound
-      NOWAIT         = SND_NOWAIT      # don't wait if the driver is busy
-      ALIAS          = SND_ALIAS       # name is a registry alias
-      ALIAS_ID       = SND_ALIAS_ID    # alias is a predefined ID
-      FILENAME       = SND_FILENAME    # name is file name
-      RESOURCE       = SND_RESOURCE    # name is resource name or atom
-      PURGE          = SND_PURGE       # purge non-static events for task
-      APPLICATION    = SND_APPLICATION # look for app specific association
-      # Returns an array of all the available sound devices; their names contain
-      # the type of the device and a zero-based ID number. Possible return values
-      # are WAVEOUT, WAVEIN, MIDIOUT, MIDIIN, AUX or MIXER.
-      #
-      def self.devices
-         devs = []
-         begin
-            0.upto(waveOutGetNumDevs()){ |i| devs << "WAVEOUT#{i}" }
-            0.upto(waveInGetNumDevs()){ |i| devs << "WAVEIN#{i}" }
-            0.upto(midiOutGetNumDevs()){ |i| devs << "MIDIOUT#{i}" }
-            0.upto(midiInGetNumDevs()){ |i| devs << "MIDIIN#{i}" }
-            0.upto(auxGetNumDevs()){ |i| devs << "AUX#{i}" }
-            0.upto(mixerGetNumDevs()){ |i| devs << "MIXER#{i}" }
-         rescue Exception
-            raise Error, get_last_error
-         end
-         devs
-      end
+  # The Sound class encapsulates various methods for playing sound as well
+  # as querying or configuring sound related properties.
+  class Sound
+    extend FFI::Library
+    private
+    ffi_lib :kernel32
+    attach_function :Beep, [:ulong, :ulong], :bool
+    ffi_lib :winmm
+    attach_function :PlaySound, [:string, :long, :ulong], :bool
+    attach_function :waveOutSetVolume, [:long, :ulong], :int
+    attach_function :waveOutGetVolume, [:long, :pointer], :int
+    attach_function :waveOutGetNumDevs, [], :int
+    attach_function :waveInGetNumDevs, [], :int
+    attach_function :midiOutGetNumDevs, [], :int
+    attach_function :midiInGetNumDevs, [], :int
+    attach_function :auxGetNumDevs, [], :int
+    attach_function :mixerGetNumDevs, [], :int
+    private_class_method :Beep, :PlaySound, :waveOutSetVolume, :waveOutGetVolume
+    private_class_method :waveInGetNumDevs, :waveOutGetNumDevs, :midiOutGetNumDevs
+    private_class_method :midiInGetNumDevs, :auxGetNumDevs, :mixerGetNumDevs
+    public
+    # The version of the win32-sound library
+    VERSION = '0.5.0'
-      # Generates simple tones on the speaker. The function is synchronous; it
-      # does not return control to its caller until the sound finishes.
-      #
-      # The frequency (in Hertz) must be between 37 and 32767.
-      # The duration is in milliseconds.
-      #
-      def self.beep(frequency, duration)
-         if frequency > HIGH_FREQUENCY || frequency < LOW_FREQUENCY
-            raise Error, 'invalid frequency'
-         end
-         if 0 == Beep(frequency, duration)
-            raise Error, get_last_error
-         end
-         self
+    LOW_FREQUENCY  = 37
+    HIGH_FREQUENCY = 32767
+    MAX_VOLUME     = 0xFFFF
+    SYNC           = 0x00000000 # play synchronously (default)
+    ASYNC          = 0x00000001 # play asynchronously
+    NODEFAULT      = 0x00000002 # silence (!default) if sound not found
+    MEMORY         = 0x00000004 # pszSound points to a memory file
+    LOOP           = 0x00000008 # loop the sound until next sndPlaySound
+    NOSTOP         = 0x00000010 # don't stop any currently playing sound
+    NOWAIT         = 8192       # don't wait if the driver is busy
+    ALIAS          = 65536      # name is a registry alias
+    ALIAS_ID       = 1114112    # alias is a predefined ID
+    FILENAME       = 131072     # name is file name
+    RESOURCE       = 262148     # name is resource name or atom
+    PURGE          = 0x00000040 # purge non-static events for task
+    APPLICATION    = 0x00000080 # look for app specific association
+    # Returns an array of all the available sound devices; their names contain
+    # the type of the device and a zero-based ID number. Possible return values
+    # are WAVEOUT, WAVEIN, MIDIOUT, MIDIIN, AUX or MIXER.
+    #
+    def self.devices
+      devs = []
+      begin
+        0.upto(waveOutGetNumDevs()){ |i| devs << "WAVEOUT#{i}" }
+        0.upto(waveInGetNumDevs()){ |i| devs << "WAVEIN#{i}" }
+        0.upto(midiOutGetNumDevs()){ |i| devs << "MIDIOUT#{i}" }
+        0.upto(midiInGetNumDevs()){ |i| devs << "MIDIIN#{i}" }
+        0.upto(auxGetNumDevs()){ |i| devs << "AUX#{i}" }
+        0.upto(mixerGetNumDevs()){ |i| devs << "MIXER#{i}" }
+      rescue Exception
+        raise SystemCallError, FFI.errno, "GetNumDevs"
       end
-      # Stops any currently playing waveform sound. If +purge+ is set to
-      # true, then *all* sounds are stopped. The default is false.
-      #
-      def self.stop(purge = false)
-         if purge && purge != 0
-            flags = PURGE
-         else
-            flags = 0
-         end
-         unless PlaySound(0, 0, flags)
-            raise Error, get_last_error
-         end
-         self
+      devs
+    end
+    # Generates simple tones on the speaker. The function is synchronous; it
+    # does not return control to its caller until the sound finishes.
+    #
+    # The frequency (in Hertz) must be between 37 and 32767.
+    # The duration is in milliseconds.
+    #
+    def self.beep(frequency, duration)
+      if frequency > HIGH_FREQUENCY || frequency < LOW_FREQUENCY
+        raise ArgumentError, 'invalid frequency'
       end
-      # Plays the specified sound. The sound can be a wave file or a system
-      # sound, when used in conjunction with the ALIAS flag.
-      #
-      # Valid flags:
-      #
-      # Sound::ALIAS
-      #   The sound parameter is a system-event alias in the registry or the
-      #   WIN.INI file. If the registry contains no such name, it plays the
-      #   system default sound unless the NODEFAULT value is also specified.
-      #   Do not use with FILENAME.
-      #
-      # Sound::APPLICATION
-      #   The sound is played using an application-specific association.
-      #
-      # Sound::ASYNC
-      #   The sound is played asynchronously and the function returns
-      #   immediately after beginning the sound.
-      #
-      # Sound::FILENAME
-      #   The sound parameter is the name of a WAV file.  Do not use with
-      #   ALIAS.
-      #
-      # Sound::LOOP
-      #   The sound plays repeatedly until Sound.stop() is called. You must
-      #   also specify the ASYNC flag to loop sounds.
-      #
-      # Sound::MEMORY
-      #   The sound points to an image of a waveform sound in memory.
-      #
-      # Sound::NODEFAULT
-      #   If the sound cannot be found, the function returns silently without
-      #   playing the default sound.
-      #
-      # Sound::NOSTOP
-      #   If a sound is currently playing, the function immediately returns
-      #   false without playing the requested sound.
-      #
-      # Sound::NOWAIT
-      #   If the driver is busy, return immediately without playing the sound.
-      #
-      # Sound::PURGE
-      #   Stop playing all instances of the specified sound.
-      #
-      # Sound::SYNC
-      #   The sound is played synchronously and the function does not return
-      #   until the sound ends.
-      #
-      # Examples:
-      #
-      #    require 'win32/sound'
-      #    include Win32
-      #
-      #    # Play a wave file once
-      #    Sound.play('some_file.wav')
-      #
-      #    # Play a wave file in an asynchronous loop for 2 seconds
-      #    Sound.play('some_file.wav', Sound::ASYNC | Sound::LOOP)
-      #    sleep 2
-      #    Sound.stop
-      #
-      def self.play(sound, flags = 0)
-         unless PlaySound(sound, 0, flags)
-            raise Error, get_last_error
-         end
-         self
+      if 0 == Beep(frequency, duration)
+        raise SystemCallError, FFI.errno, "Beep"
       end
-      # Sets the volume for the left and right channel. If the +right_channel+
-      # is omitted, the volume is set for *both* channels.
-      #
-      # You may optionally pass a single Integer rather than an Array, in which
-      # case it is assumed you are setting both channels to the same value.
-      #
-      def self.set_wave_volume(left_channel, right_channel = nil)
-         right_channel ||= left_channel
-         lvolume = left_channel > MAX_VOLUME ? MAX_VOLUME : left_channel
-         rvolume = right_channel > MAX_VOLUME ? MAX_VOLUME : right_channel
-         volume = lvolume | rvolume << 16
-         if waveOutSetVolume(-1, volume) != 0
-            raise Error, get_last_error
-         end
-         self
+      self
+    end
+    # Stops any currently playing waveform sound. If +purge+ is set to
+    # true, then *all* sounds are stopped. The default is false.
+    #
+    def self.stop(purge = false)
+      if purge && purge != 0
+        flags = PURGE
+      else
+        flags = 0
       end
-      # Returns a 2-element array that contains the volume for the left channel
-      # and right channel, respectively.
-      def self.wave_volume
-         volume = [0].pack('L')
-         if waveOutGetVolume(-1, volume) != 0
-            raise Error, get_last_error
-         end
-         volume = volume.unpack('L').first
-         [low_word(volume), high_word(volume)]
+      unless PlaySound(nil, 0, flags)
+        raise SystemCallError, FFI.errno, "PlaySound"
       end
-      class << self
-         alias get_wave_volume wave_volume
+      self
+    end
+    # Plays the specified sound. The sound can be a wave file or a system
+    # sound, when used in conjunction with the ALIAS flag.
+    #
+    # Valid flags:
+    #
+    # Sound::ALIAS
+    #   The sound parameter is a system-event alias in the registry or the
+    #   WIN.INI file. If the registry contains no such name, it plays the
+    #   system default sound unless the NODEFAULT value is also specified.
+    #   Do not use with FILENAME.
+    #
+    # Sound::APPLICATION
+    #   The sound is played using an application-specific association.
+    #
+    # Sound::ASYNC
+    #   The sound is played asynchronously and the function returns
+    #   immediately after beginning the sound.
+    #
+    # Sound::FILENAME
+    #   The sound parameter is the name of a WAV file.  Do not use with
+    #   ALIAS.
+    #
+    # Sound::LOOP
+    #   The sound plays repeatedly until Sound.stop() is called. You must
+    #   also specify the ASYNC flag to loop sounds.
+    #
+    # Sound::MEMORY
+    #   The sound points to an image of a waveform sound in memory.
+    #
+    # Sound::NODEFAULT
+    #   If the sound cannot be found, the function returns silently without
+    #   playing the default sound.
+    #
+    # Sound::NOSTOP
+    #   If a sound is currently playing, the function immediately returns
+    #   false without playing the requested sound.
+    #
+    # Sound::NOWAIT
+    #   If the driver is busy, return immediately without playing the sound.
+    #
+    # Sound::PURGE
+    #   Stop playing all instances of the specified sound.
+    #
+    # Sound::SYNC
+    #   The sound is played synchronously and the function does not return
+    #   until the sound ends.
+    #
+    # Examples:
+    #
+    #    require 'win32/sound'
+    #    include Win32
+    #
+    #    # Play a wave file once
+    #    Sound.play('some_file.wav')
+    #
+    #    # Play a wave file in an asynchronous loop for 2 seconds
+    #    Sound.play('some_file.wav', Sound::ASYNC | Sound::LOOP)
+    #    sleep 2
+    #    Sound.stop
+    #
+    def self.play(sound, flags = 0)
+      unless PlaySound(sound, 0, flags)
+        raise SystemCallError, FFI.errno, "PlaySound"
       end
-      private
-      def self.low_word(num)
-         num & 0xFFFF
+      self
+    end
+    # Sets the volume for the left and right channel. If the +right_channel+
+    # is omitted, the volume is set for *both* channels.
+    #
+    # You may optionally pass a single Integer rather than an Array, in which
+    # case it is assumed you are setting both channels to the same value.
+    #
+    def self.set_wave_volume(left_channel, right_channel = nil)
+      right_channel ||= left_channel
+      lvolume = left_channel > MAX_VOLUME ? MAX_VOLUME : left_channel
+      rvolume = right_channel > MAX_VOLUME ? MAX_VOLUME : right_channel
+      volume = lvolume | rvolume << 16
+      if waveOutSetVolume(-1, volume) != 0
+        raise SystemCallError, FFI.errno, "waveOutSetVolume"
       end
-      def self.high_word(num)
-         num >> 16
+      self
+    end
+    # Returns a 2-element array that contains the volume for the left channel
+    # and right channel, respectively.
+    def self.wave_volume
+      ptr = FFI::MemoryPointer.new(:ulong)
+      if waveOutGetVolume(-1, ptr) != 0
+        raise SystemCallError, FFI.errno, "waveOutGetVolume"
       end
-   end
+      volume = ptr.read_long
+      [low_word(volume), high_word(volume)]
+    end
+    class << self
+      alias get_wave_volume wave_volume
+    end
+    private
+    def self.low_word(num)
+      num & 0xFFFF
+    end
+    def self.high_word(num)
+      num >> 16
+    end
+  end
 end

data/test/test_win32_sound.rb CHANGED Viewed

@@ -4,88 +4,100 @@
 # Test suite for the win32-sound library. You should run this test case
 # via the 'rake test' task.
 ##########################################################################
-require 'test/unit'
+require 'test-unit'
 require 'win32/sound'
 include Win32
 class TC_Win32_Sound < Test::Unit::TestCase
-   def setup
-      @wav = "c:\\windows\\media\\chimes.wav"
-   end
-   def test_version
-      assert_equal('0.4.2', Sound::VERSION)
-   end
-   def test_beep
-      assert_respond_to(Sound, :beep)
-      assert_nothing_raised{ Sound.beep(55, 100) }
-   end
-   def test_beep_expected_errors
-      assert_raises(Sound::Error){ Sound.beep(0, 100) }
-      assert_raises(ArgumentError){ Sound.beep }
-      assert_raises(ArgumentError){ Sound.beep(500) }
-      assert_raises(ArgumentError){ Sound.beep(500, 500, 5) }
-   end
-   def test_devices
-      assert_respond_to(Sound, :devices)
-      assert_nothing_raised{ Sound.devices }
-      assert_kind_of(Array,Sound.devices)
-   end
-   def test_stop
-      assert_respond_to(Sound, :stop)
-      assert_nothing_raised{ Sound.stop }
-      assert_nothing_raised{ Sound.stop(true) }
-   end
-   def test_get_volume_basic
-      assert_respond_to(Sound, :wave_volume)
-      assert_respond_to(Sound, :get_wave_volume)
-      assert_nothing_raised{ Sound.get_wave_volume }
-   end
-   def test_get_volume
-      assert_kind_of(Array, Sound.get_wave_volume)
-      assert_equal(2, Sound.get_wave_volume.length)
-   end
+  def setup
+    @wav = "c:\\windows\\media\\chimes.wav"
+  end
-   def test_set_volume
-      assert_respond_to(Sound, :set_wave_volume)
-      assert_nothing_raised{ Sound.set_wave_volume(30000) } # About half
-      assert_nothing_raised{ Sound.set_wave_volume(30000, 30000) }
-   end
-   def test_play
-      assert_respond_to(Sound, :play)
-      assert_nothing_raised{ Sound.play(@wav) }
-   end
+  def test_version
+    assert_equal('0.5.0', Sound::VERSION)
+  end
-   def test_play_alias
-      assert_nothing_raised{ Sound.play('SystemAsterisk', Sound::ALIAS) }
-   end
-   def test_expected_errors
-      assert_raises(Sound::Error){ Sound.beep(-1, 1) }
-   end
-   def test_constants
-      assert_not_nil(Sound::ALIAS)
-      assert_not_nil(Sound::APPLICATION)
-      assert_not_nil(Sound::ASYNC)
-      assert_not_nil(Sound::FILENAME)
-      assert_not_nil(Sound::LOOP)
-      assert_not_nil(Sound::MEMORY)
-      assert_not_nil(Sound::NODEFAULT)
-      assert_not_nil(Sound::NOSTOP)
-      assert_not_nil(Sound::NOWAIT)
-      assert_not_nil(Sound::PURGE)
-      assert_not_nil(Sound::SYNC)
-   end
-   def teardown
-      @wav = nil
-   end
+  def test_beep
+    assert_respond_to(Sound, :beep)
+    assert_nothing_raised{ Sound.beep(55, 100) }
+  end
+  def test_beep_expected_errors
+    assert_raises(ArgumentError){ Sound.beep(0, 100) }
+    assert_raises(ArgumentError){ Sound.beep }
+    assert_raises(ArgumentError){ Sound.beep(500) }
+    assert_raises(ArgumentError){ Sound.beep(500, 500, 5) }
+  end
+  def test_devices
+    assert_respond_to(Sound, :devices)
+    assert_nothing_raised{ Sound.devices }
+    assert_kind_of(Array,Sound.devices)
+  end
+  def test_stop
+    assert_respond_to(Sound, :stop)
+    assert_nothing_raised{ Sound.stop }
+    assert_nothing_raised{ Sound.stop(true) }
+  end
+  def test_get_volume_basic
+    assert_respond_to(Sound, :wave_volume)
+    assert_respond_to(Sound, :get_wave_volume)
+    assert_nothing_raised{ Sound.get_wave_volume }
+  end
+  def test_get_volume
+    assert_kind_of(Array, Sound.get_wave_volume)
+    assert_equal(2, Sound.get_wave_volume.length)
+  end
+  def test_set_volume
+    assert_respond_to(Sound, :set_wave_volume)
+    assert_nothing_raised{ Sound.set_wave_volume(30000) } # About half
+    assert_nothing_raised{ Sound.set_wave_volume(30000, 30000) }
+  end
+  def test_play
+    assert_respond_to(Sound, :play)
+    assert_nothing_raised{ Sound.play(@wav) }
+  end
+  def test_play_alias
+    assert_nothing_raised{ Sound.play('SystemAsterisk', Sound::ALIAS) }
+  end
+  def test_expected_errors
+    assert_raises(ArgumentError){ Sound.beep(-1, 1) }
+  end
+  def test_constants
+    assert_not_nil(Sound::ALIAS)
+    assert_not_nil(Sound::APPLICATION)
+    assert_not_nil(Sound::ASYNC)
+    assert_not_nil(Sound::FILENAME)
+    assert_not_nil(Sound::LOOP)
+    assert_not_nil(Sound::MEMORY)
+    assert_not_nil(Sound::NODEFAULT)
+    assert_not_nil(Sound::NOSTOP)
+    assert_not_nil(Sound::NOWAIT)
+    assert_not_nil(Sound::PURGE)
+    assert_not_nil(Sound::SYNC)
+  end
+  test "ffi functions are private" do
+    assert_not_respond_to(Sound, :Beep)
+    assert_not_respond_to(Sound, :waveOutSetVolume)
+    assert_not_respond_to(Sound, :waveOutGetVolume)
+    assert_not_respond_to(Sound, :waveOutGetNumDevs)
+    assert_not_respond_to(Sound, :waveInGetNumDevs)
+    assert_not_respond_to(Sound, :midiInGetNumDevs)
+    assert_not_respond_to(Sound, :midiOutGetNumDevs)
+    assert_not_respond_to(Sound, :auxGetNumDevs)
+    assert_not_respond_to(Sound, :mixerGetNumDevs)
+  end
+  def teardown
+    @wav = nil
+  end
 end

data/win32-sound.gemspec CHANGED Viewed

@@ -1,28 +1,25 @@
 require 'rubygems'
-spec = Gem::Specification.new do |gem|
-	gem.name      = 'win32-sound'
-	gem.version   = '0.4.2'
-	gem.author    = 'Daniel J. Berger'
-   gem.license   = 'Artistic 2.0'
-	gem.email     = 'djberg96@gmail.com'
-	gem.homepage  = 'http://www.rubyforge.org/projects/win32utils'
-	gem.platform  = Gem::Platform::RUBY
-	gem.summary   = 'A library for playing with sound on MS Windows.'
-	gem.test_file = 'test/test_win32_sound.rb'
-	gem.has_rdoc  = true
-   gem.files     = Dir['**/*'].reject{ |f| f.include?('CVS') }
+Gem::Specification.new do |spec|
+  spec.name      = 'win32-sound'
+  spec.version   = '0.5.0'
+  spec.author    = 'Daniel J. Berger'
+  spec.license   = 'Artistic 2.0'
+  spec.email     = 'djberg96@gmail.com'
+  spec.homepage  = 'http://www.rubyforge.org/projects/win32utils'
+  spec.summary   = 'A library for playing with sound on MS Windows.'
+  spec.test_file = 'test/test_win32_sound.rb'
+  spec.files     = Dir['**/*'] << ".gemtest"
-	gem.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST']
-	gem.rubyforge_project = 'win32utils'
+  spec.extra_rdoc_files  = ['CHANGES', 'README', 'MANIFEST']
+  spec.rubyforge_project = 'win32utils'
-   gem.add_dependency('windows-pr', '>= 1.0.6')
-	gem.description = <<-EOF
-      The win32-sound library provides an interface for playing various
-      sounds on MS Windows operating systems, including system sounds and
-      wave files, as well as querying and configuring sound related properties.
-   EOF
-end
+  spec.add_dependency('ffi')
+  spec.add_development_dependency('test-unit')
-Gem::Builder.new(spec).build
+  spec.description = <<-EOF
+    The win32-sound library provides an interface for playing various
+    sounds on MS Windows operating systems, including system sounds and
+    wave files, as well as querying and configuring sound related properties.
+  EOF
+end

metadata CHANGED Viewed

@@ -1,38 +1,59 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: win32-sound
-version: !ruby/object:Gem::Version
-  version: 0.4.2
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease:
 platform: ruby
-authors:
+authors:
 - Daniel J. Berger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-08-06 00:00:00 -06:00
-default_executable:
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: windows-pr
+date: 2012-06-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement:
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-    version:
-description: "      The win32-sound library provides an interface for playing various\n      sounds on MS Windows operating systems, including system sounds and\n      wave files, as well as querying and configuring sound related properties.\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "    The win32-sound library provides an interface for playing various\n
+  \   sounds on MS Windows operating systems, including system sounds and\n    wave
+  files, as well as querying and configuring sound related properties.\n"
 email: djberg96@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
+extra_rdoc_files:
 - CHANGES
 - README
 - MANIFEST
-files:
+files:
 - CHANGES
 - examples/example_win32_sound.rb
 - lib/win32/sound.rb
@@ -41,33 +62,31 @@ files:
 - README
 - test/test_win32_sound.rb
 - win32-sound.gemspec
-has_rdoc: true
+- .gemtest
 homepage: http://www.rubyforge.org/projects/win32utils
-licenses:
+licenses:
 - Artistic 2.0
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: "0"
-  version:
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: "0"
-  version:
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project: win32utils
-rubygems_version: 1.3.4
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: A library for playing with sound on MS Windows.
-test_files:
+test_files:
 - test/test_win32_sound.rb