rubygame 2.5.3 → 2.6.0

data/ext/rubygame/rubygame_main.h

@@ -1,36 +0,0 @@
-/*
- * Rubygame -- Ruby code and bindings to SDL to facilitate game creation
- * Copyright (C) 2004-2007  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
- *
- */
-
-#ifndef _RUBYGAME_H
-#define _RUBYGAME_H
-
-#ifndef RUBYGAME_MAJOR_VERSION
-
-#define RUBYGAME_MAJOR_VERSION 0
-#define RUBYGAME_MINOR_VERSION 0
-#define RUBYGAME_PATCHLEVEL 0
-
-#endif
-
-extern VALUE rbgm_keyname(VALUE, VALUE);
-extern VALUE rbgm_init(VALUE);
-extern VALUE rbgm_quit(VALUE);
-
-#endif

data/ext/rubygame/rubygame_mixer.c

@@ -1,1024 +0,0 @@
-/*
- *  Interface to SDL_mixer, for audio playback and mixing.
- *--
- *  Rubygame -- Ruby code and bindings to SDL to facilitate game creation
- *  Copyright (C) 2004-2007  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
- *++
- */
-
-#include "rubygame_shared.h"
-#include "rubygame_mixer.h"
-#include "rubygame_sound.h"
-#include "rubygame_music.h"
-
-
-VALUE mMixer;
-VALUE cSample;
-VALUE cOldMusic;
-
-
-/* Return 1 if SDL_mixer audio is open, or 0 if it is not. */
-int audio_is_open()
-{
-  /* We don't actually care about these, but Mix_QuerySpec wants args. */
-  int frequency;  Uint16 format;  int channels;
-
-  int result = Mix_QuerySpec(&frequency, &format, &channels);
-
-  return ( (result > 0) ? 1 : 0 );
-}
-
-/*
- * If SDL_mixer audio is not open, try to open it with the default
- * arguments, and return the result. If it's already open, return 0
- * without doing anything.
- */
-int ensure_open_audio()
-{
-  if( audio_is_open() )
-  {
-    return 0;
-  }
-  else
-  {
-    return Mix_OpenAudio( MIX_DEFAULT_FREQUENCY, 
-                          MIX_DEFAULT_FORMAT,
-                          2, 
-                          1024 );
-  }
-}
-
-
-/* --
- * SETUP AND INITIALIZATION
- * ++
- */
-
-/* call-seq:
- *  open_audio( frequency=nil, format=nil, channels=nil, buffer=nil)
- *
- *  **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).
- *
- */
-VALUE rbgm_mixer_openaudio(int argc, VALUE *argv, VALUE module)
-{
-
-  /* This feature will be removed in Rubygame 3.0. */
-  rg_deprecated("Rubygame::Mixer", "3.0");
-
-  VALUE vfreq, vformat, vchannels, vbuffer;
-  int freq = MIX_DEFAULT_FREQUENCY;
-  Uint16 format = MIX_DEFAULT_FORMAT;
-  int channels = 2;
-  int buffer = 1024;
-
-  rb_scan_args(argc, argv, "04", &vfreq, &vformat, &vchannels, &vbuffer);
-
-  if( RTEST(vfreq) )
-  {
-    freq = NUM2INT(vfreq);
-  }
-
-  if( RTEST(vformat) )
-  {
-    format = NUM2UINT(vformat);
-  }
-
-  if( RTEST(vchannels) )
-  {
-    channels = NUM2INT(vchannels);
-  }
-
-  if( RTEST(vbuffer) )
-  {
-    buffer = NUM2INT(vbuffer);
-  }
-
-  if ( Mix_OpenAudio(freq, format, channels, buffer) < 0 )
-  {
-    rb_raise(eSDLError, "Error initializing SDL_mixer: %s", Mix_GetError());
-  }
-
-  return Qnil;
-}
-
-/* call-seq:
- *  close_audio()
- *
- *  **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.
- */
-VALUE rbgm_mixer_closeaudio(VALUE module)
-{
-  /* This feature will be removed in Rubygame 3.0. */
-  rg_deprecated("Rubygame::Mixer", "3.0");
-
-  Mix_CloseAudio();
-  return Qnil;
-}
-
-
-
-/* call-seq:
- *  open_audio( options={ :buffer => 1024, :channels => 2, :frequency => 22050 } )  ->  true or false
- *
- *  Initializes the audio device using the given settings.
- *
- *  NOTE: Audio will be automatically opened when Rubygame::Sound or
- *  Rubygame::Music are first used. You only need to open audio
- *  manually if you want settings different from the default, or if
- *  you are using the older, deprecated Music and Sample classes from
- *  the Rubygame::Mixer module.
- *
- *  If audio is already open, this method has no effect, and returns false.
- *  If you want to change audio settings, you must #close_audio() and
- *  then open it again.
- *
- *  options::    A Hash of any of the following options. (Hash, optional)
- *
- *     :frequency::  output sample rate in audio samples per second
- *                   (Hz). Affects the quality of the sound output, at
- *                   the expense of CPU usage. If omitted, the default
- *                   (22050) is used. The default is recommended for
- *                   most games.
- *
- *     :channels::   output sound channels. Use 2 for stereo, 1 for mono.
- *                   If omitted, the default (2) is used.
- *
- *     :buffer::     size of the sound buffer, in bytes. Must be a
- *                   power of 2 (e.g. 512, 1024, 2048). If omitted,
- *                   the default (1024) is used. If your game is
- *                   fast-paced, you may want to use a smaller value
- *                   to reduce audio delay, the time between when you
- *                   play a sound and when it is heard.
- *
- *  Returns::    true if the audio was newly opened by this action, or
- *               false if it was already open before this action.
- *
- *  May raise::  SDLError, if initialization fails.
- *               ArgumentError, if an invalid value is given for any option.
- *
- *
- */
-VALUE rbgm_mixer_openaudio2(int argc, VALUE *argv, VALUE module)
-{
-  VALUE options;
-
-  int buffer = 1024;
-  int channels = 2;
-  int frequency = MIX_DEFAULT_FREQUENCY;
-
-  /* In general, format should always be the default. */
-  Uint16 format = MIX_DEFAULT_FORMAT;
-
-
-  /* Does nothing if audio is already open. */
-  if( audio_is_open() )
-  {
-    return Qfalse;
-  }
-
-
-  rb_scan_args(argc, argv, "01", &options);
-
-
-  if( RTEST(options) )
-  {
-    /* Make sure options is a Hash table */
-    if( TYPE(options) != T_HASH )
-    {
-      rb_raise(rb_eTypeError, "wrong argument type %s (expected Hash)",
-               rb_obj_classname(options));
-    }
-
-    VALUE temp;
-
-    /* Buffer size */
-    temp = rb_hash_aref(options, make_symbol("buffer"));
-    if( RTEST(temp) )
-    {
-      buffer = NUM2INT(temp);
-
-      if( buffer <= 0 )
-      {
-        rb_raise(rb_eArgError, "buffer size must be positive (got %d)", buffer);
-      }
-
-      /* Check to see if it's not a power of two */
-      if( buffer & (buffer - 1) != 0 )
-      {
-        rb_raise(rb_eArgError, "buffer size must be a power of 2 (e.g. 512, 1024) (got %d)", buffer);
-      }
-    }
-
-    /* Channels */
-    temp = rb_hash_aref(options, make_symbol("channels"));
-    if( RTEST(temp) )
-    {
-      channels = NUM2INT(temp);
-
-      if( channels != 1 && channels != 2 )
-      {
-        rb_raise(rb_eArgError, "channels must be 1 (mono) or 2 (stereo) (got %d)", channels);
-      }
-    }
-
-    /* Frequency */
-    temp = rb_hash_aref(options, make_symbol("frequency"));
-    if( RTEST(temp) )
-    {
-      frequency = NUM2INT(temp);
-
-      if( frequency <= 0 )
-      {
-        rb_raise(rb_eArgError, "frequency must be positive (got %d)", frequency);
-      }
-    }
-  }
-
-  int result = Mix_OpenAudio(frequency, format, channels, buffer);
-
-  if( result < 0 )
-  {
-    rb_raise(eSDLError, "Could not open audio: %s", Mix_GetError());
-  }
-
-  return Qtrue;
-}
-
-
-/* call-seq:
- *  close_audio()  ->  true or false
- *
- *  Deinitializes and closes the audio device. If audio was not open,
- *  this method does nothing, and returns false. See also #open_audio().
- *
- *  NOTE: The audio will be automatically closed when the program
- *  exits. You only need to close audio manually if you want to
- *  call #open_audio with different settings.
- *
- *  Returns::  true if the audio changed from open to closed, or
- *             false if the audio was not open before this action.
- */
-VALUE rbgm_mixer_closeaudio2(VALUE module)
-{
-  if( audio_is_open() )
-  {
-    Mix_CloseAudio();
-    return Qtrue;
-  }
-  else
-  {
-    return Qfalse;
-  }
-}
-
-
-
-/* call-seq:
- *  #mix_channels()  ->  integer
- *
- *  **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=().
- */
-VALUE rbgm_mixer_getmixchans(VALUE module)
-{
-  /* This feature will be removed in Rubygame 3.0. */
-  rg_deprecated("Rubygame::Mixer", "3.0");
-
-  int result;
-  result = Mix_AllocateChannels(-1);
-
-  return INT2NUM(result);
-}
-
-/* call-seq:
- *  #mix_channels = num_channels 
- *
- *  **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.
- */
-VALUE rbgm_mixer_setmixchans(VALUE module, VALUE channelsv)
-{
-  /* This feature will be removed in Rubygame 3.0. */
-  rg_deprecated("Rubygame::Mixer", "3.0");
-
-  int desired;
-  int allocated;
-
-  desired = NUM2INT(channelsv);
-  allocated = Mix_AllocateChannels(desired);
-
-  return INT2NUM(allocated);
-}
-
-/* call-seq:
- *  driver_name -> string 
- *
- *  **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 an SDLError if initialization fails.
- */
-
-VALUE rbgm_mixer_getdrivername(VALUE module)
-{
-  /* This feature will be removed in Rubygame 3.0. */
-  rg_deprecated("Rubygame::Mixer", "3.0");
-
-  char driver_name[1024];
-  if(SDL_AudioDriverName(driver_name, sizeof(driver_name)) == NULL)
-  {	
-    rb_raise(eSDLError, "Error fetching audio driver name: %s", SDL_GetError());
-  }
-  return rb_str_new2(driver_name);
-}
-
-/* call-seq:
- *  audio_driver -> string 
- *
- *  Returns the name of the audio driver that SDL is using.
- *
- *  May raise an SDLError if initialization fails.
- */
-
-VALUE rbgm_mixer_audiodriver(VALUE module)
-{
-  if( ensure_open_audio() != 0 )
-  {
-    rb_raise(eSDLError, "Could not initialize audio: %s", Mix_GetError());
-  }
-
-  char driver_name[1024];
-  if(SDL_AudioDriverName(driver_name, sizeof(driver_name)) == NULL)
-  {	
-    rb_raise(eSDLError, "Could not get audio driver name: %s", Mix_GetError());
-  }
-  return rb_str_new2(driver_name);
-}
-
-
-
-/* --
- * SAMPLES
- * ++
- */
-
-/* call-seq:
- *  load_audio( filename )  ->  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.
- */
-VALUE rbgm_sample_new(VALUE class, VALUE filev)
-{
-  /* This feature will be removed in Rubygame 3.0. */
-  rg_deprecated("Rubygame::Mixer::Sample", "3.0");
-
-  VALUE self;
-  Mix_Chunk* sample;
-
-  sample = Mix_LoadWAV( StringValuePtr(filev) );
-
-  if( sample == NULL )
-  { 
-    rb_raise(eSDLError, "Error loading audio Sample from file `%s': %s",
-             StringValuePtr(filev), Mix_GetError());
-  }
-  self = Data_Wrap_Struct( cSample, 0, Mix_FreeChunk, sample );
-
-  //rb_obj_call_init(self,argc,argv);
-
-  return self;
-}
-
-/* call-seq:
- *  play(sample, channel_num, repeats )  ->  integer
- *
- *  **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.
- */
-VALUE rbgm_mixchan_play( VALUE self, VALUE samplev, VALUE chanv, VALUE loopsv )
-{
-
-  /* This feature will be removed in Rubygame 3.0. */
-  rg_deprecated("Rubygame::Mixer", "3.0");
-
-  Mix_Chunk* sample;
-  int loops, channel, result;
-
-  channel = NUM2INT(chanv);
-  Data_Get_Struct( samplev, Mix_Chunk, sample );
-  loops = NUM2INT(loopsv);
-  
-  result = Mix_PlayChannel(channel, sample, loops);
-
-  if ( result < 0 )
-  {
-    rb_raise(eSDLError, "Error playing sample on channel %d: %s", 
-             channel, Mix_GetError());
-  }
-
-  return INT2NUM( result );
-}
-
-/* call-seq:
- *  stop( channel_num )
- *
- *  Stop playback of a playing or paused mixing channel.
- *  Unlike #pause, playback cannot be resumed from the current point.
- *  See also #play.
- */
-VALUE rbgm_mixchan_stop( VALUE self, VALUE chanv )
-{
-  Mix_HaltChannel(NUM2INT(chanv));
-  return Qnil;
-}
-
-/* call-seq:
- *  pause( channel_num )
- *
- *  Pause playback of a currently-playing mixing channel.
- *  Playback can be resumed from the current point with #resume.
- *  See also #stop.
- */
-VALUE rbgm_mixchan_pause( VALUE self, VALUE chanv )
-{
-  Mix_Pause(NUM2INT(chanv));
-  return Qnil;
-}
-
-/* call-seq:
- *  resume( channel_num )
- *
- *  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.
- *  
- */
-VALUE rbgm_mixchan_resume( VALUE self, VALUE chanv )
-{
-  Mix_Resume(NUM2INT(chanv));
-  return Qnil;
-}
-
-
-/* --
- * MUSIC
- * ++
- */
-
-/* call-seq:
- *  set_music_command(command)  ->  integer
- *
- *  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. 
- *
- */
-VALUE rbgm_mixmusic_setcommand(VALUE class, VALUE commandv) 
-{
-  int result;	
-  result = Mix_SetMusicCMD(StringValuePtr(commandv));
-  if( result < 0 )
-  {
-    rb_raise(eSDLError, "Error setting music player commando to `%s': %s",
-             StringValuePtr(commandv), Mix_GetError());
-  }
-  return INT2NUM( result );
-}
-
-/* call-seq:
- *  load_audio( filename )  ->  Music
- *
- *  **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 WAVE, MOD, MIDI, OGG, and MP3 formats.
- *
- *  Raises SDLError if the music could not be loaded.
- */
-VALUE rbgm_mixmusic_new(VALUE class, VALUE filev)
-{
-
-  /* This feature will be removed in Rubygame 3.0. */
-  rg_deprecated("Rubygame::Mixer::Music", "3.0");
-
-  VALUE self;
-  Mix_Music* music;
-
-  music = Mix_LoadMUS( StringValuePtr(filev) );
-
-  if( music == NULL )
-  { 
-    rb_raise(eSDLError, "Error loading audio music from file `%s': %s",
-             StringValuePtr(filev), Mix_GetError());
-  }
-	self = Data_Wrap_Struct( cOldMusic, 0, Mix_FreeMusic, music );
-
-	//rb_obj_call_init(self,argc,argv);
-
-  return self;
-}
-
-/*  call-seq:
- *     play( repeats = 0 )  ->  self
- *
- *  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.
- */
-VALUE rbgm_mixmusic_play(int argc, VALUE *argv, VALUE self)
-{
-  Mix_Music* music;
-  int reps, result;
-  VALUE repsv;
-
-  Data_Get_Struct( self, Mix_Music, music );
-
-  rb_scan_args(argc, argv, "01", &repsv);
-
-  if( RTEST(repsv) )
-  {
-    reps = NUM2INT(repsv);
-  }
-  else
-  {
-    reps = 0;
-  }
-  
-  if( reps > -1 )
-  {
-    /* Adjust so repeats means the same as it does for Samples */
-    reps += 1;
-  }
-  
-  result = Mix_PlayMusic(music, reps);
-
-  if ( result < 0 )
-  {
-    rb_raise(eSDLError, "Error playing music: %s", 
-             Mix_GetError());
-  }
-
-  return self;
-}
-
-/*  call-seq:
- *     stop()  -> self
- *
- *  Stop playback of music. 
- *  See also #play
- */
-VALUE rbgm_mixmusic_stop(VALUE self)
-{
-  Mix_HaltMusic();
-  return self;
-}
-
-/*  call-seq:
- *     pause()  -> self
- *
- *  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.
- */
-VALUE rbgm_mixmusic_pause(VALUE self)
-{
-  Mix_PauseMusic();
-  return self;
-}
-
-/*  call-seq:
- *     resume()  ->  self
- *
- *  Resume playback of paused music from the point it was paused.
- *  Safe to use on already-playing music.
- *  See also #play.
- */
-VALUE rbgm_mixmusic_resume(VALUE self)
-{
-  Mix_ResumeMusic();
-  return self;
-}
-
-/*  call-seq:
- *     rewind()  ->  self
- *
- *  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).
- * 
- */
-VALUE rbgm_mixmusic_rewind(VALUE self)
-{
-  Mix_RewindMusic();
-  return self;
-}
-
-/*  call-seq:
- *     jump( time )  ->  self
- *
- *  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.
- *
- */
-VALUE rbgm_mixmusic_jump(VALUE self, VALUE vtime)
-{
-  double time = NUM2DBL(vtime);
-
-  switch( Mix_GetMusicType(NULL) )
-	{
-    case MUS_OGG:
-    case MUS_MP3:
-      Mix_RewindMusic(); // Needed for MP3, and OK with OGG
-
-      int result = Mix_SetMusicPosition(time);
-      if( result < 0 )
-      {
-        rb_raise(eSDLError, "Error jumping to time in music: %s", Mix_GetError());
-      }
-
-      return self;
-
-    case MUS_NONE:
-      rb_raise(eSDLError, "Cannot jump when no music is playing.");
-
-    default:
-      rb_raise(eSDLError, "Music type does not support jumping.");
-  }
-} 	
-
-/*  call-seq:
- *     playing?  ->  true or false
- *
- *  Returns true if the music is currently playing.
- *
- */
-VALUE rbgm_mixmusic_playing(VALUE self)
-{
-  return Mix_PlayingMusic() ? Qtrue : Qfalse;
-}
-
-/*  call-seq:
- *     paused?  ->  true or false
- *
- *  Returns true if the music is currently paused.
- *
- */
-VALUE rbgm_mixmusic_paused(VALUE self)
-{
-  return Mix_PausedMusic() ? Qtrue : Qfalse;
-}
-
-/*  call-seq:
- *     volume
- *
- *  Returns the current volume level of the music.
- *  0.0 is total silence, 1.0 is maximum volume.
- */
-VALUE rbgm_mixmusic_getvolume(VALUE self)
-{
-  return rb_float_new( (double)(Mix_VolumeMusic(-1)) / MIX_MAX_VOLUME );
-}
-
-/*  call-seq:
- *     volume = new_volume
- *
- *  Sets the volume level of the music.
- *  0.0 is total silence, 1.0 is maximum volume.
- */
-VALUE rbgm_mixmusic_setvolume(VALUE self, VALUE volumev)
-{
-  double volume = NUM2DBL(volumev);
-  Mix_VolumeMusic( (int)(volume * MIX_MAX_VOLUME) );
-  return volumev;
-}
-
-/*  call-seq:
- *     fade_in( fade_time, repeats=0, start=0 )  ->  self
- *
- *  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.
- */
-VALUE rbgm_mixmusic_fadein(int argc, VALUE *argv, VALUE self)
-{
-  VALUE fadev, repsv, startv;
-  rb_scan_args(argc, argv, "12", &fadev, &repsv, &startv);
-
-  Mix_Music* music;
-  Data_Get_Struct( self, Mix_Music, music );
-
-  int fade, reps, result;
-  fade = (int)(NUM2DBL(fadev) * 1000); /* convert to milliseconds */
-
-  if( RTEST(repsv) )
-  {
-    reps = NUM2INT(repsv);
-  }
-  else
-  {
-    reps = 0;
-  }
-
-  if( reps > -1 )
-  {
-    /* Adjust so repeats means the same as it does for Samples */
-    reps += 1;
-  }
-  
-  if( !RTEST(startv) || NUM2DBL(startv) == 0.0 )
-  {
-		result = Mix_FadeInMusic(music, reps, fade);
-  }
-  else
-	{
-    result = Mix_FadeInMusicPos(music, reps, fade, NUM2DBL(startv));
-  }
-
-  if( result < 0 )
-  {
-    rb_raise(eSDLError, "Error fading in music: %s", Mix_GetError());
-  }
-
-  return self;
-}
-
-/*  call-seq:
- *     fade_out( fade_time )  ->  self
- *
- *  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.
- */
-VALUE rbgm_mixmusic_fadeout(VALUE self, VALUE fadev)
-{
-  int fade = (int)(NUM2DBL(fadev) * 1000);
-  int result = Mix_FadeOutMusic(fade);
-
-  if ( result < 0 )
-  {
-    rb_raise(eSDLError, "Error fading out music: %s", Mix_GetError());
-  }
-  return self;
-}
-
-/*  call-seq:
- *     fading?( direction = nil )  ->  true or false
- *
- *  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.
- */
-VALUE rbgm_mixmusic_fading(int argc, VALUE *argv, VALUE self)
-{
-  VALUE dirv;
-  rb_scan_args(argc, argv, "01", &dirv);
-
-  if( dirv == make_symbol("in") )
-  {
-    return ( (Mix_FadingMusic() == MIX_FADING_IN)  ? Qtrue : Qfalse );
-  }
-  else if( dirv == make_symbol("out") )
-  {
-    return ( (Mix_FadingMusic() == MIX_FADING_OUT) ? Qtrue : Qfalse );
-  }
-  else
-  {
-    return ( (Mix_FadingMusic() != MIX_NO_FADING)  ? Qtrue : Qfalse );
-  }
-}
-
-
-void Init_rubygame_mixer()
-{
-
-#if 0
-  mRubygame = rb_define_module("Rubygame");
-#endif
-
-  Init_rubygame_shared();
-
-  Rubygame_Init_Sound();
-  Rubygame_Init_Music();
-
-  rb_hash_aset(rb_ivar_get(mRubygame,rb_intern("VERSIONS")),
-               ID2SYM(rb_intern("sdl_mixer")),
-               rb_ary_new3(3,
-                           INT2NUM(SDL_MIXER_MAJOR_VERSION),
-                           INT2NUM(SDL_MIXER_MINOR_VERSION),
-                           INT2NUM(SDL_MIXER_PATCHLEVEL)));
-
-  /*
-   * Moving these to be under Rubygame module instead of Mixer.
-   */
-  rb_define_module_function(mRubygame,"open_audio",  rbgm_mixer_openaudio2, -1);
-  rb_define_module_function(mRubygame,"close_audio", rbgm_mixer_closeaudio2, 0);
-  rb_define_module_function(mRubygame,"audio_driver",rbgm_mixer_audiodriver, 0);
-
-
-
-  /*
-   *  **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.
-   */
-  mMixer = rb_define_module_under(mRubygame, "Mixer");
-
-  rb_define_const(mMixer,"AUDIO_U8", INT2NUM(AUDIO_U8));
-  rb_define_const(mMixer,"AUDIO_S8", INT2NUM(AUDIO_S8));
-  rb_define_const(mMixer,"AUDIO_U16SYS", INT2NUM(AUDIO_U16SYS));
-  rb_define_const(mMixer,"AUDIO_S16SYS", INT2NUM(AUDIO_S16SYS));
-
-  rb_define_module_function(mMixer,"open_audio",rbgm_mixer_openaudio, -1);
-  rb_define_module_function(mMixer,"close_audio",rbgm_mixer_closeaudio, 0);
-  rb_define_module_function(mMixer,"mix_channels",rbgm_mixer_getmixchans, 0);
-  rb_define_module_function(mMixer,"mix_channels=",rbgm_mixer_setmixchans, 1);
-  rb_define_module_function(mMixer,"driver_name", rbgm_mixer_getdrivername, 0);
-
-
-  /*
-   *  **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 Mixer.play() 
-   */
-  cSample = rb_define_class_under(mMixer, "Sample", rb_cObject);
-  rb_define_singleton_method(cSample, "load_audio", rbgm_sample_new, 1);
-  rb_define_module_function(mMixer,"play", rbgm_mixchan_play, 3);
-  rb_define_module_function(mMixer,"stop", rbgm_mixchan_stop, 1);
-  rb_define_module_function(mMixer,"pause", rbgm_mixchan_pause, 1);
-  rb_define_module_function(mMixer,"resume", rbgm_mixchan_resume, 1);
-
-
-/*
- *  **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.
- */
-  cOldMusic = rb_define_class_under(mMixer, "Music", rb_cObject);
-  rb_define_singleton_method(cOldMusic, "load_audio", rbgm_mixmusic_new, 1);
-
-  //rb_define_singleton_method(cOldMusic, "set_command", rbgm_mixmusic_setcommand, 1);
-	
-  rb_define_method(cOldMusic, "play",      rbgm_mixmusic_play,       -1);
-  rb_define_method(cOldMusic, "stop",      rbgm_mixmusic_stop,        0);
-  rb_define_method(cOldMusic, "pause",     rbgm_mixmusic_pause,       0);
-  rb_define_method(cOldMusic, "resume",    rbgm_mixmusic_resume,      0);
-  rb_define_method(cOldMusic, "rewind",    rbgm_mixmusic_rewind,      0);
-  rb_define_method(cOldMusic, "jump",      rbgm_mixmusic_jump,        1);
-  rb_define_method(cOldMusic, "paused?",   rbgm_mixmusic_paused,      0);
-  rb_define_method(cOldMusic, "playing?",  rbgm_mixmusic_playing,     0);
-
-  rb_define_method(cOldMusic, "volume",    rbgm_mixmusic_getvolume,   0);
-  rb_define_method(cOldMusic, "volume=",   rbgm_mixmusic_setvolume,   1);
-  rb_define_method(cOldMusic, "fade_in",   rbgm_mixmusic_fadein,     -1);
-  rb_define_method(cOldMusic, "fade_out",  rbgm_mixmusic_fadeout,     1);
-  rb_define_method(cOldMusic, "fading?",   rbgm_mixmusic_fading,     -1);
-}
-
-