rubygame 2.5.3 → 2.6.0

data/lib/rubygame/color.rb

@@ -17,14 +17,17 @@
 #	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #++
 
-require 'rubygame/color/models/base'
-require 'rubygame/color/models/rgb'
-require 'rubygame/color/models/hsv'
-require 'rubygame/color/models/hsl'
 
-require 'rubygame/color/palettes/palette'
-require 'rubygame/color/palettes/x11'
-require 'rubygame/color/palettes/css'
+
+%w{  base rgb hsv hsl  }.each do |f|
+  require( File.join( File.dirname(__FILE__), "color", "models", f ) )
+end
+
+%w{  palette x11 css  }.each do |f|
+  require( File.join( File.dirname(__FILE__), "color", "palettes", f ) )
+end
+
+
 
 module Rubygame
 
@@ -74,6 +77,36 @@ module Rubygame
 			GLOBAL[name] = color
 		end
 		
+
+    # For use by Rubygame methods only:
+
+    # Convert a color name (string or symbol), Color instance, or Array
+    # to a color array.
+    def self.convert_color( color ) # :nodoc:
+      color = 
+        if color.kind_of?(Symbol) or color.kind_of?(String)
+          Rubygame::Color[color].to_sdl_rgba_ary
+        elsif color.respond_to? :to_sdl_rgba_ary
+          color.to_sdl_rgba_ary
+        elsif color.respond_to? :to_ary
+          color.to_ary
+        else
+          raise TypeError, "unsupported type #{color.class} for color"
+        end
+
+      unless color.size.between?(3,4) and color.all?{|n| n.kind_of? Numeric}
+        raise TypeError, "invalid color: #{color.inspect}"
+      end
+
+      return color
+    end
+
+    def self.make_sdl_rgba( color ) # :nodoc:
+      r,g,b,a = convert_color(color).collect!{ |c| c.to_i }[0,4]
+      a = 255 if a.nil?
+      [r,g,b,a]
+    end
+
 	end
 end
 

data/lib/rubygame/color/models/hsl.rb

@@ -17,7 +17,7 @@
 #	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #++
 
-require 'rubygame/color/models/base'
+
 
 module Rubygame
 	module Color

data/lib/rubygame/color/models/hsv.rb

@@ -17,7 +17,7 @@
 #	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #++
 
-require 'rubygame/color/models/base'
+
 
 module Rubygame
 	module Color

data/lib/rubygame/color/models/rgb.rb

@@ -17,7 +17,7 @@
 #	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #++
 
-require 'rubygame/color/models/base'
+
 
 module Rubygame
 	module Color

data/lib/rubygame/color/palettes/css.rb

@@ -17,9 +17,7 @@
 #	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #++
 
-require 'rubygame/color'
-require 'rubygame/color/palettes/palette'
-require 'rubygame/color/palettes/x11'
+
 
 module Rubygame
 	module Color

data/lib/rubygame/color/palettes/x11.rb

@@ -17,8 +17,7 @@
 #	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #++
 
-require 'rubygame/color'
-require 'rubygame/color/palettes/palette'
+
 
 module Rubygame
 	module Color

data/lib/rubygame/constants.rb

@@ -19,6 +19,303 @@
 
 module Rubygame
 
