gosu 0.15.1 → 1.1.0.pre1

data/lib/gosu.rb

@@ -17,9 +17,6 @@ if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/
     path_encoding = ENV["PATH"].encoding
     ENV["PATH"] = "#{binary_path.encode(path_encoding)};#{ENV["PATH"]}"
   end
-  
-  # Add the correct lib directory for the current version of Ruby (major.minor).
-  $LOAD_PATH.unshift File.join(binary_path, RUBY_VERSION[/^\d+.\d+/])
 end
 
 require "gosu.#{RbConfig::CONFIG["DLEXT"]}"

data/lib/gosu/patches.rb

@@ -18,26 +18,12 @@ class ::Numeric
   end
 end
 
-class Gosu::Font
-  # draw_text will stop parsing markup in Gosu 1.0.
-  alias_method :draw_text, :draw_markup
-  # draw_text_rel will stop parsing markup in Gosu 1.0.
-  alias_method :draw_text_rel, :draw_markup_rel
-  # text_width will stop parsing markup in Gosu 1.0.
-  alias_method :text_width, :markup_width
-end
-
 class Gosu::Image
   BlobHelper = Struct.new(:columns, :rows, :to_blob)
   
   def self.from_blob(width, height, rgba = "\0\0\0\0" * (width * height))
     self.new(BlobHelper.new(width, height, rgba))
   end
-  
-  # from_markup will stop parsing markup in Gosu 1.0.
-  def self.from_markup(*args)
-    self.from_text(*args)
-  end
 end
 
 # Color constants.
@@ -78,12 +64,3 @@ class Gosu::Window
     _tick
   end
 end
-
-# Release OpenAL resources during Ruby's shutdown, not Gosu's.
-at_exit do
-  begin
-    Gosu::Song.current_song.stop if Gosu::Song.current_song
-    Gosu._release_all_openal_resources
-  rescue
-  end
-end

data/lib/gosu/preview.rb

@@ -3,8 +3,6 @@ warn "gosu/preview.rb has been removed in Gosu 0.9.0, and Gosu itself \n" +
   "Notable differences:\n" +
   "• no global $window variable\n" +
   "• no global Gosu.mouse_x and Gosu.mouse_y functions\n" +
-  "• Image#initialize et.al. use an options hash now\n" +
-  "If you cannot update your code base right now, you should require \n" +
-  "Gosu 0.8.x in your Gemfile: gem 'gosu', '~> 0.8.0'";
+  "• Image#initialize et.al. use an options hash now";
 
 require 'gosu'

data/lib/gosu/swig_patches.rb

@@ -3,23 +3,21 @@
 # compatible, but I just call protected_update etc. in the Ruby wrapper so I can add this
 # custom debugging help:
 class Gosu::Window
-  alias_method :initialize_without_hash, :initialize
+  alias_method :initialize_with_options_hash, :initialize
 
   def initialize width, height, *args
     if args.empty? or args.first.is_a? Hash
       options = args.first || {}
-      fullscreen = options[:fullscreen]
-      update_interval = options[:update_interval]
-      resizable = options[:resizable]
     else
-      fullscreen, update_interval = *args
+      options = { fullscreen: args[0], update_interval: args[1] }
     end
     $gosu_gl_blocks = nil
-    initialize_without_hash width, height, !!fullscreen, update_interval || 16.666666, !!resizable
+    initialize_with_options_hash width, height, options
   end
 
   %w(update draw needs_redraw? needs_cursor?
-     lose_focus button_down button_up).each do |callback|
+     lose_focus button_down button_up
+     gamepad_connected gamepad_disconnected drop).each do |callback|
     define_method "protected_#{callback}" do |*args|
       begin
         # If there has been an exception, don't do anything as to not make matters worse.
@@ -47,7 +45,7 @@ class Gosu::Window
     # doing here.
     if defined? @_exception
       if @_exception.backtrace.is_a? Array and not @_exception.backtrace.frozen?
-        @_exception.backtrace.reject! { |line| line.include? 'lib/gosu/swig_patches.rb' }
+        @_exception.backtrace.reject! { |line| line.include? "lib/gosu/swig_patches.rb" }
       end
       raise @_exception
     end

