gosu 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e780ad64700f539c7956253b0900d69ab828562
-  data.tar.gz: bf9eea3a88a216860bac22d6cb2b16dddbe363b1
+  metadata.gz: 41378387cae1afdcfbfeab14e6adea7ad61aa1e6
+  data.tar.gz: b83153c5f9208a2a201154f012c0135f25238b3e
 SHA512:
-  metadata.gz: cae8120cd63eac622abf7a59a5c8e2735dc8d35f5c20a91f4189800d577736ff5eca92e22f1b295165f833f1dc546ada16fb3979a5c5624853242841baee4d8b
-  data.tar.gz: fee3c74049220d40390106f33f444d739b4d614bcdc253225aa6fc2445b936c0de5650c51e9bc34e3ff2c242e0e6d5a5ba782d8558eafbccfcb9f6a7b40e9b35
+  metadata.gz: fccec2f1c9755fe8133d02a4b3f2e31789681938a59a41893a6d247ff29a3fdb68d1c5848390c63dfdb490259b552cd05c2d1833cfdd11533d28d1be07817be2
+  data.tar.gz: 6542882a5ef52f9360444efe0513b3c31b51912c5c21a18be5cc76e6b1bdf223e5981755afe860cdd45383b0db1fd52cd60028f690450ed33ed25d127dfc9049

data/Gosu/Audio.hpp

@@ -11,41 +11,36 @@
 
 namespace Gosu
 {
-    //! An instance of a Sample playing. Can be used to stop sounds dynamically,
-    //! or to check if they are finished.
-    //! It is recommended that you throw away sample instances if possible,
-    //! as they could accidentally refer to other sounds being played after
-    //! a very long time has passed.
-    class SampleInstance
+    //! Sample::play returns a Channel that represents the sound currently being played.
+    //! This object can be used to stop sounds dynamically, or to check whether they have finished.
+    class Channel
     {
-        int handle, extra;
-        bool alive() const;
+        mutable int channel, token;
 
     public:
-        //! Called internally by Sample, do not use.
-        SampleInstance(int handle, int extra);
-
+        //! For internal use only.
+        Channel(int channel, int token);
+        
+        int current_channel() const;
+        
         bool playing() const;
         bool paused() const;
-        //! Pauses this instance to be resumed afterwards. It will still keep a channel filled while
-        //! paused.
+        //! Pauses this instance to be resumed afterwards.
+        //! It will still occupy an audio channel while paused.
         void pause();
         void resume();
         //! Stops this instance of a sound being played.
         //! Calling this twice, or too late, does not do any harm.
         void stop();
 
-        //! \param volume Can be anything from 0.0 (silence) to 1.0 (full
-        //! volume).
-        void change_volume(double volume);
+        //! \param volume Can be anything from 0.0 (silence) to 1.0 (full volume).
+        void set_volume(double volume);
         //! \param pan Can be anything from -1.0 (left) to 1.0 (right).
-        void change_pan(double pan);
-        //! \param speed Playback speed is only limited by FMOD's
-        //! capabilities and can accept very high or low values. Use 1.0 for
-        //! normal playback speed.
-        void change_speed(double speed);
+        void set_pan(double pan);
+        //! \param speed Use 1.0 for normal playback speed.
+        void set_speed(double speed);
     };
-
+    
     //! A sample is a short sound that is completely loaded in memory, can be
     //! played multiple times at once and offers very flexible playback
     //! parameters. Use samples for everything that's not music.
@@ -55,6 +50,9 @@ namespace Gosu
         std::shared_ptr<SampleData> data;
 
     public:
+        //! Constructs an empty sample that acts as if the song had a length of 0.
+        Sample();
+        
         //! Constructs a sample that can be played on the specified audio
         //! system and loads the sample from a file.
         explicit Sample(const std::string& filename);
@@ -69,7 +67,7 @@ namespace Gosu
         //! \param speed Playback speed is only limited by the underlying audio library,
         //! and can accept very high or low values. Use 1.0 for
         //! normal playback speed.
-        SampleInstance play(double volume = 1, double speed = 1, bool looping = false) const;
+        Channel play(double volume = 1, double speed = 1, bool looping = false) const;
 
         //! Plays the sample with panning. Even if pan is 0.0, the sample will
         //! not be as loud as if it were played by calling play() due to the
@@ -80,7 +78,7 @@ namespace Gosu
         //! \param speed Playback speed is only limited by by the underlying audio library,
         //! and can accept very high
         //! or low values. Use 1.0 for normal playback speed.
-        SampleInstance play_pan(double pan, double volume = 1, double speed = 1,
+        Channel play_pan(double pan, double volume = 1, double speed = 1,
             bool looping = false) const;
     };
 
@@ -133,7 +131,7 @@ namespace Gosu
         double volume() const;
         //! \param volume Can be anything from 0.0 (silence) to 1.0 (full
         //! volume).
-        void change_volume(double volume);
+        void set_volume(double volume);
         
         //! Called every tick by Window for management purposes.
         static void update();

data/Gosu/Graphics.hpp

@@ -32,7 +32,7 @@ namespace Gosu
         ~Graphics();
 
         void set_resolution(unsigned logical_width, unsigned logical_height,
-            double horizontal_black_bar_width = 0, double vertical_black_bar_height = 0);
+                            double black_bar_width = 0, double black_bar_height = 0);
         
         unsigned width() const;
         unsigned height() const;