+
+  # Event constants
+  NOEVENT         = SDL::NOEVENT
+  ACTIVEEVENT     = SDL::ACTIVEEVENT
+  KEYDOWN         = SDL::KEYDOWN
+  KEYUP           = SDL::KEYUP
+  MOUSEMOTION     = SDL::MOUSEMOTION
+  MOUSEBUTTONDOWN = SDL::MOUSEBUTTONDOWN
+  MOUSEBUTTONUP   = SDL::MOUSEBUTTONUP
+  JOYAXISMOTION   = SDL::JOYAXISMOTION
+  JOYBALLMOTION   = SDL::JOYBALLMOTION
+  JOYHATMOTION    = SDL::JOYHATMOTION
+  JOYBUTTONDOWN   = SDL::JOYBUTTONDOWN
+  JOYBUTTONUP     = SDL::JOYBUTTONUP
+  QUIT            = SDL::QUIT
+  SYSWMEVENT      = SDL::SYSWMEVENT
+  VIDEORESIZE     = SDL::VIDEORESIZE
+  VIDEOEXPOSE     = SDL::VIDEOEXPOSE
+  USEREVENT       = SDL::USEREVENT
+
+
+  # Joystick constants  
+  HAT_CENTERED  = SDL::HAT_CENTERED
+  HAT_UP        = SDL::HAT_UP
+  HAT_RIGHT     = SDL::HAT_RIGHT
+  HAT_DOWN      = SDL::HAT_DOWN
+  HAT_LEFT      = SDL::HAT_LEFT
+  HAT_RIGHTUP   = SDL::HAT_RIGHTUP
+  HAT_RIGHTDOWN = SDL::HAT_RIGHTDOWN
+  HAT_LEFTUP    = SDL::HAT_LEFTUP
+  HAT_LEFTDOWN  = SDL::HAT_LEFTDOWN
+
+  
+  # Mouse constants
+  MOUSE_LEFT   = SDL::BUTTON_LEFT
+  MOUSE_MIDDLE = SDL::BUTTON_MIDDLE
+  MOUSE_RIGHT  = SDL::BUTTON_RIGHT
+  MOUSE_LMASK  = SDL::BUTTON_LMASK
+  MOUSE_MMASK  = SDL::BUTTON_MMASK
+  MOUSE_RMASK  = SDL::BUTTON_RMASK
+
+
+  # ASCII key symbols
+  K_UNKNOWN      = SDL::K_UNKNOWN
+  K_FIRST        = SDL::K_FIRST
+  K_BACKSPACE    = SDL::K_BACKSPACE
+  K_TAB          = SDL::K_TAB
+  K_CLEAR        = SDL::K_CLEAR
+  K_RETURN       = SDL::K_RETURN
+  K_PAUSE        = SDL::K_PAUSE
+  K_ESCAPE       = SDL::K_ESCAPE
+  K_SPACE        = SDL::K_SPACE
+  K_EXCLAIM      = SDL::K_EXCLAIM
+  K_QUOTEDBL     = SDL::K_QUOTEDBL
+  K_HASH         = SDL::K_HASH
+  K_DOLLAR       = SDL::K_DOLLAR
+  K_AMPERSAND    = SDL::K_AMPERSAND
+  K_QUOTE        = SDL::K_QUOTE
+  K_LEFTPAREN    = SDL::K_LEFTPAREN
+  K_RIGHTPAREN   = SDL::K_RIGHTPAREN
+  K_ASTERISK     = SDL::K_ASTERISK
+  K_PLUS         = SDL::K_PLUS
+  K_COMMA        = SDL::K_COMMA
+  K_MINUS        = SDL::K_MINUS
+  K_PERIOD       = SDL::K_PERIOD
+  K_SLASH        = SDL::K_SLASH
+  K_0            = SDL::K_0
+  K_1            = SDL::K_1
+  K_2            = SDL::K_2
+  K_3            = SDL::K_3
+  K_4            = SDL::K_4
+  K_5            = SDL::K_5
+  K_6            = SDL::K_6
+  K_7            = SDL::K_7
+  K_8            = SDL::K_8
+  K_9            = SDL::K_9
+  K_COLON        = SDL::K_COLON
+  K_SEMICOLON    = SDL::K_SEMICOLON
+  K_LESS         = SDL::K_LESS
+  K_EQUALS       = SDL::K_EQUALS
+  K_GREATER      = SDL::K_GREATER
+  K_QUESTION     = SDL::K_QUESTION
+  K_AT           = SDL::K_AT
+  K_LEFTBRACKET  = SDL::K_LEFTBRACKET
+  K_BACKSLASH    = SDL::K_BACKSLASH
+  K_RIGHTBRACKET = SDL::K_RIGHTBRACKET
+  K_CARET        = SDL::K_CARET
+  K_UNDERSCORE   = SDL::K_UNDERSCORE
+  K_BACKQUOTE    = SDL::K_BACKQUOTE
+  K_A            = SDL::K_a
+  K_B            = SDL::K_b
+  K_C            = SDL::K_c
+  K_D            = SDL::K_d
+  K_E            = SDL::K_e
+  K_F            = SDL::K_f
+  K_G            = SDL::K_g
+  K_H            = SDL::K_h
+  K_I            = SDL::K_i
+  K_J            = SDL::K_j
+  K_K            = SDL::K_k
+  K_L            = SDL::K_l
+  K_M            = SDL::K_m
+  K_N            = SDL::K_n
+  K_O            = SDL::K_o
+  K_P            = SDL::K_p
+  K_Q            = SDL::K_q
+  K_R            = SDL::K_r
+  K_S            = SDL::K_s
+  K_T            = SDL::K_t
+  K_U            = SDL::K_u
+  K_V            = SDL::K_v
+  K_W            = SDL::K_w
+  K_X            = SDL::K_x
+  K_Y            = SDL::K_y
+  K_Z            = SDL::K_z
+  K_DELETE       = SDL::K_DELETE
+
+  
+  # International keyboard symbols
+  K_WORLD_0  = SDL::K_WORLD_0
+  K_WORLD_1  = SDL::K_WORLD_1
+  K_WORLD_2  = SDL::K_WORLD_2
+  K_WORLD_3  = SDL::K_WORLD_3
+  K_WORLD_4  = SDL::K_WORLD_4
+  K_WORLD_5  = SDL::K_WORLD_5
+  K_WORLD_6  = SDL::K_WORLD_6
+  K_WORLD_7  = SDL::K_WORLD_7
+  K_WORLD_8  = SDL::K_WORLD_8
+  K_WORLD_9  = SDL::K_WORLD_9
+  K_WORLD_10 = SDL::K_WORLD_10
+  K_WORLD_11 = SDL::K_WORLD_11
+  K_WORLD_12 = SDL::K_WORLD_12
+  K_WORLD_13 = SDL::K_WORLD_13
+  K_WORLD_14 = SDL::K_WORLD_14
+  K_WORLD_15 = SDL::K_WORLD_15
+  K_WORLD_16 = SDL::K_WORLD_16
+  K_WORLD_17 = SDL::K_WORLD_17
+  K_WORLD_18 = SDL::K_WORLD_18
+  K_WORLD_19 = SDL::K_WORLD_19
+  K_WORLD_20 = SDL::K_WORLD_20
+  K_WORLD_21 = SDL::K_WORLD_21
+  K_WORLD_22 = SDL::K_WORLD_22
+  K_WORLD_23 = SDL::K_WORLD_23
+  K_WORLD_24 = SDL::K_WORLD_24
+  K_WORLD_25 = SDL::K_WORLD_25
+  K_WORLD_26 = SDL::K_WORLD_26
+  K_WORLD_27 = SDL::K_WORLD_27
+  K_WORLD_28 = SDL::K_WORLD_28
+  K_WORLD_29 = SDL::K_WORLD_29
+  K_WORLD_30 = SDL::K_WORLD_30
+  K_WORLD_31 = SDL::K_WORLD_31
+  K_WORLD_32 = SDL::K_WORLD_32
+  K_WORLD_33 = SDL::K_WORLD_33
+  K_WORLD_34 = SDL::K_WORLD_34
+  K_WORLD_35 = SDL::K_WORLD_35
+  K_WORLD_36 = SDL::K_WORLD_36
+  K_WORLD_37 = SDL::K_WORLD_37
+  K_WORLD_38 = SDL::K_WORLD_38
+  K_WORLD_39 = SDL::K_WORLD_39
+  K_WORLD_40 = SDL::K_WORLD_40
+  K_WORLD_41 = SDL::K_WORLD_41
+  K_WORLD_42 = SDL::K_WORLD_42
+  K_WORLD_43 = SDL::K_WORLD_43
+  K_WORLD_44 = SDL::K_WORLD_44
+  K_WORLD_45 = SDL::K_WORLD_45
+  K_WORLD_46 = SDL::K_WORLD_46
+  K_WORLD_47 = SDL::K_WORLD_47
+  K_WORLD_48 = SDL::K_WORLD_48
+  K_WORLD_49 = SDL::K_WORLD_49
+  K_WORLD_50 = SDL::K_WORLD_50
+  K_WORLD_51 = SDL::K_WORLD_51
+  K_WORLD_52 = SDL::K_WORLD_52
+  K_WORLD_53 = SDL::K_WORLD_53
+  K_WORLD_54 = SDL::K_WORLD_54
+  K_WORLD_55 = SDL::K_WORLD_55
+  K_WORLD_56 = SDL::K_WORLD_56
+  K_WORLD_57 = SDL::K_WORLD_57
+  K_WORLD_58 = SDL::K_WORLD_58
+  K_WORLD_59 = SDL::K_WORLD_59
+  K_WORLD_60 = SDL::K_WORLD_60
+  K_WORLD_61 = SDL::K_WORLD_61
+  K_WORLD_62 = SDL::K_WORLD_62
+  K_WORLD_63 = SDL::K_WORLD_63
+  K_WORLD_64 = SDL::K_WORLD_64
+  K_WORLD_65 = SDL::K_WORLD_65
+  K_WORLD_66 = SDL::K_WORLD_66
+  K_WORLD_67 = SDL::K_WORLD_67
+  K_WORLD_68 = SDL::K_WORLD_68
+  K_WORLD_69 = SDL::K_WORLD_69
+  K_WORLD_70 = SDL::K_WORLD_70
+  K_WORLD_71 = SDL::K_WORLD_71
+  K_WORLD_72 = SDL::K_WORLD_72
+  K_WORLD_73 = SDL::K_WORLD_73
+  K_WORLD_74 = SDL::K_WORLD_74
+  K_WORLD_75 = SDL::K_WORLD_75
+  K_WORLD_76 = SDL::K_WORLD_76
+  K_WORLD_77 = SDL::K_WORLD_77
+  K_WORLD_78 = SDL::K_WORLD_78
+  K_WORLD_79 = SDL::K_WORLD_79
+  K_WORLD_80 = SDL::K_WORLD_80
+  K_WORLD_81 = SDL::K_WORLD_81
+  K_WORLD_82 = SDL::K_WORLD_82
+  K_WORLD_83 = SDL::K_WORLD_83
+  K_WORLD_84 = SDL::K_WORLD_84
+  K_WORLD_85 = SDL::K_WORLD_85
+  K_WORLD_86 = SDL::K_WORLD_86
+  K_WORLD_87 = SDL::K_WORLD_87
+  K_WORLD_88 = SDL::K_WORLD_88
+  K_WORLD_89 = SDL::K_WORLD_89
+  K_WORLD_90 = SDL::K_WORLD_90
+  K_WORLD_91 = SDL::K_WORLD_91
+  K_WORLD_92 = SDL::K_WORLD_92
+  K_WORLD_93 = SDL::K_WORLD_93
+  K_WORLD_94 = SDL::K_WORLD_94
+  K_WORLD_95 = SDL::K_WORLD_95
+
+  
+  # Numeric keypad symbols
+  K_KP0         = SDL::K_KP0
+  K_KP1         = SDL::K_KP1
+  K_KP2         = SDL::K_KP2
+  K_KP3         = SDL::K_KP3
+  K_KP4         = SDL::K_KP4
+  K_KP5         = SDL::K_KP5
+  K_KP6         = SDL::K_KP6
+  K_KP7         = SDL::K_KP7
+  K_KP8         = SDL::K_KP8
+  K_KP9         = SDL::K_KP9
+  K_KP_PERIOD   = SDL::K_KP_PERIOD
+  K_KP_DIVIDE   = SDL::K_KP_DIVIDE
+  K_KP_MULTIPLY = SDL::K_KP_MULTIPLY
+  K_KP_MINUS    = SDL::K_KP_MINUS
+  K_KP_PLUS     = SDL::K_KP_PLUS
+  K_KP_ENTER    = SDL::K_KP_ENTER
+  K_KP_EQUALS   = SDL::K_KP_EQUALS
+
+  
+  # Arrows + Home/End pad
+  K_UP       = SDL::K_UP
+  K_DOWN     = SDL::K_DOWN
+  K_RIGHT    = SDL::K_RIGHT
+  K_LEFT     = SDL::K_LEFT
+  K_INSERT   = SDL::K_INSERT
+  K_HOME     = SDL::K_HOME
+  K_END      = SDL::K_END
+  K_PAGEUP   = SDL::K_PAGEUP
+  K_PAGEDOWN = SDL::K_PAGEDOWN
+
+  
+  # Function keys
+  K_F1  = SDL::K_F1
+  K_F2  = SDL::K_F2
+  K_F3  = SDL::K_F3
+  K_F4  = SDL::K_F4
+  K_F5  = SDL::K_F5
+  K_F6  = SDL::K_F6
+  K_F7  = SDL::K_F7
+  K_F8  = SDL::K_F8
+  K_F9  = SDL::K_F9
+  K_F10 = SDL::K_F10
+  K_F11 = SDL::K_F11
+  K_F12 = SDL::K_F12
+  K_F13 = SDL::K_F13
+  K_F14 = SDL::K_F14
+  K_F15 = SDL::K_F15
+
+  
+  # Key state modifier keys
+  K_NUMLOCK   = SDL::K_NUMLOCK
+  K_CAPSLOCK  = SDL::K_CAPSLOCK
+  K_SCROLLOCK = SDL::K_SCROLLOCK
+  K_RSHIFT    = SDL::K_RSHIFT
+  K_LSHIFT    = SDL::K_LSHIFT
+  K_RCTRL     = SDL::K_RCTRL
+  K_LCTRL     = SDL::K_LCTRL
+  K_RALT      = SDL::K_RALT
+  K_LALT      = SDL::K_LALT
+  K_RMETA     = SDL::K_RMETA
+  K_LMETA     = SDL::K_LMETA
+  K_LSUPER    = SDL::K_LSUPER
+  K_RSUPER    = SDL::K_RSUPER
+  K_MODE      = SDL::K_MODE
+
+  
+  # Miscellaneous keys
+  K_HELP   = SDL::K_HELP
+  K_PRINT  = SDL::K_PRINT
+  K_SYSREQ = SDL::K_SYSREQ
+  K_BREAK  = SDL::K_BREAK
+  K_MENU   = SDL::K_MENU
+  K_POWER  = SDL::K_POWER
+  K_EURO   = SDL::K_EURO
+  K_LAST   = SDL::K_LAST
+
+
+
+
 	module Mouse
 		# Hash to translate mouse button sym to string
 		MOUSE2STR = {

data/lib/rubygame/deprecated_mixer.rb

@@ -0,0 +1,555 @@
+#--
+#	Rubygame -- Ruby code and bindings to SDL to facilitate game creation
+#	Copyright (C) 2004-2009  John Croisant
+#
+#	This library is free software; you can redistribute it and/or
+#	modify it under the terms of the GNU Lesser General Public
+#	License as published by the Free Software Foundation; either
+#	version 2.1 of the License, or (at your option) any later version.
+#
+#	This library is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#	Lesser General Public License for more details.
+#
+#	You should have received a copy of the GNU Lesser General Public
+#	License along with this library; if not, write to the Free Software
+#	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#++
+
+
+#  **NOTE:** This module is DEPRECATED and will be removed in Rubygame 3.0.
+#  Please use Rubygame.open_audio, Rubygame.close_audio, Rubygame::Sound,
+#  and Rubygame::Music instead.
+#
+#  The Mixer module provides access to the SDL_mixer library for audio
+#  playback and mixing. This module is still very basic, but it is
+#  good enough to load and play WAV files on multiple mix channels.
+#
+#  See the Sample class for loading audio files.
+#  See the Music class for streaming music from a file.
+#
+module Rubygame::Mixer
+
+  AUDIO_U8     = SDL::AUDIO_U8
+  AUDIO_S8     = SDL::AUDIO_S8
+  AUDIO_U16SYS = SDL::AUDIO_U16SYS
+  AUDIO_S16SYS = SDL::AUDIO_S16SYS
+
+
+  #  **NOTE:** This method is DEPRECATED and will be removed in
+  #  Rubygame 3.0. Please use the Rubygame.open_audio instead.
+  #
+  #  Initializes the audio device. You must call this before using the other
+  #  mixer functions. See also #close_audio().
+  #
+  #  Returns nil. May raise an SDLError if initialization fails.
+  #  
+  #  This method takes these arguments:
+  #
+  #  frequency::  output sample rate in audio samples per second (Hz).
+  #               Affects the quality of the sound output, at the
+  #               expense of CPU usage. If nil, the default (22050) is
+  #               used. 22050 is recommended for most games. For
+  #               reference, 44100 is CD quality.
+  #               
+  #               The larger the value, the more processing required.
+  #
+  #  format::     output sample format. If nil, the default recommended
+  #               system format is used. It's _highly_ recommended you
+  #               leave this nil!
+  #
+  #               But if you're feeling reckless, you can use one of these
+  #               constants located in the Rubygame::Mixer module:
+  #
+  #               AUDIO_U16SYS:: unsigned 16-bit samples.
+  #               AUDIO_S16SYS:: signed 16-bit samples.
+  #               AUDIO_U8::     unsigned 8-bit samples.
+  #               AUDIO_S8::     signed 8-bit samples.
+  #
+  #  channels::   output sound channels. Use 2 for stereo, 1 for mono.
+  #               If nil, the default (2) is used.
+  #               This option is not related to mixing channels.
+  #
+  #  buffer::     size of the sound buffer, in bytes. If nil, the default
+  #               (1024) is used. Larger values have more delay before
+  #               playing a sound, but require less CPU usage (and
+  #               have less skipping on slow systems).
+  #
+  #
+  def self.open_audio( frequency=nil, format=nil, channels=nil, buffer=nil )
+
+    Rubygame.deprecated( "Rubygame::Mixer", "3.0" )
+
+    frequency = (frequency or 22050)
+    format    = (format    or AUDIO_U16SYS)
+    channels  = (channels  or 2)
+    buffer    = (buffer    or 1024)
+
+    result = SDL::Mixer.OpenAudio(frequency, format, channels, buffer)
+
+    if( result < 0 )
+      raise( Rubygame::SDLError,
+             "Error initializing SDL_mixer: #{SDL.GetError()}" )
+    end
+
+    return nil
+  end
+
+
+  #  **NOTE:** This method is DEPRECATED and will be removed in
+  #  Rubygame 3.0. Please use the Rubygame.close_audio instead.
+  #
+  #  Close the audio device being used by the mixer. You should not use any
+  #  mixer functions after this function, unless you use #open_audio() to
+  #  re-open the audio device. See also #open_audio().
+  #
+  #  Returns nil.
+  #
+  def self.close_audio()
+    Rubygame.deprecated( "Rubygame::Mixer", "3.0" )
+    SDL::Mixer.CloseAudio()
+    return nil
+  end
+
+
+  #  **NOTE:** This method is DEPRECATED and will be removed in
+  #  Rubygame 3.0. Please use the Rubygame::Sound class instead.
+  #
+  #  Returns the number of mixing channels currently allocated.
+  #  See also #mix_channels=
+  #
+  def self.mix_channels
+    Rubygame.deprecated( "Rubygame::Mixer", "3.0" )
+    return SDL::Mixer.AllocateChannels(-1)
+  end
+
+
+  #  **NOTE:** This method is DEPRECATED and will be removed in
+  #  Rubygame 3.0. Please use the Rubygame::Sound class instead.
+  #
+  #  Set the number of mixer channels, allocating or deallocating channels as
+  #  needed. This can be called many times, even during audio playback. If this
+  #  call reduces the number of channels allocated, the excess channels will
+  #  be stopped automatically. See also #mix_channels
+  #
+  #  Returns the number of mixing channels allocated.
+  #
+  #  Note that 8 mixing channels are allocated when #open_audio is called.
+  #  This method only needs to be called if you want a different number (either
+  #  greater or fewer) of mixing channels.
+  #  
+  #  This method takes this argument:
+  #  num_channels::  desired number of mixing channels, an integer. 
+  #                  Negative values will cause this method to behave as
+  #                  #mix_channels, returning the number of channels
+  #                  currently allocated, without changing it.
+  #
+  def self.mix_channels=( num_channels )
+    Rubygame.deprecated( "Rubygame::Mixer", "3.0" )
+    return SDL::Mixer.AllocateChannels( num_channels )
+  end
+
+
+  #  **NOTE:** This method is DEPRECATED and will be removed in
+  #  Rubygame 3.0. Please use the Rubygame.audio_driver instead.
+  #
+  #  Returns the name of the audio driver that SDL is using.
+  #
+  #  May raise SDLError if initialization fails.
+  #
+  def self.driver_name
+    Rubygame.deprecated( "Rubygame::Mixer", "3.0" )
+
+    driver = SDL.AudioDriverName()
+
+    if driver.nil?
+      raise( Rubygame::SDLError,
+             "Error fetching audio driver name: #{SDL.GetError()}" )
+    end
+
+    return driver
+  end
+
+
+  #  **NOTE:** This method is DEPRECATED and will be removed in
+  #  Rubygame 3.0. Please use the Rubygame::Sound class instead.
+  #
+  #  Play an audio Sample on a mixing channel, repeating a certain number
+  #  of extra times. Returns the number of the channel that the sample
+  #  is being played on.
+  #
+  #  Raises SDLError if something goes wrong.
+  #  
+  #  This method takes these arguments:
+  #  sample::      what Sample to play
+  #  channel_num:: which mixing channel to play the sample on.
+  #                Use -1 to play on the first unreserved channel.
+  #  repeats::     how many extra times to repeat the sample.
+  #                Can be -1 to repeat forever until it is stopped.
+  #
+  def self.play( sample, channel_num, repeats )
+    Rubygame.deprecated( "Rubygame::Mixer", "3.0" )
+    
+    result = SDL::Mixer.PlayChannel( channel_num, sample.struct, repeats )
+
+    if( result < 0 )
+      raise( Rubygame::SDLError,
+             "Error playing sample on channel %d: %s"%
+             [channel, SDL.GetError()] )
+    end
+
+    return result
+  end
+
+
+  #  Stop playback of a playing or paused mixing channel.
+  #  Unlike #pause, playback cannot be resumed from the current point.
+  #  See also #play.
+  # 
+  def self.stop( channel_num )
+    Rubygame.deprecated( "Rubygame::Mixer", "3.0" )
+    SDL::Mixer.HaltChannel( channel_num )
+    return nil
+  end
+
+
+  #  Pause playback of a currently-playing mixing channel.
+  #  Playback can be resumed from the current point with #resume.
+  #  See also #stop.
+  #
+  def self.pause( channel_num )
+    Rubygame.deprecated( "Rubygame::Mixer", "3.0" )
+    SDL::Mixer.Pause( channel_num )
+    return nil
+  end
+
+
+  #  Resume playback of a paused mixing channel. The channel must have
+  #  been paused (via the #pause method) for this to have any effect.
+  #  Playback will resume from the point where the channel was paused.
+  #
+  def self.resume( channel_num )
+    Rubygame.deprecated( "Rubygame::Mixer", "3.0" )
+    SDL::Mixer.Resume( channel_num )
+    return nil
+  end
+
+end
+
+
+
+#  **NOTE:** This class is DEPRECATED and will be removed in Rubygame 3.0.
+#  Please use the Rubygame::Sound class instead.
+#
+#  Stores audio data to play with Rubygame::Mixer.play
+#
+class Rubygame::Mixer::Sample
+
+  #  **NOTE:** Rubygame::Mixer::Sample is DEPRECATED and will be removed in
+  #  Rubygame 3.0. Please use the Rubygame::Sound class instead.
+  #
+  #  Load an audio sample (a "chunk", to use SDL_mixer's term) from a file.
+  #  Only WAV files are supported at this time.
+  #
+  #  Raises SDLError if the sample could not be loaded.
+  #
+  def self.load_audio( filename )
+    Rubygame.deprecated( "Rubygame::Mixer::Sample", "3.0" )
+
+    chunk = SDL::Mixer.LoadWAV( filename )
+
+    if( chunk.pointer.null? )
+      raise( Rubygame::SDLError,
+             "Error loading audio Sample from file `%s': %s"%
+             [filename, SDL.GetError()] )
+    end
+
+    return new( chunk )
+  end
+
+
+  attr_reader :struct # :nodoc:
+  protected :struct
+
+
+  # call-seq: new
+  def initialize( struct=nil )
+    @struct = struct
+  end
+
+end
+
+
+
+#  **NOTE:** This class is DEPRECATED and will be removed in Rubygame 3.0.
+#  Please use the Rubygame::Music class instead.
+#
+#  The Music class is used for playing music from a file. It supports
+#  WAVE, MOD, MIDI, OGG, and MP3 files. There are two important differences
+#  between Music and Sample:
+#
+#  1. Music streams the music from disk, which means it can start faster and
+#     uses less memory than Sample, which loads the entire file into memory.
+#     This is especially important for music files, which are often several
+#     minutes long.
+#  2. There can only be one Music instance playing at once, while there can
+#     be many Samples playing at once. If you play a second Music while one
+#     is already playing, the first one will be stopped. See #play.
+#
+class Rubygame::Mixer::Music
+
+  # #  Sets the external command used to play music. 
+  # #
+  # #  Raises SDLError if something goes wrong.
+  # #
+  # #  This method takes these arguments:
+  # #  command::     what command to use to play the music. 
+  # #
+  # def set_command( command )
+  #   Rubygame.deprecated( "Rubygame::Mixer::Music", "3.0" )
+  # 
+  #   result = SDL::Mixer.SetMusicCMD( command )
+  # 
+  #   if( result < 0 )
+  #     raise( Rubygame::SDLError,
+  #            "Error setting music player command to `%s': %s"%
+  #            [command, SDL.GetError()] )
+  #   end
+  #
+  #   return result
+  # end
+
+
+  #  **NOTE:** Rubygame::Mixer::Music is DEPRECATED and will be removed
+  #  in Rubygame 3.0. Please use the Rubygame::Music class instead.
+  #
+  #  Load music from a file. Supports WAV, MOD, MIDI, OGG, and MP3 formats.
+  #
+  #  Raises SDLError if the music could not be loaded.
+  #
+  def self.load_audio
+    Rubygame.deprecated( "Rubygame::Mixer::Music", "3.0" )
+
+    music = SDL::Mixer.LoadMUS( filename )
+
+    if( music.pointer.null? )
+      raise( Rubygame::SDLError,
+             "Error loading audio music from file `%s': %s"%
+             [filename, SDL.GetError()] )
+    end
+
+    return new( music )
+  end
+
+
+  attr_reader :struct # :nodoc:
+  protected :struct
+
+
+  # call-seq: new
+  def initialize( struct=nil )
+    @struct = struct
+  end
+
+
+  #  Play music, repeating a certain number of extra times. If
+  #  any music was already playing, that music will be stopped
+  #  first, and this music will start.
+  #
+  #  Raises SDLError if something goes wrong.
+  #  
+  #  This method takes these arguments:
+  #  repeats::     how many extra times to play the music.
+  #                Can be -1 to repeat forever until it is stopped.
+  #
+  def play( repeats=0 )
+    # Adjust so repeats means the same as it does for Samples
+    repeats += 1 if repeats > -1
+
+    result = SDL::Mixer.PlayMusic( @struct, repeats )
+
+    if( result < 0 )
+      raise Rubygame::SDLError, "Error playing music: #{SDL.GetError()}"
+    end
+
+    return self
+  end
+
+
+  #  Stop playback of music. 
+  #  See also #play
+  #
+  def stop
+    SDL::Mixer::HaltMusic()
+    return self
+  end
+
+
+  #  Pause playback of the playing music. You can later #resume
+  #  playback from the point where you paused.
+  #  Safe to use on already-paused music.
+  #  See also #play_music.
+  #
+  def pause
+    SDL::Mixer::PauseMusic()
+    return self
+  end
+
+
+  #  Resume playback of paused music from the point it was paused.
+  #  Safe to use on already-playing music.
+  #  See also #play.
+  #
+  def resume
+    SDL::Mixer::ResumeMusic()
+    return self
+  end
+
+
+  #  Rewind the music to the start. This is safe to use on stopped,
+  #  paused, and playing music. Only works for MOD, OGG, MP3, and
+  #  MIDI (but not WAV).
+  # 
+  def rewind
+    SDL::Mixer::RewindMusic()
+    return self
+  end
+
+
+  #  Jump to a certain time in the music.
+  #  Only works when music is playing or paused (but not stopped).
+  #  Only works for OGG and MP3 files.
+  #
+  #  Raises SDLError if something goes wrong, or if the music type does not
+  #  support setting the position.
+  #
+  #  time::  Time to jump to, in seconds from the beginning.
+  #
+  def jump( time )
+    case SDL::Mixer.GetMusicType(nil)
+    when SDL::Mixer::MUS_OGG, SDL::Mixer::MUS_MP3
+
+      SDL::Mixer::RewindMusic() # Needed for MP3, and OK with OGG
+
+      result = SDL::Mixer.SetmusicPosition( time )
+      
+      if( result < 0 )
+        raise( Rubygame::SDLError,
+               "Error jumping to time in music: #{SDL.GetError()}" )
+      end
+
+    when SDL::Mixer::MUS_NONE
+      raise Rubygame::SDLError, "Cannot jump when no music is playing."
+    else
+      raise Rubygame::SDLError, "Music type does not support jumping."
+    end
+  end
+
+
+  #  Returns true if the music is currently playing.
+  #
+  def playing?
+    return SDL::Mixer::PlayingMusic()
+  end
+
+
+  #  Returns true if the music is currently paused.
+  #
+  def paused?
+    return SDL::Mixer::PausedMusic()
+  end
+
+
+  #  Returns the current volume level of the music.
+  #  0.0 is total silence, 1.0 is maximum volume.
+  #
+  def volume
+    return (SDL::Mixer::VolumeMusic(-1).to_f / SDL::Mixer::MAX_VOLUME)
+  end
+
+
+  #  Sets the volume level of the music.
+  #  0.0 is total silence, 1.0 is maximum volume.
+  #
+  def volume=( new_volume )
+    SDL::Mixer.VolumeMusic( (volume * SDL::Mixer::MAX_VOLUME).to_i )
+    return new_volume
+  end
+
+
+  #  Play the music, fading in and repeating a certain number of times.
+  #  See also #play.
+  #
+  #  Raises SDLError if something goes wrong.
+  #  
+  #  fade_time::  Time in seconds for the fade-in effect to complete.
+  #  repeats::    Number of extra times to play through the music.
+  #               -1 plays the music forever until it is stopped.
+  #               Defaults to 0, play only once (no repeats).
+  #  start::      Time to start from, in seconds since the beginning.
+  #               Defaults to 0, the beginning of the song.
+  #               Non-zero values only work for OGG and MP3; other
+  #               music types will raise SDLError.
+  #
+  def fade_in( fade_time, repeats=0, start=0 )
+    fade_time *= 1000 # convert to milliseconds
+    repeats = (repeats or 0)
+    start   = (start   or 0)
+
+    # Adjust so repeats means the same as it does for Samples
+    repeats += 1 if repeats > -1
+
+    result =
+      if( start == 0 )
+        SDL::Mixer.FadeInMusic( @struct, repeats, fade_time )
+      else
+        SDL::Mixer.FadeInMusicPos( @struct, repeats, fade_time, start )
+      end
+
+    if( result < 0 )
+      raise Rubygame::SDLError, "Error fading in music: #{SDL.GetError()}"
+    end
+
+    return self
+  end
+
+
+  #  Gradually fade the music to silence over +fade_length+ seconds.
+  #  After the fade is complete, the music will be automatically stopped.
+  #
+  #  Raises SDLError if something goes wrong.
+  #
+  #  fade_time::    Time until the music is totally silent, in seconds.
+  #
+  def fade_out( fade_time )
+    fade_time *= 1000 # convert to milliseconds
+
+    result = SDL::Mixer.FadeOutMusic( fade_time )
+
+    if( result < 0 )
+      raise Rubygame::SDLError, "Error fading out music: #{SDL.GetError()}"
+    end
+  end
+
+
+  #  True if the music is fading in or out (or either). You can
+  #  specify +direction+ as :in/:out to check only fading in/out;
+  #  otherwise, it will return true if it's fading either way.
+  #
+  #  direction::  :in, :out, or nil if you don't care which.
+  #  Returns::    true if the music is fading in the given direction.
+  #
+  def fading?( direction=nil )
+    case direction
+    when :in
+      return (SDL::Mixer.FadingMusic() == SDL::Mixer::FADING_IN)
+    when :out
+      return (SDL::Mixer.FadingMusic() == SDL::Mixer::FADING_OUT)
+    else
+      return (SDL::Mixer.FadingMusic() != SDL::Mixer::NO_FADING)
+    end
+  end
+end
+
+