gosu 0.10.6 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7e0dac99c81c5a229672c489a3b4a7b4cadb588
-  data.tar.gz: 13fc464f740ed462b7669f27a19f912b19566692
+  metadata.gz: 59c5dceec74b7859dc96acf2a9e32f20dd3b62c3
+  data.tar.gz: 8ac26d8b8d1e74459c29e96b69079a5ba011c5df
 SHA512:
-  metadata.gz: d4d75d8e44a3dac0d7cea92e1b09d5cfe9ec100de7483992e74c6292d6223e0de2d94d28aa8a56a7bce31c1b3dab7026b48504576de9fbc5325ebb367d9ff73d
-  data.tar.gz: a5e0d9396708b8706b5f0a90f2e2ba6a3294edd7361894665253cc4918295097cf1a43400e0a5ba60941e759a78f867c8940959556a2c24786253e18c8db1ee4
+  metadata.gz: e25c8c25c6590a2e7edff4a85c6117b0713ae2777cc876960f35205f0e28b2db62dc9cf763659c092781f015dd1cce133b6d11653e1fc4825406f9a2b4e84b44
+  data.tar.gz: 5e91b843c9f632277ee54546d9c97dda40b6067ca49b6ee1cca1230c7a1b710eb0b0df9006b6903ec5a3f62d3888e5e367d88fe899da1f06945be6d57c8b509f

data/COPYING

@@ -19,4 +19,4 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
             Julian Raschke <julian@raschke.de> & contributors
-                        http://www.libgosu.org/
+                        https://www.libgosu.org/

data/Gosu/Gosu.hpp

@@ -5,7 +5,7 @@
 //!
 //! These pages serve as a reference on the C++ interface of Gosu. For a higher-level
 //! discussion of concepts and ideas behind the library, see the Wiki entries linked
-//! from the official website, http://www.libgosu.org/.
+//! from the official website, https://www.libgosu.org/.
 
 #ifndef GOSU_GOSU_HPP
 #define GOSU_GOSU_HPP

data/Gosu/Version.hpp

@@ -3,13 +3,13 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 10
-#define GOSU_POINT_VERSION 6
-#define GOSU_VERSION "0.10.6"
+#define GOSU_POINT_VERSION 7
+#define GOSU_VERSION "0.10.7"
 
 #define GOSU_COPYRIGHT_NOTICE \
     "This software uses the following third-party libraries:\n" \
     "\n" \
-    "Gosu, http://www.libgosu.org, MIT License, http://opensource.org/licenses/MIT\n" \
+    "Gosu, https://www.libgosu.org, MIT License, http://opensource.org/licenses/MIT\n" \
     "SDL 2, http://www.libsdl.org, MIT License, http://opensource.org/licenses/MIT\n" \
     "libsndfile, http://www.mega-nerd.com/libsndfile, GNU LGPL 3, http://www.gnu.org/copyleft/lesser.html\n" \
     "OpenAL Soft, http://kcat.strangesoft.net/openal.html, GNU LGPL 2, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html\n"

data/README.md

