gosu 0.7.33 → 0.7.35

data/lib/gosu.rb

@@ -1,16 +1,18 @@
 require 'rbconfig'
 
-begin
-  if defined? RUBY_VERSION and RUBY_VERSION[0..2] == '1.9' then
-    version = '1_9'
-  else
-    version = '1_8'
-  end
-  require "#{File.dirname(__FILE__)}/gosu.for_#{version}.#{Config::CONFIG['DLEXT']}"
-  require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
-rescue LoadError => e
-  require "#{File.dirname(__FILE__)}/gosu.#{Config::CONFIG['DLEXT']}"
-  require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
+WINDOWS_HINTS = %w(-win32 win32- mswin mingw32)
+
+if defined? RUBY_PLATFORM and WINDOWS_HINTS.any? { |hint| RUBY_PLATFORM.include? hint } then
+  ENV['PATH'] = "#{File.dirname(__FILE__)};#{ENV['PATH']}"
+end
+
+if File.exist? "#{File.dirname(__FILE__)}/gosu.#{Config::CONFIG['DLEXT']}"
+  require "gosu.#{Config::CONFIG['DLEXT']}"
+elsif defined? RUBY_VERSION and RUBY_VERSION.split('.')[1].to_i > 8 then
+  require "gosu.for_1_9.#{Config::CONFIG['DLEXT']}"
+else
+  require "gosu.for_1_8.#{Config::CONFIG['DLEXT']}"
 end
 
-require "#{File.dirname(__FILE__)}/gosu/patches.rb"
+require "gosu/swig_patches"
+require "gosu/patches"

data/linux/extconf.rb

