rubydraw 0.1.4 → 0.1.5

data/README

@@ -1,5 +1,8 @@
 Rubydraw is a high level game/graphics library, like Gosu or Rubygame, and is written in Ruby.
-Its only dependency is ruby-sdl-ffi, which it uses to access SDL functions.
+Its only dependency is ruby-sdl-ffi, which it uses to access SDL functions. Also, thanks,
+Rubygame, for documenting your code (which, completely by coninsidence, also uses ruby-sdl-ffi),
+otherwise I wouldn't have the slightest idea on how to use the base library's undocumented code!
+You have been very helpful. :)
 –––––
 NOTE: I can't get +ruby-sdl-ffi+ (the library Rubydraw uses to access SDL) to work with +Ruby
 1.9.2+, so I don't know if it even does. If it does work, and/or you know how to make it work,

data/examples/sound_ex.rb

@@ -5,11 +5,15 @@ class MyWindow < Rubydraw::Window
   def initialize
     super(300, 300)
     @sound = Rubydraw::Sound.new("media/hooray.ogg")
+    @sound2 = Rubydraw::Sound.new("media/noise.o.ogg")
     whenever Rubydraw::Events::QuitRequest do
       close
     end
     whenever Rubydraw::Events::KeyPressed do
-      @sound.play
+      @sound.play if @sound.stopped?
+    end
+    whenever Rubydraw::Events::FocusLoss do
+      @sound2.play if @sound2.stopped?
     end
   end
 end

data/lib/rubydraw/image.rb

@@ -15,7 +15,7 @@ module Rubydraw
       if @sdl_image.pointer.null?
         # SDL couln't load the image; usually happens because it doesn't
         # exist.
-        raise Rubydraw::SDLError "Failed to load image from: '#{full_path}'"
+        raise Rubydraw::SDLError "Failed to load image: #{SDL.GetError}"
       end
     end
 
@@ -28,6 +28,7 @@ module Rubydraw
       source_rect = SDL::Rect.new([0, 0, width, height])
       blit_rect = SDL::Rect.new([position.x, position.y, window.width, window.height])
       SDL::BlitSurface(@sdl_image, source_rect, window.sdl_surface, blit_rect)
+      self
     end
 
     # Returns the image width
@@ -39,11 +40,5 @@ module Rubydraw
     def height
       @sdl_image.h
     end
-
-    # Returns the SDL image that was created in Image#initialize.
-    # Rubydraw::Window uses this to draw this Image instance.
-    def sdl_image
-      @sdl_image
-    end
   end
 end

data/lib/rubydraw/sound.rb

@@ -8,6 +8,8 @@ module Rubydraw
   # Rubydraw::Sound#play:   Plays the sound. *Note*: this method exits
   # immediatley; it doesn't wait until the sound is finished.
   class Sound
+    # Used to specify the volume (from 0 to 1) when this sound is played.
+    # Set at 1 by default
     attr_accessor(:volume)
     # Create a new sound with the given file path. Raise an SDLError if for
     # some reason it couln't load the sound.
@@ -21,25 +23,53 @@ module Rubydraw
       if @sdl_sound.pointer.null?
         raise SDLError "Failed to load sound from: #{full_path} because '#{SDL.GetError}'"
       end
+      # The default volume. Can be changed with Sound's volume arrtibute.
       @volume = 1
-      @channel = -1
+      # Allocate a new SDL channel all for this sound to use.
+      @channel = SDL::Mixer.AllocateChannels(SDL::Mixer.AllocateChannels(-1) + 1) - 1
     end
 
-    # Play this sound, and restart it if it's already playing.
+    # Play this sound, but don't restart it if it's already playing.
     def play
-      SDL::Mixer.HaltChannel(@channel)
-      @channel = SDL::Mixer.GroupAvailable(-1)
-      if @channel == -1
-        SDL::Mixer.AllocateChannel(SDL::Mixer.AllocateChannel(-1) + 1)
-        @channel = SDL::Mixer.GroupAvailible
-      end
       SDL::Mixer.Volume(@channel, (SDL::Mixer::MAX_VOLUME * @volume).to_i)
       result = SDL::Mixer.PlayChannelTimed(@channel, @sdl_sound, 0, -1)
       raise(SDLError, "Failed to play sound: #{SDL.GetError}") if result == -1
       self
+    end
+
+    # Pause the sound so it can be resumed later.
+    def pause
+      SDL::Mixer.Pause(@channel)
+      self
+    end
+
+    # Stop the sound. Unlike pause because Sound#play will start from the
+    # beginning afterward.
+    def stop
+      SDL::Mixer.HaltChannel(@channel)
+      self
+    end
+
+    # Resume the sound from where it was paused.
+    def resume
+      SDL::Mixer.Resume(@channel)
+      self
+    end
+
+
+    # Returns whether or not this sound is paused.
+    def paused?
+      SDL::Mixer.Paused(@channel) == 1
+    end
+
+    # Returns whether or not this sound is playing.
+    def playing?
+      (SDL::Mixer.Playing(@channel) == 1) and not paused?
+    end
 
-      #@playing = true
-      #SDL::Mixer::FadeInMusicPos(@sdl_sound, 0, 0, 0)
+    # Returns whether or not this sound is stopped.
+    def stopped?
+      not playing?
     end
   end
 end

data/lib/rubydraw.rb

@@ -14,7 +14,10 @@ files = %w[
 files.each {|f| require("rubydraw/" + f)}
 
 # Rubydraw is a high level game/graphics library, like Gosu or Rubygame, and is written completely
-# in Ruby. Its only dependency is ruby-sdl-ffi, which it uses to access SDL functions.
+# in Ruby. Its only dependency is ruby-sdl-ffi, which it uses to access SDL functions. Also, thanks,
+# Rubygame, for documenting your code (which, completely by coninsidence, also uses ruby-sdl-ffi),
+# otherwise I wouldn't have the slightest idea on how to use the base library's undocumented code!
+# You have been very helpful. :)
 #
 # NOTE: I can't get +ruby-sdl-ffi+ (the library Rubydraw uses to access SDL) to work with +Ruby
 # 1.9.2,+ so I don't know if it even does. If it does work, and/or you know how to make it work,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubydraw
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - J. Wostenberg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 -07:00
+date: 2011-11-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ files:
 - examples/sound_ex.rb
 - examples/media/bug.png
 - examples/media/hooray.ogg
+- examples/media/noise.ogg
 has_rdoc: true
 homepage: https://github.com/awostenberg/rubydraw
 licenses: []