@@ -14,3 +14,7 @@ Complaints, questions, feedback?
 - Visit the [boards](https://www.libgosu.org/)
 - Try your luck in the (mostly idle) [IRC channel](https://webchat.freenode.net/?channels=gosu)
 - Or [email me](mailto:julian@raschke.de) :)
+
+[![Build Status](https://travis-ci.org/gosu/gosu.svg?branch=master)](https://travis-ci.org/gosu/gosu) Linux and OS X builds
+
+[![Build status](https://ci.appveyor.com/api/projects/status/v0liohs47jono1eq?svg=true)](https://ci.appveyor.com/project/gosu-ci/gosu) Windows builds

data/ext/gosu/extconf.rb

@@ -11,9 +11,9 @@ end
 puts 'The Gosu gem requires some libraries to be installed system-wide.'
 puts 'See the following site for a list:'
 if `uname`.chomp == "Darwin" then
-  puts 'https://github.com/jlnr/gosu/wiki/Getting-Started-on-OS-X'
+  puts 'https://github.com/gosu/gosu/wiki/Getting-Started-on-OS-X'
 else
-  puts 'https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux'
+  puts 'https://github.com/gosu/gosu/wiki/Getting-Started-on-Linux'
 end
 puts
 
@@ -134,8 +134,8 @@ end
 # inside folders, it will not find the resulting .o files during linking.
 # So we create a shim .c/.cpp file for each file that we want to compile, ensuring
 # that all .o files are built into the current directory, without any nesting.
-# TODO - would be nicer if the Rakefile would just create these shim files and
-# ship them along with the gem
+# TODO: Just move all of Gosu's source files back into a flat hierarchy again.
+# The nested directory structure has really not been worth it.
 SOURCE_FILES.each do |file|
   shim_name = file.gsub('/', '-').sub(/\.mm$/, '.cpp')
   File.open(shim_name, "w") do |shim|
@@ -143,11 +143,11 @@ SOURCE_FILES.each do |file|
   end
 end
 
-if RUBY_VERSION >= '2.0.0' then
-  # In some versions of Ruby 2.x, the $CXXFLAGS variable is ignored, and $CLAGS
-  # are not being inherited into it either. In these versions of Ruby we can
-  # modify CONFIG instead, and our changes will end up in the Makefile.
+if RUBY_VERSION >= '1.9.3' and RUBY_VERSION < '2.2.0' then
+  # In some versions of Ruby and mkmf, the $CXXFLAGS variable is badly broken.
+  # We can modify CONFIG instead, and our changes will end up in the Makefile.
   # See http://bugs.ruby-lang.org/issues/8315
+  # The lower bound was reduced to 1.9.3 here: https://github.com/gosu/gosu/issues/321
   CONFIG['CXXFLAGS'] = "#$CFLAGS #$CXXFLAGS"
 end
 

data/ext/gosu/gosu_wrap.cxx

@@ -3098,14 +3098,14 @@ bool SwigDirector_Window::tick() {
 void SwigDirector_Window::update() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_update"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("update"), 0, NULL);
 }
 
 
 void SwigDirector_Window::draw() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_draw_2"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("draw"), 0, NULL);
 }
 
 
@@ -3113,7 +3113,7 @@ bool SwigDirector_Window::needsRedraw() const {
   bool c_result ;
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_redraw?"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("needs_redraw?"), 0, NULL);
   bool swig_val;
   int swig_res = SWIG_AsVal_bool(result, &swig_val);
   if (!SWIG_IsOK(swig_res)) {
@@ -3128,7 +3128,7 @@ bool SwigDirector_Window::needsCursor() const {
   bool c_result ;
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_needs_cursor?"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("needs_cursor?"), 0, NULL);
   bool swig_val;
   int swig_res = SWIG_AsVal_bool(result, &swig_val);
   if (!SWIG_IsOK(swig_res)) {
@@ -3142,7 +3142,7 @@ bool SwigDirector_Window::needsCursor() const {
 void SwigDirector_Window::loseFocus() {
   VALUE result;
   
-  result = rb_funcall(swig_get_self(), rb_intern("protected_lose_focus"), 0, NULL);
+  result = rb_funcall(swig_get_self(), rb_intern("lose_focus"), 0, NULL);
 }
 
 
@@ -3163,7 +3163,7 @@ void SwigDirector_Window::buttonDown(Gosu::Button arg0) {
     else
     obj0 = LONG2NUM((&arg0)->id());
   }
-  result = rb_funcall(swig_get_self(), rb_intern("protected_button_down"), 1,obj0);
+  result = rb_funcall(swig_get_self(), rb_intern("button_down"), 1,obj0);
 }
 
 
@@ -3177,7 +3177,7 @@ void SwigDirector_Window::buttonUp(Gosu::Button arg0) {
     else
     obj0 = LONG2NUM((&arg0)->id());
   }
-  result = rb_funcall(swig_get_self(), rb_intern("protected_button_up"), 1,obj0);
+  result = rb_funcall(swig_get_self(), rb_intern("button_up"), 1,obj0);
 }
 
 
@@ -11342,6 +11342,11 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "Gp3Button13", SWIG_From_int(static_cast< int >(Gosu::gp3Button13)));
   rb_define_const(mGosu, "Gp3Button14", SWIG_From_int(static_cast< int >(Gosu::gp3Button14)));
   rb_define_const(mGosu, "Gp3Button15", SWIG_From_int(static_cast< int >(Gosu::gp3Button15)));
+  
+  // Call srand() so that Gosu::random() is actually random in Ruby scripts
+  std::srand(static_cast<unsigned int>(std::time(0)));
+  std::rand(); // and flush the first value
+  
   rb_define_module_function(mGosu, "disown_TextInput", VALUEFUNC(_wrap_disown_TextInput), -1);
   
   SwigClassTextInput.klass = rb_define_class_under(mGosu, "TextInput", rb_cObject);

data/src/AppleUtility.hpp

@@ -2,72 +2,27 @@
 #define GOSU_APPLEUTILITY_HPP
 
 #include <Gosu/Platform.hpp>
+#include <CoreFoundation/CoreFoundation.h>
 
 #ifdef __OBJC__
 
-#include <iostream>
-#include <ostream>
-#include <sstream>
 #include <string>
 #include <stdexcept>
-#include <objc/objc.h>
-#import <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 
-namespace Gosu
+inline static void throwOSError(OSStatus status, unsigned line)
 {
-    inline void throwOSError(OSStatus status, unsigned line)
-    {
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    @autoreleasepool {
         NSError *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:status userInfo:nil];
-        std::ostringstream str;
-        str << "Error on line " << line << " (Code " << status << "): "
-        << [[error localizedDescription] UTF8String]
-        << " (" << [[error description] UTF8String] << ")";
-        [pool release];
-        throw std::runtime_error(str.str());
+        throw std::runtime_error("Error on line " + std::to_string(line) +
+                                 " (Code " + std::to_string(status) + "): " +
+                                 error.localizedDescription.UTF8String +
+                                 " (" + error.description.UTF8String + ")");
     }
-    
-    #define CHECK_OS(status) if (!(status)) {} else Gosu::throwOSError(status, __LINE__)
-
-    template<typename T>
-    class ObjCRef
-    {
-        ObjCRef(const ObjCRef&);
-        ObjCRef& operator=(const ObjCRef&);
-        
-        T* ptr;
-        
-    public:
-        ObjCRef(T* ptr = nil)
-        : ptr(ptr) 
-        {
-        }
-        
-        ~ObjCRef() 
-        {
-            [ptr release];
-        }
-        
-        void reset(T* newPtr = nil)
-        { 
-            [ptr release]; 
-            ptr = newPtr;
-        }
-        
-        T* get() const 
-        {
-            return ptr; 
-        }
-        
-        T* obj() const
-        {
-            if (!ptr)
-                throw std::logic_error("Objective-C reference is nil");
-            return ptr;
-        }
-    };
 }
+
+#define CHECK_OS(status) do { if (status) throwOSError(status, __LINE__); } while (0)
+
 #endif
 
 namespace Gosu
@@ -75,23 +30,24 @@ namespace Gosu
     template<typename CFRefType = CFTypeRef>
     class CFRef
     {
-        CFRef(const CFRef&);
-        CFRef& operator=(const CFRef&);
-        
         CFRefType ref;
         
     public:
         CFRef(CFRefType ref)
-        :   ref(ref)
+        : ref(ref)
         {
         }
         
         ~CFRef()
         {
-            if (ref)
+            if (ref) {
                 CFRelease(ref);
+            }
         }
-        
+
+        CFRef(const CFRef&) = delete;
+        CFRef& operator=(const CFRef&) = delete;
+
         CFRefType get() const
         {
             return ref;
@@ -99,8 +55,9 @@ namespace Gosu
         
         CFRefType obj() const
         {
-            if (!ref)
+            if (!ref) {
                 throw std::logic_error("CoreFoundation reference is NULL");
+            }
             return ref;
         }
     };

data/src/Audio/Audio.cpp

@@ -58,15 +58,18 @@ namespace
 // TODO: What is this NSAutoreleasePool good for?
 #ifdef GOSU_IS_MAC
 #include "../AppleUtility.hpp"
-    #define CONSTRUCTOR_COMMON \
-        ObjCRef<NSAutoreleasePool> pool([NSAutoreleasePool new]); \
+    #define CONSTRUCTOR_BEGIN \
+        @autoreleasepool { \
         if (!alChannelManagement.get()) \
             alChannelManagement.reset(new ALChannelManagement)
+    #define CONSTRUCTOR_END \
+        }
 #else
-    #define CONSTRUCTOR_COMMON \
+    #define CONSTRUCTOR_BEGIN \
         if (!alChannelManagement.get()) \
             alChannelManagement.reset(new ALChannelManagement)
-#endif    
+    #define CONSTRUCTOR_END
+#endif
 
 Gosu::SampleInstance::SampleInstance(int handle, int extra)
 : handle(handle), extra(extra)
@@ -175,7 +178,7 @@ private:
 
 Gosu::Sample::Sample(const std::wstring& filename)
 {
-    CONSTRUCTOR_COMMON;
+    CONSTRUCTOR_BEGIN;
 
     if (isOggFile(filename))
     {
@@ -189,11 +192,13 @@ Gosu::Sample::Sample(const std::wstring& filename)
         WAVE_FILE audioFile(filename);
         data.reset(new SampleData(audioFile));
     }
+    
+    CONSTRUCTOR_END
 }
 
 Gosu::Sample::Sample(Reader reader)
 {
-    CONSTRUCTOR_COMMON;
+    CONSTRUCTOR_BEGIN;
 
     if (isOggFile(reader))
     {
@@ -205,6 +210,8 @@ Gosu::Sample::Sample(Reader reader)
         WAVE_FILE audioFile(reader);
         data.reset(new SampleData(audioFile));
     }
+    
+    CONSTRUCTOR_END
 }
 
 Gosu::SampleInstance Gosu::Sample::play(double volume, double speed,
@@ -219,7 +226,7 @@ Gosu::SampleInstance Gosu::Sample::playPan(double pan, double volume,
     std::pair<int, int> channelAndToken = alChannelManagement->reserveChannel();
     if (channelAndToken.first == ALChannelManagement::NO_FREE_CHANNEL)
         return Gosu::SampleInstance(channelAndToken.first, channelAndToken.second);
-        
+    
     ALuint source = alChannelManagement->sourceIfStillPlaying(channelAndToken.first,
                                                                   channelAndToken.second);
     assert(source != ALChannelManagement::NO_SOURCE);
@@ -272,49 +279,49 @@ public:
 // AVAudioPlayer impl
 class Gosu::Song::ModuleData : public BaseData
 {
-    ObjCRef<AVAudioPlayer> player;
+    AVAudioPlayer *player;
     
     void applyVolume()
     {
-        player.obj().volume = volume();
+        player.volume = volume();
     }
     
 public:
     ModuleData(const std::wstring& filename)
     {
         std::string utf8Filename = Gosu::wstringToUTF8(filename);
-        ObjCRef<NSString> nsFilename([[NSString alloc] initWithUTF8String:utf8Filename.c_str()]);
-        ObjCRef<NSURL> url([[NSURL alloc] initFileURLWithPath:nsFilename.obj()]);
-        player.reset([[AVAudioPlayer alloc] initWithContentsOfURL:url.obj() error:NULL]);
+        NSURL *URL = [NSURL fileURLWithPath:[NSString stringWithUTF8String:utf8Filename.c_str()]];
+        player = [[AVAudioPlayer alloc] initWithContentsOfURL:URL error:NULL];
     }
     
     void play(bool looping)
     {
-        if (paused())
+        if (paused()) {
             stop();
-        player.obj().numberOfLoops = looping ? -1 : 0;
-        [player.obj() play];
+        }
+        player.numberOfLoops = looping ? -1 : 0;
+        [player play];
     }
     
     void pause()
     {
-        [player.obj() pause];
+        [player pause];
     }
     
     void resume()
     {
-        [player.obj() play];
+        [player play];
     }
     
     bool paused() const
     {
-        return !player.obj().playing;
+        return !player.playing;
     };
     
     void stop()
     {
-        [player.obj() stop];
-        player.obj().currentTime = 0;
+        [player stop];
+        player.currentTime = 0;
     }
     
     void update()
@@ -507,16 +514,17 @@ Gosu::Song::Song(const std::wstring& filename)
     else
 #endif
     {
-        CONSTRUCTOR_COMMON;
+        CONSTRUCTOR_BEGIN;
         data.reset(new StreamData(filename));
+        CONSTRUCTOR_END
     }
 }
 
 Gosu::Song::Song(Reader reader)
 {
-    CONSTRUCTOR_COMMON;
-
+    CONSTRUCTOR_BEGIN;
     data.reset(new StreamData(reader));
+    CONSTRUCTOR_END
 }
 
 Gosu::Song::~Song()

data/src/Audio/AudioToolboxFile.hpp

@@ -29,7 +29,7 @@ namespace Gosu
         ALuint sampleRate_;
         UInt32 bytesPerFrame_;
         bool bigEndian_;
-                
+        
         static OSStatus AudioFile_ReadProc(void* inClientData, SInt64 inPosition,
             UInt32 requestCount, void* buffer, UInt32* actualCount)
         {
@@ -81,9 +81,7 @@ namespace Gosu
             
             initSeekOffset();
                 
-            format_ = clientData.mChannelsPerFrame == 1 ?
-                      AL_FORMAT_MONO16 :
-                      AL_FORMAT_STEREO16;
+            format_ = clientData.mChannelsPerFrame == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16;
         }
         
         void init()
@@ -124,26 +122,28 @@ namespace Gosu
             }
             
             if (format_ == 0 ||
-                // If format not native for OpenAL, set client data format
-                // to enable conversion
-                desc.mFormatFlags & kAudioFormatFlagIsBigEndian ||
-                desc.mFormatFlags & kAudioFormatFlagIsFloat ||
-                !(desc.mFormatFlags & kAudioFormatFlagIsSignedInteger))
-                    initClientFormatBasedOn(desc);
-            else
+                    // If format not native for OpenAL, set client data format
+                    // to enable conversion
+                    desc.mFormatFlags & kAudioFormatFlagIsBigEndian ||
+                    desc.mFormatFlags & kAudioFormatFlagIsFloat ||
+                    !(desc.mFormatFlags & kAudioFormatFlagIsSignedInteger)) {
+                initClientFormatBasedOn(desc);
+            }
+            else {
                 // Just set the old format as the client format so
                 // ExtAudioFileSeek will work for us.
                 CHECK_OS(ExtAudioFileSetProperty(file_,
                     kExtAudioFileProperty_ClientDataFormat,
                     sizeof desc, &desc));
+            }
         }
         
     public:
         AudioToolboxFile(const std::wstring& filename)
         {
-            ObjCRef<NSString> utf8Filename([[NSString alloc] initWithUTF8String:wstringToUTF8(filename).c_str()]);
-            ObjCRef<NSURL> url([[NSURL alloc] initFileURLWithPath:utf8Filename.get()]);
-            CHECK_OS(ExtAudioFileOpenURL((CFURLRef)url.get(), &file_));
+            NSString *utf8Filename = [NSString stringWithUTF8String:wstringToUTF8(filename).c_str()];
+            NSURL *URL = [NSURL fileURLWithPath:utf8Filename];
+            CHECK_OS(ExtAudioFileOpenURL((__bridge CFURLRef)URL, &file_));
             
             fileID_ = 0;
             
@@ -155,14 +155,14 @@ namespace Gosu
             buffer_.resize(reader.resource().size() - reader.position());
             reader.read(buffer_.data(), buffer_.size());
             
-            // TODO: For some reason, this fails on the iPhone with at least MP3 files.
-            // If this turns into a serious problem, the plain AudioFile API could be
-            // used which works for non-compressed formats at least.
+            // TODO: This fails on iOS with MP3 files.
+            // TODO: ^ Is the comment above still true on non-ancient iOS versions?
             
             void* clientData = &buffer_;
             CHECK_OS(AudioFileOpenWithCallbacks(clientData, AudioFile_ReadProc, 0,
                                                 AudioFile_GetSizeProc, 0, 0, &fileID_));
             CHECK_OS(ExtAudioFileWrapAudioFileID(fileID_, false, &file_));
+            
             init();
         }
         
@@ -170,8 +170,9 @@ namespace Gosu
         {
             ExtAudioFileDispose(file_);
         
-            if (fileID_)
+            if (fileID_) {
                 AudioFileClose(fileID_);
+            }
         }
         
         ALenum format() const