data/rdoc/gosu.rb

@@ -32,6 +32,10 @@ module Gosu
   KB_DOWN = :an_integer
   KB_END = :an_integer
 
+  KB_PRINT_SCREEN = :an_integer
+  KB_SCROLL_LOCK = :an_integer
+  KB_PAUSE = :an_integer
+
   ##
   # This is the key on the numpad.
   KB_ENTER = :an_integer
@@ -71,6 +75,7 @@ module Gosu
   KB_RIGHT_SHIFT = :an_integer
   KB_SEMICOLON = :an_integer
   KB_SLASH = :an_integer
+  KB_CAPS_LOCK = :an_integer
   KB_SPACE = :an_integer
   KB_TAB = :an_integer
   KB_UP = :an_integer
@@ -83,12 +88,32 @@ module Gosu
   MS_OTHER_0…MS_OTHER_7 = :an_integer
 
   GP_BUTTON_0…GP_BUTTON_15 = :an_integer
+  GP_LEFT_STICK_X_AXIS = :an_integer
+  GP_RIGHT_STICK_X_AXIS = :an_integer
+  GP_LEFT_STICK_Y_AXIS = :an_integer
+  GP_RIGHT_STICK_Y_AXIS = :an_integer
+  GP_LEFT_TRIGGER_AXIS = :an_integer
+  GP_RIGHT_TRIGGER_AXIS = :an_integer
+  GP_DPAD_DOWN = :an_integer
+  GP_DPAD_LEFT = :an_integer
+  GP_DPAD_RIGHT = :an_integer
+  GP_DPAD_UP = :an_integer
   GP_DOWN = :an_integer
   GP_LEFT = :an_integer
   GP_RIGHT = :an_integer
   GP_UP = :an_integer
 
   GP_0_BUTTON_0…GP_3_BUTTON_15 = :an_integer
+  GP_0_LEFT_STICK_X_AXIS…GP_3_LEFT_STICK_X_AXIS = :an_integer
+  GP_0_RIGHT_STICK_X_AXIS…GP_3_RIGHT_STICK_X_AXIS = :an_integer
+  GP_0_LEFT_STICK_Y_AXIS…GP_3_LEFT_STICK_Y_AXIS = :an_integer
+  GP_0_RIGHT_STICK_Y_AXIS…GP_3_RIGHT_STICK_Y_AXIS = :an_integer
+  GP_0_LEFT_TRIGGER_AXIS…GP_3_LEFT_TRIGGER_AXIS = :an_integer
+  GP_0_RIGHT_TRIGGER_AXIS…GP_3_RIGHT_TRIGGER_AXIS = :an_integer
+  GP_0_DPAD_DOWN…GP_3_DPAD_DOWN = :an_integer
+  GP_0_DPAD_LEFT…GP_3_DPAD_LEFT = :an_integer
+  GP_0_DPAD_RIGHT…GP_3_DPAD_RIGHT = :an_integer
+  GP_0_DPAD_UP…GP_3_DPAD_UP = :an_integer
   GP_0_DOWN…GP_3_DOWN = :an_integer
   GP_0_LEFT…GP_3_LEFT = :an_integer
   GP_0_RIGHT…GP_3_RIGHT = :an_integer
@@ -193,14 +218,14 @@ module Gosu
     ##
     # @return [Integer] a 32-bit representation of the color in 0xAARRGGBB format.
     def argb; end
-    
+
     alias_method :to_i, :argb
 
     # Returns a 32-bit representation of the color suitable for use with OpenGL calls. This color is stored in a fixed format in memory and its integer value may vary depending on your system's byte order.
     #
     # @return [Integer] a 32-bit OpenGL color.
     def gl; end
-    
+
     # Returns an OpenGL integer constant that identifies the RGBA color format that Gosu uses.
     GL_FORMAT = :some_integer
 
@@ -316,7 +341,7 @@ module Gosu
     # @return [Integer] the width of the text, in pixels.
     # @param text [String]
     def text_width(text, scale_x=1); end
-    
+
     ##
     # Like {#text_width}, but supports the following markup tags: `<b>bold</b>`, `<i>italic</i>`, `<c=rrggbb>colors</c>`.
     def markup_width(markup, scale_x=1); end