@@ -75,19 +75,22 @@ namespace Gosu
         //! or end point. Please only use this for debugging purposes. Otherwise, use a quad or
         //! image to simulate lines, or contribute a better draw_line to Gosu.
         static void draw_line(double x1, double y1, Color c1,
-            double x2, double y2, Color c2,
-            ZPos z, AlphaMode mode = AM_DEFAULT);
+                              double x2, double y2, Color c2,
+                              ZPos z, AlphaMode mode = AM_DEFAULT);
 
         static void draw_triangle(double x1, double y1, Color c1,
-            double x2, double y2, Color c2,
-            double x3, double y3, Color c3,
-            ZPos z, AlphaMode mode = AM_DEFAULT);
+                                  double x2, double y2, Color c2,
+                                  double x3, double y3, Color c3,
+                                  ZPos z, AlphaMode mode = AM_DEFAULT);
 
         static void draw_quad(double x1, double y1, Color c1,
-            double x2, double y2, Color c2,
-            double x3, double y3, Color c3,
-            double x4, double y4, Color c4,
-            ZPos z, AlphaMode mode = AM_DEFAULT);
+                              double x2, double y2, Color c2,
+                              double x3, double y3, Color c3,
+                              double x4, double y4, Color c4,
+                              ZPos z, AlphaMode mode = AM_DEFAULT);
+        
+        static void draw_rect(double x, double y, double width, double height,
+                              Color c, ZPos z, AlphaMode mode = AM_DEFAULT);
 
         //! For internal use only.
         void set_physical_resolution(unsigned physical_width, unsigned physical_height);
@@ -97,7 +100,8 @@ namespace Gosu
 
         //! Turns a portion of a bitmap into something that can be drawn on a Graphics object.
         static std::unique_ptr<ImageData> create_image(const Bitmap& src,
-            unsigned src_x, unsigned src_y, unsigned src_width, unsigned src_height,
-            unsigned image_flags);
+                                                       unsigned src_x, unsigned src_y,
+                                                       unsigned src_width, unsigned src_height,
+                                                       unsigned image_flags);
     };
 }

data/Gosu/Image.hpp

@@ -17,6 +17,9 @@ namespace Gosu
         std::shared_ptr<ImageData> data_;
 
     public:
+        //! Creates an empty image. It will have a width and height of 0, and not contain anything.
+        Image();
+        
         //! Loads an image from a given filename.
         //!
         //! A color key of #ff00ff is automatically applied to BMP image files.

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 #include <string>
 
 #define GOSU_MAJOR_VERSION 0