@@ -18,7 +18,6 @@ BASE_FILES = %w(
   FileUnix.cpp
   Graphics/Bitmap.cpp
   Graphics/BitmapColorKey.cpp
-  Graphics/BitmapFreeImage.cpp
   Graphics/BitmapUtils.cpp
   Graphics/BlockAllocator.cpp
   Graphics/Color.cpp
@@ -50,6 +49,7 @@ MAC_FILES = %w(
 
 LINUX_FILES = %w(
   Audio/AudioSDL.cpp
+  Graphics/BitmapFreeImage.cpp
   Graphics/TextUnix.cpp
   InputX.cpp
   TextInputX.cpp
@@ -64,12 +64,13 @@ $INCFLAGS << " -I../ -I../GosuImpl"
 if `uname`.chomp == 'Darwin' then
   SOURCE_FILES = BASE_FILES + MAC_FILES
   
-  # The X11 paths are here because Apple curiously distributes libpng only inside X11
-  $INCFLAGS << " -I/usr/local/include -I/usr/X11/include"
-  $CFLAGS   << " -x objective-c++ -fobjc-gc" # Never hurts!
-  $LDFLAGS  << " -L/usr/local/lib -L/usr/X11/lib -logg -lvorbis -lvorbisfile -liconv"
+  # Apple curiously distributes libpng only inside X11
+  $INCFLAGS << " -I/usr/X11/include"
+  # To make everything work with the Objective C runtime
+  $CFLAGS   << " -x objective-c++ -fobjc-gc"
+  $LDFLAGS  << " -L/usr/X11/lib -logg -lvorbis -lvorbisfile -liconv"
   %w(AudioToolbox IOKit OpenAL OpenGL AppKit ApplicationServices Foundation Carbon).each do |f|
-    $INCFLAGS << " -framework #{f}"
+    #$INCFLAGS << " -framework #{f}" <- not necessary? I only get lots of warnings
     $LDFLAGS  << " -framework #{f}"
   end
 
@@ -92,6 +93,10 @@ else
   have_header('SDL_ttf.h') if have_library('SDL_ttf', 'TTF_RenderUTF8_Blended')
   have_header('gl.h') if have_library('GL', 'glMatrixMode')
   have_header('FreeImage.h') if have_library('freeimage', 'FreeImage_ConvertFromRawBits')
+  have_header('vorbisfile.h') if have_library('vorbisfile', 'ov_open_callbacks')
+  have_header('AL/al.h') if have_library('openal')
+  have_header('sndfile.h') if have_library('sndfile')
+  have_header('X11/extensions/Xdamage.h')
 end
 
 # Copy all relevant C++ files into the current directory

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 65
+  hash: 69
   prerelease: 
   segments: 
   - 0
   - 7
-  - 33
-  version: 0.7.33
+  - 35
+  version: 0.7.35
 platform: ruby
 authors: 
 - Julian Raschke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 Z
+date: 2011-08-12 00:00:00 Z
 dependencies: []
 
 description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and Ruby-OpenGL.\n"
@@ -55,6 +55,7 @@ files:
 - Gosu/Text.hpp
 - Gosu/TextInput.hpp
 - Gosu/Timing.hpp
+- Gosu/TR1.hpp
 - Gosu/Utility.hpp
 - Gosu/Version.hpp
 - Gosu/Window.hpp
@@ -86,12 +87,13 @@ files:
 - examples/media/Starfighter.bmp
 - GosuImpl/Async.cpp
 - GosuImpl/Audio/ALChannelManagement.hpp
-- GosuImpl/Audio/AudioAudiere.cpp
 - GosuImpl/Audio/AudioFile.hpp
+- GosuImpl/Audio/AudioOpenAL.cpp
 - GosuImpl/Audio/AudioOpenAL.mm
 - GosuImpl/Audio/AudioSDL.cpp
 - GosuImpl/Audio/AudioToolboxFile.hpp
 - GosuImpl/Audio/OggFile.hpp
+- GosuImpl/Audio/SndFile.hpp
 - GosuImpl/DirectoriesMac.mm
 - GosuImpl/DirectoriesTouch.mm
 - GosuImpl/DirectoriesUnix.cpp
@@ -146,7 +148,6 @@ files:
 - GosuImpl/Orientation.hpp
 - GosuImpl/Orientation.mm
 - GosuImpl/RubyGosu.swg
-- GosuImpl/RubyGosu_DllMain.cxx
 - GosuImpl/RubyGosu_SWIG_GC_PATCH.patch
 - GosuImpl/RubyGosu_SWIG_RENAME_PATCH.patch
 - GosuImpl/RubyGosu_SWIG_TYPE_PATCH.patch
@@ -205,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - See https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux
 rubyforge_project: 
-rubygems_version: 1.8.4
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: 2D game development library.

data/GosuImpl/Audio/AudioAudiere.cpp

@@ -1,448 +0,0 @@
-#include <Gosu/Audio.hpp>
-#include <Gosu/Math.hpp>
-#include <Gosu/IO.hpp>
-#include <Gosu/Utility.hpp>
-#include <boost/foreach.hpp>
-#include <algorithm>
-#include <stdexcept>
-#include <vector>
-
-#include <audiere.h>
-using namespace audiere;
-
-namespace Gosu
-{
-    namespace
-    {
-        Song* curSong = 0;
-        
-        // Gosu::Buffer-based implementation of Audiere's File interface.
-        // Provided since Audiere uses stdio to open files, which may not support Unicode
-        // filenames outside of the current codepage on Windows(?).
-        class MemoryBuffer : boost::noncopyable
-        {
-            Gosu::Buffer buffer;
-            FilePtr file;
-
-        public:
-            MemoryBuffer(Gosu::Reader reader)
-            {
-                buffer.resize(reader.resource().size() - reader.position());
-                reader.read(buffer.data(), buffer.size());
-                file = audiere::CreateMemoryFile(buffer.data(), buffer.size());
-            }
-
-            MemoryBuffer(const std::wstring& filename)
-            {
-                Gosu::loadFile(buffer, filename);
-                file = audiere::CreateMemoryFile(buffer.data(), buffer.size());
-            }
-
-            operator const FilePtr&()
-            {
-                return file;
-            }
-        };
-
-        class StreamRegistry : public RefImplementation<StopCallback>, boost::noncopyable
-        {
-            struct NumberedStream
-            {
-                int extra;
-                OutputStreamPtr stream;
-            };
-            std::vector<NumberedStream> streams;
-            
-            ADR_METHOD(void) streamStopped(StopEvent* event)
-            {
-                if (event->getReason() == StopEvent::STREAM_ENDED)
-                    BOOST_FOREACH (NumberedStream& stream, streams)
-                        if (stream.stream == event->getOutputStream())
-                        {
-                            stream.stream = 0;
-                            break;
-                        }
-            }
-
-        public:
-            StreamRegistry()
-            {
-                streams.reserve(100);
-            }
-            
-            OutputStreamPtr get(int handle, int extra) const
-            {
-                if (handle < streams.size() && streams[handle].extra == extra)
-                    return streams[handle].stream;
-                return OutputStreamPtr();
-            }
-            
-            void put(OutputStreamPtr stream, int& handle, int& extra)
-            {
-                handle = 0;
-                for (handle; handle < streams.size(); ++handle)
-                    if (!streams[handle].stream)
-                    {
-                        streams[handle].stream = stream;
-                        extra = ++streams[handle].extra;
-                        return;
-                    }
-                // handle == streams.size() <3  
-                NumberedStream newStream = { extra = 0, stream };
-                streams.push_back(newStream);
-            }
-            
-            void clear(int handle)
-            {
-                streams.at(handle).stream = 0;
-            }
-        };
-        
-        // Intentionally leak. Let Windows clean up on program exit.
-        StreamRegistry& streams = *(new StreamRegistry);
-
-        // Since audiere::OpenDevice is (contains) the first call to audiere.dll, we wrap
-        // the call in error handling code to see if the lazily linked DLL is there.
-        bool getDevice(AudioDevice*& device)
-        {
-            #ifdef GOSU_IS_WIN
-            // Copied and pasted from MSDN.
-            #define FACILITY_VISUALCPP  ((LONG)0x6d)
-            #define VcppException(sev,err)  ((sev) | (FACILITY_VISUALCPP<<16) | err)
-            #define BAD_MOD VcppException(ERROR_SEVERITY_ERROR, ERROR_MOD_NOT_FOUND)
-            
-            __try
-            {
-            #endif
-                return (device = OpenDevice());
-            #ifdef GOSU_IS_WIN
-            }
-            __except ((GetExceptionCode() == BAD_MOD) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
-            {
-                return false;
-            }
-            #undef BAD_MOD
-            #undef VcppException
-            #undef FACILITY_VISUALCPP
-            #endif
-        }
-
-        AudioDevice* device()
-        {
-            static AudioDevice* device = 0;
-            if (device == 0)
-            {
-                if (!getDevice(device))
-                    throw std::runtime_error("Could not initialize audiere or library not found");
-
-                device->registerCallback(&streams);
-
-                // Never free. Especially important in Ruby version, where GC order is undefined
-                device->ref();
-            }
-            return device;
-        }
-    }
-}
-
-Gosu::SampleInstance::SampleInstance(int handle, int extra)
-: handle(handle), extra(extra)
-{
-}
-
-bool Gosu::SampleInstance::playing() const
-{
-    OutputStreamPtr stream = streams.get(handle, extra);
-    return stream && stream->isPlaying();
-}
-
-bool Gosu::SampleInstance::paused() const
-{
-    OutputStreamPtr stream = streams.get(handle, extra);
-    return stream && !stream->isPlaying();
-}
-
-void Gosu::SampleInstance::pause()
-{
-    if (OutputStreamPtr stream = streams.get(handle, extra))
-        stream->stop();
-}
-
-void Gosu::SampleInstance::resume()
-{
-    if (OutputStreamPtr stream = streams.get(handle, extra))
-        stream->play();
-}
-
-void Gosu::SampleInstance::stop()
-{
-    if (OutputStreamPtr stream = streams.get(handle, extra))
-        stream->stop(), streams.clear(handle);
-}
-
-void Gosu::SampleInstance::changeVolume(double volume)
-{
-    if (OutputStreamPtr stream = streams.get(handle, extra))
-        stream->setVolume(volume);
-}
-
-void Gosu::SampleInstance::changePan(double pan)
-{
-    if (OutputStreamPtr stream = streams.get(handle, extra))
-        stream->setPan(clamp<float>(pan, -1.f, +1.f));
-}
-
-void Gosu::SampleInstance::changeSpeed(double speed)
-{
-    if (OutputStreamPtr stream = streams.get(handle, extra))
-        stream->setPitchShift(clamp<float>(speed, 0.5f, 2.0f));
-}
-
-struct Gosu::Sample::SampleData : boost::noncopyable
-{
-    SampleBufferPtr buffer;
-};
-
-Gosu::Sample::Sample(const std::wstring& filename)
-:   data(new SampleData)
-{
-    device(); // Implicitly open audio device
-    
-    SampleSourcePtr source = OpenSampleSource(MemoryBuffer(filename), FF_AUTODETECT);
-    data->buffer = CreateSampleBuffer(source);
-    if (!data->buffer)
-        throw std::runtime_error("Cannot open " + wstringToUTF8(filename));
-}
-
-Gosu::Sample::Sample(Reader reader)
-{
-    device(); // Implicitly open audio device
-    
-    SampleSourcePtr source = audiere::OpenSampleSource(MemoryBuffer(reader), FF_AUTODETECT);
-    data->buffer = CreateSampleBuffer(source);
-    if (!data->buffer)
-        throw std::runtime_error("Cannot open audio file");
-}
-
-Gosu::SampleInstance Gosu::Sample::play(double volume, double speed,
-    bool looping) const
-{
-    OutputStreamPtr stream = device()->openStream(data->buffer->openStream());
-    int handle, extra;
-    streams.put(stream, handle, extra);
-
-    SampleInstance instance(handle, extra);
-    instance.changeVolume(volume);
-    instance.changeSpeed(speed);
-    stream->setRepeat(looping);
-    stream->play();
-    return instance;
-}
-
-Gosu::SampleInstance Gosu::Sample::playPan(double pan, double volume,
-    double speed, bool looping) const
-{
-    OutputStreamPtr stream = device()->openStream(data->buffer->openStream());
-    int handle, extra;
-    streams.put(stream, handle, extra);
-
-    SampleInstance instance(handle, extra);
-    instance.changePan(pan);
-    instance.changeVolume(volume);
-    instance.changeSpeed(speed);
-    stream->setRepeat(looping);
-    stream->play();
-    return instance;
-}
-
-class Gosu::Song::BaseData : boost::noncopyable
-{
-    double volume_;
-
-protected:
-    BaseData() : volume_(1) {}
-    virtual void applyVolume() = 0;
-
-public:
-    virtual ~BaseData() {}
-
-    virtual void play(bool looping) = 0;
-    virtual bool playing() const = 0;
-    virtual bool paused() const = 0;
-    virtual void pause() = 0;
-    virtual void stop() = 0;
-    
-    double volume() const
-    {
-        return volume_;
-    }
-    
-    void changeVolume(double volume)
-    {
-        volume_ = clamp(volume, 0.0, 1.0);
-        applyVolume();
-    }
-};
-
-class Gosu::Song::StreamData : public BaseData
-{
-    MemoryBuffer buffer;
-    OutputStreamPtr stream;
-    SampleInstance instance;
-    bool loop;
-
-    void init()
-    {
-        int handle, extra;
-        stream = OpenSound(device(), buffer, true);
-        if (!stream)
-            throw std::runtime_error("Cannot open audio file for streaming");
-        streams.put(stream, handle, extra);
-        instance = SampleInstance(handle, extra);
-        loop = false;
-    }
-
-public:
-    StreamData(Gosu::Reader reader)
-    :   buffer(reader), instance(-1, -1)
-    {
-        init();
-    }
-
-    StreamData(const std::wstring& filename)
-    :   buffer(filename), instance(-1, -1)
-    {
-        init();
-    }
-    
-    void play(bool looping)
-    {
-        applyVolume();
-        if (looping != loop)
-            stream->setRepeat(loop = looping);
-        stream->play();
-    }
-
-    bool playing() const
-    {
-        return instance.playing();
-    }
-
-    bool paused() const
-    {
-        return instance.paused();
-    }
-    
-    void pause()
-    {
-        instance.pause();
-    }
-    
-    void stop()
-    {
-        instance.stop();
-        stream->reset();
-    }
-    
-    void applyVolume()
-    {
-        instance.changeVolume(volume());
-    }
-};
-
-Gosu::Song::Song(const std::wstring& filename)
-: data(new StreamData(filename))
-{
-}
-
-Gosu::Song::Song(Reader reader)
-: data(new StreamData(reader))
-{
-}
-
-Gosu::Song::~Song()
-{
-}
-
-Gosu::Song* Gosu::Song::currentSong()
-{
-    if (curSong && (curSong->playing() || curSong->paused()))
-        return curSong;
-    return curSong = 0;
-}
-
-void Gosu::Song::play(bool looping)
-{
-    if (Gosu::Song* cur = currentSong())
-        if (cur != this)
-        {
-            cur->stop();
-            assert (currentSong() == 0);
-        }
-
-    data->play(looping); // May be redundant
-    curSong = this;      // May be redundant
-}
-
-void Gosu::Song::pause()
-{
-    if (curSong == this && data->playing())
-        data->pause();
-}
-
-bool Gosu::Song::paused() const
-{
-    return curSong == this && data->paused();
-}
-
-void Gosu::Song::stop()
-{
-    if (curSong == this)
-    {
-        data->stop();
-        curSong = 0;
-    }
-}
-
-bool Gosu::Song::playing() const
-{
-    assert (!(curSong != this && data->playing()));
-    return data->playing();
-}
-
-double Gosu::Song::volume() const
-{
-    return data->volume();
-}
-
-void Gosu::Song::changeVolume(double volume)
-{
-    data->changeVolume(volume);
-}
-
-void Gosu::Song::update()
-{
-    device()->update();
-}
-
-// Deprecated constructors.
-
-Gosu::Sample::Sample(Audio& audio, const std::wstring& filename)
-{
-    Sample(filename).data.swap(data);
-}
-
-Gosu::Sample::Sample(Audio& audio, Reader reader)
-{
-    Sample(reader).data.swap(data);
-}
-
-Gosu::Song::Song(Audio& audio, const std::wstring& filename)
-{
-    Song(filename).data.swap(data);
-}
-
-Gosu::Song::Song(Audio& audio, Type type, Reader reader)
-{
-    Song(reader).data.swap(data);
-}