@@ -420,13 +445,13 @@ module Gosu
 
     ##
     # Returns an image that is a smaller, rectangular view of this {Image}.
-    # 
+    #
     # This is a very fast operation, and no new textures will be allocated.
     # If you update this {Image} or the {#subimage} using {#insert}, the other {Image} will be affected as well.
-    # 
+    #
     # Caveats:
     # * If you stretch or rotate a {#subimage}, the pixels adjacent to it might bleed into it, as Gosu does not manage the 'tileability' of subimages.
-    # 
+    #
     # @return [Image?] an image that represents a portion of the containing image
     def subimage(left, top, width, height); end
 
@@ -450,7 +475,7 @@ module Gosu
     # @see #draw_as_quad
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#drawing-with-colours Drawing with colors, explained in the Gosu Wiki
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#z-ordering Z-ordering explained in the Gosu Wiki
-    def draw(x, y, z, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
+    def draw(x, y, z=0, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
 
     ##
     # Draws the image rotated, with its rotational center at (x, y).
@@ -464,7 +489,7 @@ module Gosu
     # @see #draw
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#drawing-with-colours Drawing with colors, explained in the Gosu Wiki
     # @see https://github.com/gosu/gosu/wiki/Basic-Concepts#z-ordering Z-ordering explained in the Gosu Wiki
-    def draw_rot(x, y, z, angle, center_x=0.5, center_y=0.5, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
+    def draw_rot(x, y, z=0, angle=0, center_x=0.5, center_y=0.5, scale_x=1, scale_y=1, color=0xff_ffffff, mode=:default); end
 
     ##
     # Draws the image as an arbitrary quad. This method can be used for advanced non-rectangular drawing techniques, e.g., faking perspective or isometric projection.
@@ -576,16 +601,16 @@ module Gosu
     # @param [Float]
     # @return [Float]
     attr_writer :volume
-    
+
     ##
     # Sets the playback speed. A value of 2.0 will play the sample at 200% speed and one octave higher. A value of 0.5 will play the sample at 50% speed and one octave lower. The valid range of this property depends on the operating system, but values up to 8.0 should work.
-    # @param [Float]    
+    # @param [Float]
     # @return [Float]
     attr_writer :speed
-    
+
     ##
     # Set the amount of panning, i.e. the position of the sound when using stereo speakers. 0.0 is the centre, negative values are to the left, positive values are to the right. If something happens on the edge of the screen, a good value for pan would be ±0.1.
-    # @param [Float] 
+    # @param [Float]
     # @return [Float]
     attr_writer :pan
 
@@ -781,11 +806,23 @@ module Gosu
     ##
     # Toggles between windowed mode and fullscreen.
     attr_writer :fullscreen
-    
+
     ##
     # @return [true, false] whether this window is resizable.
     def resizable?; end
 
+    ##
+    # Toggles between resizable and fixed modes.
+    attr_writer :resizable
+
+    ##
+    # @return [true, false] whether this window is borderless.
+    def borderless?; end
+
+    ##
+    # Toggles between borderless mode and having window chrome.
+    attr_writer :borderless
+
     ##
     # @return [Float] the interval between calls to {#update}, in milliseconds.
     attr_accessor :update_interval
@@ -795,7 +832,7 @@ module Gosu
     #
     # Resizable fullscreen windows always use the full desktop resolution.
     # Windows that are larger than the desktop resolution will be shrunk.
-    # 
+    #
     # @overload initialize(width, height, options = {})
     # @overload initialize(width, height, fullscreen, update_interval = 16.666666)
     #
@@ -803,7 +840,8 @@ module Gosu
     # @param height [Integer] the desired window height.
     # @param [Hash] options
     # @option options [true, false] :fullscreen (false) whether to present the window in fullscreen mode.
-    # @option options [true, false] :resizable (false) whether the window can be resized by the user.
+    # @option options [true, false] :resizable (false) whether the window can be resized by the user. Not useful if the window is either fullscreen or borderless.
+    # @option options [true, false] :borderless (false) whether the window should hide all its window chrome. Does not affect fullscreen windows.
     # @option options [Float] :update_interval (16.666666) the interval between frames, in milliseconds.
     def initialize(width, height, options); end
 
@@ -812,18 +850,18 @@ module Gosu
     #
     # @return [void]
     def show; end
-    
+
     ##
     # EXPERIMENTAL - MAY DISAPPEAR WITHOUT WARNING.
-    # 
+    #
     # Performs a single step in the main loop.
     # This can be useful for integrating Gosu with other libraries that have their own main loop, e.g. Ruby/Tk.
-    # 
+    #
     # See: https://www.libgosu.org/cgi-bin/mwf/topic_show.pl?tid=1218
-    # 
+    #
     # If you find a good way to use {#tick}, please let us know on the forum and we can make this a part of Gosu's stable interface.
     # Thank you!
-    # 
+    #
     # @return [true, false] whether the {Window} should still be shown after this tick
     def tick; end
 
@@ -850,7 +888,7 @@ module Gosu
     def draw; end
 
     ##
-    # This method can be overriden to give the game a chance to opt out of a call to {#draw}; however, the operating system can still force a redraw for any reason.
+    # This method can be overridden to give the game a chance to opt out of a call to {#draw}; however, the operating system can still force a redraw for any reason.
     #
     # @return [true, false] whether the window needs to be redrawn.
     #
@@ -858,7 +896,8 @@ module Gosu
     def needs_redraw?; end
 
     ##
-    # This method can be overriden to control the visibility of the system cursor over your window, e.g., for level editors or other situations where introducing a custom cursor or hiding the default one is not desired.
+    # This method can be overridden to control the visibility of the system cursor over your window.
+    # The base class implementation returns true.
     #
     # @return [true, false] whether the system cursor should be shown.
     def needs_cursor?; end
@@ -871,7 +910,7 @@ module Gosu
     #
     # @return [bool]
     def close; end
-    
+
     ##
     # This method is called before {#update} if a button is pressed while the window has focus.
     #
@@ -903,6 +942,24 @@ module Gosu
     # @param filename [String] the filename of the dropped file. When multiple files are dropped, this method will be called several times.
     def drop(filename); end
 
+    ##
+    # Called when a gamepad is connected.
+    # If a gamepad is momentarily disconnected and then reconnected, before another gamepad, it will have the same index.
+    #
+    # @param index [integer] index for looking up gamepad.
+    #
+    # @see Gosu.gamepad_name
+    def gamepad_connected(index); end
+
+    ##
+    # Called when a gamepad is disconnected.
+    #
+    # @param index [integer] index for looking up gamepad.
+    #
+    # @see #gamepad_connected
+    # @see Gosu.gamepad_name
+    def gamepad_disconnected(index); end
+
     # @!endgroup
   end
 
@@ -945,6 +1002,38 @@ module Gosu
     # @see Window#button_up
     def button_down?(id); end
 
+    ##
+    # Returns the name of a Gosu::KB_{*} constant. Returns nil if no name is found.
+    #
+    # @example
+    #   Gosu.button_name(Gosu::KB_SPACE) #=> "Space"
+    #
+    # @return [String, nil]
+    # @param id [Integer]
+    #
+    def button_name(id); end
+
+    ##
+    # Returns the name for gamepad at `index` or nil if there is no connected at the specified index.
+    #
+    # @example
+    #   Gosu.gamepad_name(0) #=> "PS4 Controller"
+    #
+    # @return [String, nil]
+    # @param index [Integer]
+    def gamepad_name(index); end
+
+    ##
+    # Returns the value for the specified gamepad axis in the range -1.0..1.0 for joysticks and 0.0..1.0 for triggers.
+    #
+    # @example
+    #   Gosu.axis(Gosu::GP_0_LEFT_STICK_Y_AXIS) #=> 0.75
+    #
+    # @return [Float]
+    # @param id [Integer]
+    #
+    def axis(id); end
+
     # @!group Drawing primitives
 
     ##

data/src/Audio.cpp

@@ -1,51 +1,25 @@
 #include "AudioImpl.hpp"
-#include "OggFile.hpp"
+#include "AudioFile.hpp"
+
 #include <Gosu/Audio.hpp>
 #include <Gosu/Math.hpp>
 #include <Gosu/IO.hpp>
 #include <Gosu/Platform.hpp>
 #include <Gosu/Utility.hpp>
+
 #include <cassert>
 #include <cstdlib>
 #include <algorithm>
-
-#ifdef GOSU_IS_MAC
-#import <Foundation/Foundation.h>
-#include "AudioToolboxFile.hpp"
-#else
-#include "MPEGFile.hpp"
-#include "SndFile.hpp"
-#endif
-
-#ifdef GOSU_IS_IPHONE
-#import <AVFoundation/AVFoundation.h>
-#endif
-
 using namespace std;
 
-static bool is_ogg_file(Gosu::Reader reader)
-{
-    if (reader.resource().size() < 4) return false;
-    
-    char bytes[4];
-    reader.read(bytes, 4);
-    return bytes[0] == 'O' && bytes[1] == 'g' && bytes[2] == 'g' && bytes[3] == 'S';
-}
-
-static bool is_ogg_file(const string& filename)
-{
-    Gosu::File file(filename);
-    return is_ogg_file(file.front_reader());
-}
-
 static Gosu::Song* cur_song = nullptr;
 static bool cur_song_looping;
 
-struct Gosu::Sample::SampleData
+struct Gosu::Sample::Impl
 {
     ALuint buffer;
 
-    SampleData(AudioFile&& audio_file)
+    Impl(AudioFile&& audio_file)
     {
         al_initialize();
         alGenBuffers(1, &buffer);
@@ -54,7 +28,7 @@ struct Gosu::Sample::SampleData
                      audio_file.sample_rate());
     }
     
-    ~SampleData()
+    ~Impl()
     {
         // It's hard to free things in the right order in Ruby/Gosu.
         // Make sure buffer isn't deleted after the context/device are shut down.
@@ -70,43 +44,12 @@ Gosu::Sample::Sample()
 
 Gosu::Sample::Sample(const string& filename)
 {
-    if (is_ogg_file(filename)) {
-        File file(filename);
-        data.reset(new SampleData(OggFile(file.front_reader())));
-        return;
-    }
-    
-#ifdef GOSU_IS_MAC
-    File file(filename);
-    data.reset(new SampleData(AudioToolboxFile(file.front_reader())));
-#else
-    try {
-        data.reset(new SampleData(SndFile(filename)));
-    }
-    catch (const runtime_error& ex) {
-        File file(filename);
-        data.reset(new SampleData(MPEGFile(file.front_reader())));
-    }
-#endif
+    pimpl.reset(new Impl(AudioFile(filename)));
 }
 
 Gosu::Sample::Sample(Gosu::Reader reader)
 {
-    if (is_ogg_file(reader)) {
-        data.reset(new SampleData(OggFile(reader)));
-        return;
-    }
-
-#ifdef GOSU_IS_MAC
-    data.reset(new SampleData(AudioToolboxFile(reader)));
-#else
-    try {
-        data.reset(new SampleData(SndFile(reader)));
-    }
-    catch (const runtime_error& ex) {
-        data.reset(new SampleData(MPEGFile(reader)));
-    }
-#endif
+    pimpl.reset(new Impl(AudioFile(reader)));
 }
 
 Gosu::Channel Gosu::Sample::play(double volume, double speed, bool looping) const
@@ -116,7 +59,7 @@ Gosu::Channel Gosu::Sample::play(double volume, double speed, bool looping) cons
 
 Gosu::Channel Gosu::Sample::play_pan(double pan, double volume, double speed, bool looping) const
 {
-    if (!data) return Channel();
+    if (!pimpl) return Channel();
 
     Channel channel = allocate_channel();
     
@@ -124,7 +67,7 @@ Gosu::Channel Gosu::Sample::play_pan(double pan, double volume, double speed, bo
     if (channel.current_channel() == NO_CHANNEL) return channel;
     
     ALuint source = al_source_for_channel(channel.current_channel());
-    alSourcei(source, AL_BUFFER, data->buffer);
+    alSourcei(source, AL_BUFFER, pimpl->buffer);
     alSource3f(source, AL_POSITION, pan * 10, 0, 0);
     alSourcef(source, AL_GAIN, max(volume, 0.0));
     alSourcef(source, AL_PITCH, speed);
@@ -133,112 +76,22 @@ Gosu::Channel Gosu::Sample::play_pan(double pan, double volume, double speed, bo
     return channel;
 }
 
-class Gosu::Song::BaseData
-{
-    BaseData(const BaseData&) = delete;
-    BaseData& operator=(const BaseData&) = delete;
-    
-    double volume_;
-
-protected:
-    BaseData() : volume_(1) {}
-    virtual void apply_volume() = 0;
-
-public:
-    virtual ~BaseData() {}
-    virtual void play(bool looping) = 0;
-    virtual void pause() = 0;
-    virtual void resume() = 0;
-    virtual bool paused() const = 0;
-    virtual void stop() = 0;
-    virtual void update() = 0;
-    
-    double volume() const
-    {
-        return volume_;
-    }
-    
-    void set_volume(double volume)
-    {
-        volume_ = clamp(volume, 0.0, 1.0);
-        apply_volume();
-    }
-};
-
-#ifdef GOSU_IS_IPHONE
-// AVAudioPlayer impl
-class Gosu::Song::ModuleData : public BaseData
-{
-    AVAudioPlayer* player;
-    
-    void apply_volume() override
-    {
-        player.volume = volume();
-    }
-    
-public:
-    ModuleData(const string& filename)
-    {
-        NSURL* URL = [NSURL fileURLWithPath:[NSString stringWithUTF8String:filename.c_str()]];
-        player = [[AVAudioPlayer alloc] initWithContentsOfURL:URL error:nil];
-    }
-    
-    void play(bool looping) override
-    {
-        if (paused()) {
-            stop();
-        }
-        player.numberOfLoops = looping ? -1 : 0;
-        [player play];
-    }
-    
-    void pause() override
-    {
-        [player pause];
-    }
-    
-    void resume() override
-    {
-        [player play];
-    }
-    
-    bool paused() const override
-    {
-        return !player.playing;
-    }
-    
-    void stop() override
-    {
-        [player stop];
-        player.currentTime = 0;
-    }
-    
-    void update() override
-    {
-    }
-};
-#endif
-
 // AudioFile impl
-class Gosu::Song::StreamData : public BaseData
+struct Gosu::Song::Impl
 {
+    double volume_ = 1.0;
     unique_ptr<AudioFile> file;
     ALuint buffers[2];
     
-    void apply_volume() override
+    void apply_volume()
     {
         alSourcef(al_source_for_songs(), AL_GAIN, max(volume(), 0.0));
     }
     
     bool stream_to_buffer(ALuint buffer)
     {
-        #ifdef GOSU_IS_IPHONE
-        static const unsigned BUFFER_SIZE = 4096 * 4;
-        #else
-        static const unsigned BUFFER_SIZE = 4096 * 8;
-        #endif
-        char audio_data[BUFFER_SIZE];
-        size_t read_bytes = file->read_data(audio_data, BUFFER_SIZE);
+        char audio_data[4096 * 8];
+        size_t read_bytes = file->read_data(audio_data, sizeof audio_data);
         if (read_bytes > 0) {
             alBufferData(buffer, file->format(), audio_data,
                          static_cast<ALsizei>(read_bytes), file->sample_rate());
@@ -247,53 +100,23 @@ class Gosu::Song::StreamData : public BaseData
     }
     
 public:
-    StreamData(const string& filename)
+    explicit Impl(const string& filename)
     {
-        if (is_ogg_file(filename)) {
-            File source_file(filename);
-            file.reset(new OggFile(source_file.front_reader()));
-        }
-        else {
-        #ifdef GOSU_IS_MAC
-            file.reset(new AudioToolboxFile(filename));
-        #else
-            try {
-                file.reset(new SndFile(filename));
-            }
-            catch (const runtime_error& ex) {
-                File source_file(filename);
-                file.reset(new MPEGFile(source_file.front_reader()));
-            }
-        #endif
-        }
-        
+        file.reset(new AudioFile(filename));
+
         al_initialize();
         alGenBuffers(2, buffers);
     }
 
-    StreamData(Reader reader)
+    explicit Impl(Reader reader)
     {
-        if (is_ogg_file(reader)) {
-            file.reset(new OggFile(reader));
-        }
-        else {
-        #ifdef GOSU_IS_MAC
-            file.reset(new AudioToolboxFile(reader));
-        #else
-            try {
-                file.reset(new SndFile(reader));
-            }
-            catch (const runtime_error& ex) {
-                file.reset(new MPEGFile(reader));
-            }
-        #endif
-        }
-        
+        file.reset(new AudioFile(reader));
+
         al_initialize();
         alGenBuffers(2, buffers);
     }
     
-    ~StreamData()
+    ~Impl()
     {
         // It's hard to free things in the right order in Ruby/Gosu.
         // Make sure buffers aren't deleted after the context/device are shut down.
@@ -302,7 +125,7 @@ public:
         alDeleteBuffers(2, buffers);
     }
     
-    void play(bool looping) override
+    void play(bool looping)
     {
         ALuint source = al_source_for_songs();
 
@@ -319,7 +142,7 @@ public:
         alSourcePlay(source);
     }
 
-    void stop() override
+    void stop()
     {
         ALuint source = al_source_for_songs();
 
@@ -338,24 +161,24 @@ public:
         file->rewind();
     }
     
-    void pause() override
+    void pause()
     {
         alSourcePause(al_source_for_songs());
     }
     
-    void resume() override
+    void resume()
     {
         alSourcePlay(al_source_for_songs());
     }
     
-    bool paused() const override
+    bool paused() const
     {
         ALint state;
         alGetSourcei(al_source_for_songs(), AL_SOURCE_STATE, &state);
         return state == AL_PAUSED;
     }
     
-    void update() override
+    void update()
     {
         ALuint source = al_source_for_songs();
 
@@ -390,24 +213,27 @@ public:
             }
         }
     }
+    
+    double volume() const
+    {
+        return volume_;
+    }
+    
+    void set_volume(double volume)
+    {
+        volume_ = clamp(volume, 0.0, 1.0);
+        apply_volume();
+    }
 };
 
 Gosu::Song::Song(const string& filename)
 {
-#ifdef GOSU_IS_IPHONE
-    if (has_extension(filename, ".mp3") ||
-            has_extension(filename, ".aac") ||
-            has_extension(filename, ".m4a")) {
-        data.reset(new ModuleData(filename));
-        return;
-    }
-#endif
-    data.reset(new StreamData(filename));
+    pimpl.reset(new Impl(filename));
 }
 
 Gosu::Song::Song(Reader reader)
 {
-    data.reset(new StreamData(reader));
+    pimpl.reset(new Impl(reader));
 }
 
 Gosu::Song::~Song()
@@ -423,7 +249,7 @@ Gosu::Song* Gosu::Song::current_song()
 void Gosu::Song::play(bool looping)
 {
     if (paused()) {
-        data->resume();
+        pimpl->resume();
     }
     
     if (cur_song && cur_song != this) {
@@ -432,7 +258,7 @@ void Gosu::Song::play(bool looping)
     }
     
     if (cur_song == nullptr) {
-        data->play(looping);
+        pimpl->play(looping);
     }
     
     cur_song = this;
@@ -442,41 +268,41 @@ void Gosu::Song::play(bool looping)
 void Gosu::Song::pause()
 {
     if (cur_song == this) {
-        data->pause();
+        pimpl->pause();
     }
 }
 
 bool Gosu::Song::paused() const
 {
-    return cur_song == this && data->paused();
+    return cur_song == this && pimpl->paused();
 }
 
 void Gosu::Song::stop()
 {
     if (cur_song == this) {
-        data->stop();
+        pimpl->stop();
         cur_song = nullptr;
     }
 }
 
 bool Gosu::Song::playing() const
 {
-    return cur_song == this && !data->paused();
+    return cur_song == this && !pimpl->paused();
 }
 
 double Gosu::Song::volume() const
 {
-    return data->volume();
+    return pimpl->volume();
 }
 
 void Gosu::Song::set_volume(double volume)
 {
-    data->set_volume(volume);
+    pimpl->set_volume(volume);
 }
 
 void Gosu::Song::update()
 {
     if (current_song()) {
-        current_song()->data->update();
+        current_song()->pimpl->update();
     }
 }