-#define GOSU_MINOR_VERSION 12
-#define GOSU_POINT_VERSION 1
+#define GOSU_MINOR_VERSION 13
+#define GOSU_POINT_VERSION 0
 
 namespace Gosu
 {

data/lib/gosu.rb

@@ -7,14 +7,14 @@ if RUBY_PLATFORM =~ /mswin$|mingw32|mingw64|win32\-|\-win32/
   
   begin
     # Make DLLs available as shown here:
-	# https://github.com/oneclick/rubyinstaller2/wiki/For-gem-developers
+    # https://github.com/oneclick/rubyinstaller2/wiki/For-gem-developers
     require 'ruby_installer'
     RubyInstaller::Runtime.add_dll_directory(binary_path)
   rescue LoadError
     # Add this gem to the PATH on Windows so that bundled DLLs can be found.
     # When running through Ocra on Windows, we need to be careful to preserve the ENV["PATH"]
     # encoding (see #385).
-	path_encoding = ENV["PATH"].encoding
+    path_encoding = ENV["PATH"].encoding
     ENV["PATH"] = "#{binary_path.encode(path_encoding)};#{ENV["PATH"]}"
   end
   

data/lib/gosu/compat.rb

@@ -143,7 +143,7 @@ class Gosu::Window
   end
 
   # Instance methods that have been turned into module methods.
-  %w(draw_line draw_triangle draw_quad
+  %w(draw_line draw_triangle draw_quad draw_rect
      flush gl clip_to record
      transform translate rotate scale
      button_id_to_char char_to_button_id button_down?).each do |method|

data/lib/gosu/patches.rb

@@ -45,6 +45,11 @@ module Gosu
   end
 end
 
+module Gosu
+  # Backwards compatibility: Channel was called SampleInstance before Gosu 0.13.0.
+  SampleInstance = Channel
+end
+
 class Gosu::Window
   # Call Thread.pass every tick, which may or may not be necessary for friendly co-existence with
   # Ruby's Thread class.

data/lib/gosu/swig_patches.rb

@@ -30,7 +30,7 @@ class Gosu::Window
       rescue Exception => e
         # Exit the message loop naturally, then re-throw during the next tick.
         @_exception = e
-        close
+        close!
         false
       end
     end

data/rdoc/gosu.rb

@@ -506,9 +506,9 @@ module Gosu
     ##
     # Plays the sample without panning.
     #
-    # @return [SampleInstance]
-    # @param volume [Float] see {SampleInstance#volume=}
-    # @param speed [Float] see {SampleInstance#speed=}
+    # @return [Channel]
+    # @param volume [Float] see {Channel#volume=}
+    # @param speed [Float] see {Channel#speed=}
     # @param looping [true, false] whether the sample should play in a loop. If you pass true, be sure to store the return value of this method so that you can later stop the looping sound.
     #
     # @see #play_pan
@@ -517,10 +517,10 @@ module Gosu
     ##
     # Plays the sample with panning.
     #
-    # @return [SampleInstance]
-    # @param pan [Float] see {SampleInstance#pan=}
-    # @param volume [Float] see {SampleInstance#volume=}
-    # @param speed [Float] see {SampleInstance#speed=}
+    # @return [Channel]
+    # @param pan [Float] see {Channel#pan=}
+    # @param volume [Float] see {Channel#volume=}
+    # @param speed [Float] see {Channel#speed=}
     # @param looping [true, false] whether the sample should play in a loop. If you pass true, be sure to store the return value of this method so that you can later stop the looping sound.
     #
     # @see #play
@@ -528,10 +528,10 @@ module Gosu
   end
 
   ##
-  # An instance of a {Gosu::Sample} playing. Can be used to stop sounds dynamically, or to check if they are finished.
+  # {Sample#play} returns a Channel that represents the sound currently being played.
   #
-  # It is recommended to throw away sample instances as soon as possible, as holding onto them for a long time can prevent unneeded samples being properly disposed.
-  class SampleInstance
+  # This object can be used to stop sounds dynamically, or to check whether they have finished.
+  class Channel
     ##
     # Sets the playback volume, in the range [0.0; 1.0], where 0 is completely silent and 1 is full volume. Values outside of this range will be clamped to [0.0; 1.0].
     # @param [Float]

data/src/Audio.cpp

@@ -1,4 +1,4 @@
-#include "ALChannelManagement.hpp"
+#include "AudioImpl.hpp"
 #include "OggFile.hpp"
 #include <Gosu/Audio.hpp>
 #include <Gosu/Math.hpp>
@@ -8,19 +8,12 @@
 #include <cassert>
 #include <cstdlib>
 #include <algorithm>
-#include <memory>
-#include <stdexcept>
-#include <vector>
 
 #ifdef GOSU_IS_MAC
-#include <OpenAL/al.h>
-#include <OpenAL/alc.h>
 #import <Foundation/Foundation.h>
 #include "AudioToolboxFile.hpp"
 #define WAVE_FILE AudioToolboxFile
 #else
-#include <AL/al.h>
-#include <AL/alc.h>
 #include "MPEGFile.hpp"
 #include "SndFile.hpp"
 #define WAVE_FILE SndFile
@@ -32,116 +25,23 @@
 
 using namespace std;
 
-namespace
+static bool is_ogg_file(Gosu::Reader reader)
 {
-    bool is_ogg_file(Gosu::Reader reader)
-    {
-        char magic_bytes[4];
-        reader.read(magic_bytes, 4);
-        return magic_bytes[0] == 'O' && magic_bytes[1] == 'g' &&
-               magic_bytes[2] == 'g' && magic_bytes[3] == 'S';
-    }
-
-    bool is_ogg_file(const string& filename)
-    {
-        Gosu::File file(filename);
-        return is_ogg_file(file.front_reader());
-    }
-    
-    Gosu::Song* cur_song = nullptr;
-    bool cur_song_looping;
-}
-
-#ifdef GOSU_IS_MAC
-    #define CONSTRUCTOR_BEGIN \
-        @autoreleasepool { \
-        if (!al_channel_management.get()) \
-            al_channel_management.reset(new ALChannelManagement)
-    #define CONSTRUCTOR_END \
-        }
-#else
-    #define CONSTRUCTOR_BEGIN \
-        if (!al_channel_management.get()) \
-            al_channel_management.reset(new ALChannelManagement)
-    #define CONSTRUCTOR_END
-#endif
-
-Gosu::SampleInstance::SampleInstance(int handle, int extra)
-: handle(handle), extra(extra)
-{
-}
-
-bool Gosu::SampleInstance::playing() const
-{
-    ALuint source = al_channel_management->source_if_still_playing(handle, extra);
-    if (source == ALChannelManagement::NO_SOURCE) return false;
+    if (reader.resource().size() < 4) return false;
     
-    ALint state;
-    alGetSourcei(source, AL_SOURCE_STATE, &state);
-    return state == AL_PLAYING;
+    char bytes[4];
+    reader.read(bytes, 4);
+    return bytes[0] == 'O' && bytes[1] == 'g' && bytes[2] == 'g' && bytes[3] == 'S';
 }
 
-bool Gosu::SampleInstance::paused() const
+static bool is_ogg_file(const string& filename)
 {
-    ALuint source = al_channel_management->source_if_still_playing(handle, extra);
-    if (source == ALChannelManagement::NO_SOURCE) return false;
-    
-    ALint state;
-    alGetSourcei(source, AL_SOURCE_STATE, &state);
-    return state == AL_PAUSED;
+    Gosu::File file(filename);
+    return is_ogg_file(file.front_reader());
 }
 
-void Gosu::SampleInstance::pause()
-{
-    ALuint source = al_channel_management->source_if_still_playing(handle, extra);
-    if (source == ALChannelManagement::NO_SOURCE) return;
-    
-    alSourcePause(source);
-}
-
-void Gosu::SampleInstance::resume()
-{
-    ALuint source = al_channel_management->source_if_still_playing(handle, extra);
-    if (source == ALChannelManagement::NO_SOURCE) return;
-    
-    ALint state;
-    alGetSourcei(source, AL_SOURCE_STATE, &state);
-    if (state == AL_PAUSED) {
-        alSourcePlay(source);
-    }
-}
-
-void Gosu::SampleInstance::stop()
-{
-    ALuint source = al_channel_management->source_if_still_playing(handle, extra);
-    if (source == ALChannelManagement::NO_SOURCE) return;
-    
-    alSourceStop(source);
-}
-
-void Gosu::SampleInstance::change_volume(double volume)
-{
-    ALuint source = al_channel_management->source_if_still_playing(handle, extra);
-    if (source == ALChannelManagement::NO_SOURCE) return;
-    
-    alSourcef(source, AL_GAIN, max(volume, 0.0));
-}
-
-void Gosu::SampleInstance::change_pan(double pan)
-{
-    ALuint source = al_channel_management->source_if_still_playing(handle, extra);
-    if (source == ALChannelManagement::NO_SOURCE) return;
-    
-    alSource3f(source, AL_POSITION, pan * 10, 0, 0);
-}
-
-void Gosu::SampleInstance::change_speed(double speed)
-{
-    ALuint source = al_channel_management->source_if_still_playing(handle, extra);
-    if (source == ALChannelManagement::NO_SOURCE) return;
-    
-    alSourcef(source, AL_PITCH, speed);
-}
+static Gosu::Song* cur_song = nullptr;
+static bool cur_song_looping;
 
 struct Gosu::Sample::SampleData
 {
@@ -149,6 +49,7 @@ struct Gosu::Sample::SampleData
 
     SampleData(AudioFile& audio_file)
     {
+        al_initialize();
         alGenBuffers(1, &buffer);
         alBufferData(buffer, audio_file.format(), &audio_file.decoded_data().front(),
                      static_cast<ALsizei>(audio_file.decoded_data().size()),
@@ -159,24 +60,20 @@ struct Gosu::Sample::SampleData
     {
         // 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.
-        if (!al_channel_management.get()) {
-            return;
-        }
+        if (!al_initialized()) return;
 
         alDeleteBuffers(1, &buffer);
     }
-
-private:
-    SampleData(const SampleData&);
-    SampleData& operator=(const SampleData&);
 };
 
-Gosu::Sample::Sample(const string& filename)
+Gosu::Sample::Sample()
 {
-    CONSTRUCTOR_BEGIN;
+}
 
+Gosu::Sample::Sample(const string& filename)
+{
     if (is_ogg_file(filename)) {
-        Gosu::File file(filename);
+        File file(filename);
         OggFile ogg_file(file.front_reader());
         data.reset(new SampleData(ogg_file));
     }
@@ -184,62 +81,54 @@ Gosu::Sample::Sample(const string& filename)
         WAVE_FILE audio_file(filename);
         data.reset(new SampleData(audio_file));
     }
-    
-    CONSTRUCTOR_END;
 }
 
-Gosu::Sample::Sample(Reader reader)
+Gosu::Sample::Sample(Gosu::Reader reader)
 {
-    CONSTRUCTOR_BEGIN;
-
     if (is_ogg_file(reader)) {
         OggFile ogg_file(reader);
         data.reset(new SampleData(ogg_file));
+        return;
     }
-    else {
-        try {
-            WAVE_FILE audio_file(reader);
-            data.reset(new SampleData(audio_file));
-        }
-        catch (const runtime_error& ex) {
-        #ifndef GOSU_IS_MAC
-            if (string(ex.what()).find("unknown format") != string::npos) {
-                MPEGFile mpeg_file(reader);
-                data.reset(new SampleData(mpeg_file));
-            }
-            else
-        #endif
-                throw ex;
+
+    try {
+        WAVE_FILE audio_file(reader);
+        data.reset(new SampleData(audio_file));
+    }
+    catch (const runtime_error& ex) {
+    #ifndef GOSU_IS_MAC
+        if (string(ex.what()).find("unknown format") != string::npos) {
+            MPEGFile mpeg_file(reader);
+            data.reset(new SampleData(mpeg_file));
+            return;
         }
+    #endif
+        throw ex;
     }
-    
-    CONSTRUCTOR_END;
 }
 
-Gosu::SampleInstance Gosu::Sample::play(double volume, double speed, bool looping) const
+Gosu::Channel Gosu::Sample::play(double volume, double speed, bool looping) const
 {
     return play_pan(0, volume, speed, looping);
 }
 
-Gosu::SampleInstance Gosu::Sample::play_pan(double pan, double volume, double speed,
-    bool looping) const
+Gosu::Channel Gosu::Sample::play_pan(double pan, double volume, double speed, bool looping) const
 {
-    pair<int, int> channel_and_token = al_channel_management->reserve_channel();
-    if (channel_and_token.first == ALChannelManagement::NO_FREE_CHANNEL) {
-        return Gosu::SampleInstance(channel_and_token.first, channel_and_token.second);
-    }
+    if (!data) return Channel(NO_CHANNEL, 0);
+
+    Channel channel = allocate_channel();
+    
+    // Couldn't allocate a free channel.
+    if (channel.current_channel() == NO_CHANNEL) return channel;
     
-    ALuint source = al_channel_management->source_if_still_playing(channel_and_token.first,
-                                                                   channel_and_token.second);
-    assert (source != ALChannelManagement::NO_SOURCE);
+    ALuint source = al_source_for_channel(channel.current_channel());
     alSourcei(source, AL_BUFFER, data->buffer);
     alSource3f(source, AL_POSITION, pan * 10, 0, 0);
     alSourcef(source, AL_GAIN, max(volume, 0.0));
     alSourcef(source, AL_PITCH, speed);
     alSourcei(source, AL_LOOPING, looping ? AL_TRUE : AL_FALSE);
     alSourcePlay(source);
-
-    return Gosu::SampleInstance(channel_and_token.first, channel_and_token.second);
+    return channel;
 }
 
 class Gosu::Song::BaseData
@@ -267,7 +156,7 @@ public:
         return volume_;
     }
     
-    void change_volume(double volume)
+    void set_volume(double volume)
     {
         volume_ = clamp(volume, 0.0, 1.0);
         apply_volume();
@@ -336,15 +225,7 @@ class Gosu::Song::StreamData : public BaseData
     
     void apply_volume() override
     {
-        int source = lookup_source();
-        if (source != ALChannelManagement::NO_SOURCE) {
-            alSourcef(source, AL_GAIN, max(volume(), 0.0));
-        }
-    }
-    
-    int lookup_source() const
-    {
-        return al_channel_management->source_for_songs();
+        alSourcef(al_source_for_songs(), AL_GAIN, max(volume(), 0.0));
     }
     
     bool stream_to_buffer(ALuint buffer)
@@ -367,7 +248,7 @@ public:
     StreamData(const string& filename)
     {
         if (is_ogg_file(filename)) {
-            Gosu::File source_file(filename);
+            File source_file(filename);
             file.reset(new OggFile(source_file.front_reader()));
         }
         else {
@@ -377,14 +258,16 @@ public:
             catch (const runtime_error& ex) {
             #ifndef GOSU_IS_MAC
                 if (string(ex.what()).find("unknown format") != string::npos) {
-                    Gosu::File source_file(filename);
+                    File source_file(filename);
                     file.reset(new MPEGFile(source_file.front_reader()));
                 }
                 else
             #endif
-                    throw ex;
+                throw ex;
             }
         }
+        
+        al_initialize();
         alGenBuffers(2, buffers);
     }
 
@@ -404,88 +287,79 @@ public:
                 }
                 else
             #endif
-                    throw ex;
+                throw ex;
             }
         }
+        
+        al_initialize();
         alGenBuffers(2, buffers);
     }
     
     ~StreamData()
     {
-        if (al_channel_management.get()) {
-            alDeleteBuffers(2, buffers);
-        }
+        // 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.
+        if (!al_initialized()) return;
+        
+        alDeleteBuffers(2, buffers);
     }
     
     void play(bool looping) override
     {
-        int source = lookup_source();
-        if (source != ALChannelManagement::NO_SOURCE) {
-            alSource3f(source, AL_POSITION, 0, 0, 0);
-            alSourcef(source, AL_GAIN, max(volume(), 0.0));
-            alSourcef(source, AL_PITCH, 1);
-            alSourcei(source, AL_LOOPING, AL_FALSE); // need to implement this manually...
-
-            stream_to_buffer(buffers[0]);
-            stream_to_buffer(buffers[1]);
-            
-            // TODO: Not good for songs with less than two buffers full of data.
-            
-            alSourceQueueBuffers(source, 2, buffers);
-            alSourcePlay(source);
-        }
+        ALuint source = al_source_for_songs();
+
+        alSource3f(source, AL_POSITION, 0, 0, 0);
+        alSourcef(source, AL_GAIN, max(volume(), 0.0));
+        alSourcef(source, AL_PITCH, 1);
+        alSourcei(source, AL_LOOPING, AL_FALSE); // need to implement this manually...
+
+        stream_to_buffer(buffers[0]);
+        stream_to_buffer(buffers[1]);
+        
+        // TODO: Not good for songs with less than two buffers full of data.
+        alSourceQueueBuffers(source, 2, buffers);
+        alSourcePlay(source);
     }
 
     void stop() override
     {
-        int source = lookup_source();
-        if (source != ALChannelManagement::NO_SOURCE) {
-            alSourceStop(source);
-
-            ALuint buffer;
-            
-            // The number of QUEUED buffers apparently includes the number of
-            // PROCESSED ones, so getting rid of the QUEUED ones is enough.
-            
-            int queued;
-            alGetSourcei(source, AL_BUFFERS_QUEUED, &queued);
-            while (queued--) {
-                alSourceUnqueueBuffers(source, 1, &buffer);
-            }
+        ALuint source = al_source_for_songs();
+
+        alSourceStop(source);
+
+        // Unqueue all buffers for this source.
+        // The number of QUEUED buffers apparently includes the number of PROCESSED ones,
+        // so getting rid of the QUEUED ones is enough.
+        ALuint buffer;
+        int queued;
+        alGetSourcei(source, AL_BUFFERS_QUEUED, &queued);
+        while (queued--) {
+            alSourceUnqueueBuffers(source, 1, &buffer);
         }
+        
         file->rewind();
     }
     
     void pause() override
     {
-        int source = lookup_source();
-        if (source != ALChannelManagement::NO_SOURCE) {
-            alSourcePause(source);
-        }
+        alSourcePause(al_source_for_songs());
     }
     
     void resume() override
     {
-        int source = lookup_source();
-        if (source != ALChannelManagement::NO_SOURCE) {
-            alSourcePlay(source);
-        }
+        alSourcePlay(al_source_for_songs());
     }
     
     bool paused() const override
     {
-        int source = lookup_source();
-        if (source == ALChannelManagement::NO_SOURCE) {
-            return false;
-        }
         ALint state;
-        alGetSourcei(source, AL_SOURCE_STATE, &state);
+        alGetSourcei(al_source_for_songs(), AL_SOURCE_STATE, &state);
         return state == AL_PAUSED;
     }
     
     void update() override
     {
-        int source = lookup_source();
+        ALuint source = al_source_for_songs();
 
         ALuint buffer;
         int processed;
@@ -495,9 +369,7 @@ public:
         for (int i = 0; i < processed; ++i) {
             alSourceUnqueueBuffers(source, 1, &buffer);
             active = stream_to_buffer(buffer);
-            if (active) {
-                alSourceQueueBuffers(source, 1, &buffer);
-            }
+            if (active) alSourceQueueBuffers(source, 1, &buffer);
         }
         
         ALint state;
@@ -528,23 +400,16 @@ Gosu::Song::Song(const string& filename)
     if (has_extension(filename, ".mp3") ||
             has_extension(filename, ".aac") ||
             has_extension(filename, ".m4a")) {
-        CONSTRUCTOR_BEGIN;
         data.reset(new ModuleData(filename));
-        CONSTRUCTOR_END;
-        return;
     }
+    else
 #endif
-
-    CONSTRUCTOR_BEGIN;
     data.reset(new StreamData(filename));
-    CONSTRUCTOR_END;
 }
 
 Gosu::Song::Song(Reader reader)
 {
-    CONSTRUCTOR_BEGIN;
     data.reset(new StreamData(reader));
-    CONSTRUCTOR_END;
 }
 
 Gosu::Song::~Song()
@@ -579,7 +444,7 @@ void Gosu::Song::play(bool looping)
 void Gosu::Song::pause()
 {
     if (cur_song == this) {
-        data->pause(); // may be redundant
+        data->pause();
     }
 }
 
@@ -606,9 +471,9 @@ double Gosu::Song::volume() const
     return data->volume();
 }
 
-void Gosu::Song::change_volume(double volume)
+void Gosu::Song::set_volume(double volume)
 {
-    data->change_volume(volume);
+    data->set_volume(volume);
 }
 
 void Gosu::Song::update()