gosu 0.7.13.2 → 0.7.13.3

data/Gosu/Audio.hpp

@@ -37,7 +37,8 @@ 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 sounds played very long ago.
+    //! as they could accidentally refer to other sounds being played after
+    //! a very long time has passed.
 	class SampleInstance
 	{
 		int handle, extra;

data/Gosu/Font.hpp

@@ -25,22 +25,30 @@ namespace Gosu
         //! Constructs a font that can be drawn onto the graphics object.
         //! \param fontName Name of a system font, or a filename to a TTF
         //!        file (must contain '/', does not work on Linux).
-        //! \param height Height of the font, in pixels.
+        //! \param fontHeight Height of the font, in pixels.
+        //! \param fontFlags Flags used to render individual characters of
+        //!        the font.
         Font(Graphics& graphics, const std::wstring& fontName,
-            unsigned height);
+            unsigned fontHeight, unsigned fontFlags = ffBold);
         ~Font();
-
+        
+        //! Returns the name of the font that was used to create it.
+        std::wstring name() const;
+        
         //! Returns the height of the font, in pixels.
         unsigned height() const;
-
+        
+        //! Returns the flags used to create the font characters.
+        unsigned flags() const;
+        
         //! Returns the width, in pixels, the given text would occupy if drawn.
         double textWidth(const std::wstring& text, double factorX = 1) const;
-
+        
         //! Draws text so the top left corner of the text is at (x; y).
         void draw(const std::wstring& text, double x, double y, ZPos z,
             double factorX = 1, double factorY = 1,
             Color c = Colors::white, AlphaMode mode = amDefault) const;
-
+        
         //! Draws text at a position relative to (x; y).
         //! \param relX Determines where the text is drawn horizontally. If
         //! relX is 0.0, the text will be to the right of x, if it is 1.0,

data/GosuImpl/AudioSDL.cpp

@@ -120,28 +120,29 @@ struct Gosu::Sample::SampleData : boost::noncopyable
 
 Gosu::Sample::Sample(Audio& audio, const std::wstring& filename)
 {
-  if (noSound)
-    return;
-
-  Buffer buf;
-  loadFile(buf, filename);
+    if (noSound)
+        return;
 
-  // Forward.
-  Sample(audio, buf.frontReader()).data.swap(data);
+    data.reset(new SampleData);
+    // Saved locally because Mix_LoadWAV is a macro, wouldn't trust it...
+    std::string filenameUTF8 = wstringToUTF8(filename);
+    data->rep = Mix_LoadWAV(filenameUTF8.c_str());
+    if (data->rep == NULL)
+        throwLastSDLError();
 }
 
 Gosu::Sample::Sample(Audio& audio, Reader reader) {
-  if (noSound)
-    return;
+    if (noSound)
+        return;
 
-  std::size_t bufsize = reader.resource().size() - reader.position();
-  Uint8* buffer = new Uint8[bufsize];
-  reader.read(buffer, bufsize);
-  
-  data.reset(new SampleData);
-  data->rep = Mix_LoadWAV_RW(SDL_RWFromMem(buffer, bufsize), 1);
-  if (data->rep == NULL)
-    throwLastSDLError();
+    std::size_t bufsize = reader.resource().size() - reader.position();
+    Uint8* buffer = static_cast<Uint8*>(malloc(bufsize));
+    reader.read(buffer, bufsize);
+
+    data.reset(new SampleData);
+    data->rep = Mix_LoadWAV_RW(SDL_RWFromMem(buffer, bufsize), 1);
+    if (data->rep == NULL)
+        throwLastSDLError();
 }
 
 Gosu::Sample::~Sample() {
@@ -209,7 +210,7 @@ Gosu::Song::Song(Audio& audio, const std::wstring& filename)
     if (noSound)
         return;
 
-    data->music = Mix_LoadMUS(Gosu::narrow(filename).c_str());
+    data->music = Mix_LoadMUS(Gosu::wstringToUTF8(filename).c_str());
     if (data->music == NULL)
         throwLastSDLError();
 
@@ -220,7 +221,8 @@ Gosu::Song::Song(Audio &audio, Type type, Reader reader)
 : data(new BaseData)
 {
 #if 0
-    // Why oh why is LoadMUS_RW traditionally broken.
+    // This is traditionally broken in SDL_mixer. File bugs :)
+    
     std::size_t bufsize = reader.resource().size() - reader.position();
     data->buffer.resize(bufsize);
     reader.read(data->buffer.data(), bufsize);

data/GosuImpl/Graphics/DrawOp.hpp

@@ -105,7 +105,7 @@ namespace Gosu
         {
             static GLfloat spriteVertices[8];
             static GLfloat spriteTexcoords[8];
-            static boost::uint32_t spriteColors[40];
+            static boost::uint32_t spriteColors[4];
             
             // iPhone specific setup
             static bool isSetup = false;
@@ -140,7 +140,6 @@ namespace Gosu
                 if (chunk->texName() != currentTexName)
                 {
                     glBindTexture(GL_TEXTURE_2D, chunk->texName());
-                    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                 }
                 
                 double left, top, right, bottom;

data/GosuImpl/Graphics/Font.cpp

@@ -27,8 +27,9 @@ namespace
 struct Gosu::Font::Impl
 {
     Graphics* graphics;
-    wstring fontName;
+    wstring name;
     unsigned height;
+    unsigned flags;
 
     // Chunk of 2^16 characters (on Windows, there'll only be one of them).
     // IMPR: I couldn't find a way to determine the size of wchar_t at compile
@@ -53,33 +54,45 @@ struct Gosu::Font::Impl
         wstring charString(1, wc);
         if (isFormattingChar(wc))
             charString.clear(); // Don't draw formatting characters
-        unsigned charWidth = Gosu::textWidth(charString, fontName, height, ffBold);
+        unsigned charWidth = Gosu::textWidth(charString, name, height, flags);
         Bitmap bmp;
         bmp.resize(charWidth, height);
         
-        drawText(bmp, charString, 0, 0, Colors::white, fontName, height, ffBold);
+        drawText(bmp, charString, 0, 0, Colors::white, name, height, flags);
         imgPtr.reset(new Image(*graphics, bmp));
         return *imgPtr;
     }
 };
 
-Gosu::Font::Font(Graphics& graphics, const wstring& fontName, unsigned height)
+Gosu::Font::Font(Graphics& graphics, const wstring& fontName, unsigned fontHeight,
+    unsigned fontFlags)
 : pimpl(new Impl)
 {
     pimpl->graphics = &graphics;
-    pimpl->fontName = fontName;
-    pimpl->height = height * 2; // Auto-AA!
+    pimpl->name = fontName;
+    pimpl->height = fontHeight * 2; // Auto-AA!
+    pimpl->flags = fontFlags;
 }
 
 Gosu::Font::~Font()
 {
 }
 
+std::wstring Gosu::Font::name() const
+{
+    return pimpl->name;
+}
+
 unsigned Gosu::Font::height() const
 {
     return pimpl->height / 2;
 }
 
+unsigned Gosu::Font::flags() const
+{
+    return pimpl->flags;
+}
+
 double Gosu::Font::textWidth(const std::wstring& text, double factorX) const
 {
     double result = 0;

data/GosuImpl/RubyGosu.swg

@@ -416,7 +416,10 @@ namespace Gosu
     rb_eval_string("class Gosu::Window; def button_id_to_char(id); self.class.button_id_to_char(id); end; def char_to_button_id(ch); self.class.char_to_button_id(ch); end; end");
 
     // Extend Numeric with simple angle conversion methods.
-    rb_eval_string("class ::Numeric;def gosu_to_radians;(self-90)*Math::PI/180.0;end;def radians_to_gosu;self*180.0/Math::PI+90;end;end");
+    rb_eval_string("class ::Numeric; def gosu_to_radian_scale; self*Math::PI/180.0; end; end");
+    rb_eval_string("class ::Numeric; def radian_scale_to_gosu; self*180.0/Math::PI; end; end");
+    rb_eval_string("class ::Numeric; def gosu_to_radians; (self-90)*Math::PI/180.0; end; end");
+    rb_eval_string("class ::Numeric; def radians_to_gosu; self*180.0/Math::PI+90;   end; end");
     
     GosusDarkSide::oncePerTick = GosusDarkSide::yieldToOtherRubyThreads;
 %}
@@ -471,6 +474,10 @@ namespace Gosu
         $self->graphics().drawTriangle(x1, y1, c1, x2, y2, c2, x3, y3, c3,
                                        z, mode);
     }
+    /*void drawRect(double x, double y, double w, double h, Gosu::Color c,
+                  Gosu::ZPos z = 0, Gosu::AlphaMode mode = Gosu::amDefault) {
+        $self->graphics().drawRect(x, y, w, h, c, z, mode);
+    }*/
     void drawQuad(double x1, double y1, Gosu::Color c1,
                   double x2, double y2, Gosu::Color c2,
                   double x3, double y3, Gosu::Color c3,

data/GosuImpl/RubyGosuStub.mm

@@ -43,6 +43,7 @@ int main()
 
         Init_gosu();
         rb_eval_string("$LOADED_FEATURES << 'gosu.bundle'");
+        rb_eval_string("$LOADED_FEATURES << 'rubygems.rb'");
 
         return ruby_run_node(ruby_options(argc, argv)); 
     }

data/GosuImpl/WindowX.cpp

@@ -1,7 +1,7 @@
 // While (re)writing this file, I have been looking at many other libraries since all the
 // "official" documentation was horrible, at least those parts that I was able to find.
 // Kudos to the Pyglet folks (http://www.pyglet.org/) who wrote code that was much easier to
-// understand than that!
+// understand than that! --jlnr
 
 #include <Gosu/Window.hpp>
 #include <Gosu/Timing.hpp>
@@ -12,6 +12,7 @@
 #include <boost/bind.hpp>
 #include <stdexcept>
 #include <algorithm>
+#include <cstdio>
 #include <vector>
 
 #include <GL/glx.h>
@@ -94,7 +95,6 @@ struct Gosu::Window::Impl
     // Last known size
     int width, height;
 
-
     double updateInterval;
     bool fullscreen;
 
@@ -388,7 +388,7 @@ namespace
 {
     void makeCurrentContext(Display* dpy, GLXDrawable drawable, GLXContext context) {
         if (!glXMakeCurrent(dpy, drawable, context))
-            printf("glXMakeCurrent failed\n");
+            std::printf("glXMakeCurrent failed\n");
     }
 
     void releaseContext(Display* dpy, GLXContext context) {

data/Rakefile

@@ -180,7 +180,7 @@ namespace :win do
 
   desc "Build the archive #{WINDOWS_RUBY_ARCHIVE_FILENAME}"
   task :ruby_archive => [:version] do
-    files = COMMON_RUBY_FILES + ['lib/gosu.so', 'lib/fmod.dll']
+    files = COMMON_RUBY_FILES + ['lib/gosu.rb', 'lib/gosu.for_1_8.so', 'lib/gosu.for_1_9.so', 'lib/fmod.dll']
     sh "zip #{WINDOWS_RUBY_ARCHIVE_FILENAME} #{files.map { |filename| "'#{filename}'" }.join(' ')}"
   end
 
@@ -198,7 +198,7 @@ namespace :win do
   WINDOWS_SPEC = Gem::Specification.new do |s|
     apply_gemspec_defaults s
     s.platform = 'x86-mswin32-60'
-    s.files = COMMON_RUBY_FILES + ['lib/gosu.so', 'lib/fmod.dll']
+    s.files = COMMON_RUBY_FILES + ['lib/gosu.rb', 'lib/gosu.for_1_8.so', 'lib/gosu.for_1_9.so', 'lib/fmod.dll']
   end
   Rake::GemPackageTask.new(WINDOWS_SPEC) { |t| t.package_dir = 'public/windows_gem' }
 end

data/mac/Gosu.xcodeproj/jlnr.pbxuser

@@ -1,9 +1,9 @@
 // !$*UTF8*$!
 {
 	0867D690FE84028FC02AAC07 /* Project object */ = {
-		activeBuildConfigurationName = "Release with 1.9";
+		activeBuildConfigurationName = Release;
 		activeExecutable = D499E6130D06B05200BA6DEC /* RubyGosu App */;
-		activeTarget = D4CA894F0BC68B5D00A431AC /* RubyGosu Core */;
+		activeTarget = 8D07F2BC0486CC7A007CD1D0 /* Gosu */;
 		addToTargets = (
 			D459FF430BDCD23500E7F0D6 /* RubyGosu App */,
 		);
@@ -98,65 +98,30 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 263271580;
-			PBXWorkspaceStateSaveDate = 263271580;
+			PBXPerProjectTemplateStateSaveDate = 263777194;
+			PBXWorkspaceStateSaveDate = 263777194;
 		};
 		perUserProjectItems = {
-			D40821E50FAFBBE700F8E177 = D40821E50FAFBBE700F8E177 /* PBXTextBookmark */;
-			D40821E60FAFBBE700F8E177 = D40821E60FAFBBE700F8E177 /* PBXTextBookmark */;
-			D40821E70FAFBBE700F8E177 = D40821E70FAFBBE700F8E177 /* PBXTextBookmark */;
-			D40821E80FAFBBE700F8E177 = D40821E80FAFBBE700F8E177 /* PBXTextBookmark */;
-			D40821E90FAFBBE700F8E177 = D40821E90FAFBBE700F8E177 /* PBXTextBookmark */;
-			D40821EA0FAFBBE700F8E177 = D40821EA0FAFBBE700F8E177 /* PBXTextBookmark */;
-			D428EED10FB134A000576B64 /* PBXTextBookmark */ = D428EED10FB134A000576B64 /* PBXTextBookmark */;
-			D428EEE70FB1351600576B64 /* PBXTextBookmark */ = D428EEE70FB1351600576B64 /* PBXTextBookmark */;
-			D428EEE80FB1352300576B64 /* PBXTextBookmark */ = D428EEE80FB1352300576B64 /* PBXTextBookmark */;
-			D428EEF60FB1E53A00576B64 /* PBXTextBookmark */ = D428EEF60FB1E53A00576B64 /* PBXTextBookmark */;
-			D428EEF70FB1E53A00576B64 /* PBXTextBookmark */ = D428EEF70FB1E53A00576B64 /* PBXTextBookmark */;
-			D428EEF80FB1E53A00576B64 /* PBXTextBookmark */ = D428EEF80FB1E53A00576B64 /* PBXTextBookmark */;
-			D428EEF90FB1E53A00576B64 /* PBXTextBookmark */ = D428EEF90FB1E53A00576B64 /* PBXTextBookmark */;
-			D428EEFA0FB1E53A00576B64 /* PBXTextBookmark */ = D428EEFA0FB1E53A00576B64 /* PBXTextBookmark */;
-			D428EEFB0FB1E53A00576B64 /* PBXTextBookmark */ = D428EEFB0FB1E53A00576B64 /* PBXTextBookmark */;
-			D428EEFC0FB1E53A00576B64 /* PBXTextBookmark */ = D428EEFC0FB1E53A00576B64 /* PBXTextBookmark */;
-			D428EEFD0FB1E53A00576B64 /* PBXTextBookmark */ = D428EEFD0FB1E53A00576B64 /* PBXTextBookmark */;
-			D428EEFE0FB1E53A00576B64 /* PBXTextBookmark */ = D428EEFE0FB1E53A00576B64 /* PBXTextBookmark */;
-			D428EEFF0FB1E53A00576B64 /* PBXTextBookmark */ = D428EEFF0FB1E53A00576B64 /* PBXTextBookmark */;
-			D428EF000FB1E61100576B64 /* PBXBookmark */ = D428EF000FB1E61100576B64 /* PBXBookmark */;
-			D428EF010FB1E73E00576B64 /* PBXTextBookmark */ = D428EF010FB1E73E00576B64 /* PBXTextBookmark */;
-			D428EF040FB1E73E00576B64 /* PBXTextBookmark */ = D428EF040FB1E73E00576B64 /* PBXTextBookmark */;
-			D428EF070FB2065B00576B64 /* PBXTextBookmark */ = D428EF070FB2065B00576B64 /* PBXTextBookmark */;
-			D428EF080FB2065B00576B64 /* PBXTextBookmark */ = D428EF080FB2065B00576B64 /* PBXTextBookmark */;
-			D428EF090FB20F5F00576B64 /* PBXTextBookmark */ = D428EF090FB20F5F00576B64 /* PBXTextBookmark */;
-			D428EF0A0FB20F5F00576B64 /* PBXTextBookmark */ = D428EF0A0FB20F5F00576B64 /* PBXTextBookmark */;
-			D428EF0B0FB20F5F00576B64 /* PBXTextBookmark */ = D428EF0B0FB20F5F00576B64 /* PBXTextBookmark */;
-			D428EF0C0FB20F5F00576B64 /* PBXTextBookmark */ = D428EF0C0FB20F5F00576B64 /* PBXTextBookmark */;
-			D428EF0E0FB2103900576B64 /* PBXTextBookmark */ = D428EF0E0FB2103900576B64 /* PBXTextBookmark */;
-			D428EF110FB219FA00576B64 /* PBXTextBookmark */ = D428EF110FB219FA00576B64 /* PBXTextBookmark */;
-			D428EF180FB21A3C00576B64 /* PBXTextBookmark */ = D428EF180FB21A3C00576B64 /* PBXTextBookmark */;
-			D428EF200FB21A5400576B64 /* PBXTextBookmark */ = D428EF200FB21A5400576B64 /* PBXTextBookmark */;
-			D428EF210FB2271800576B64 /* PBXTextBookmark */ = D428EF210FB2271800576B64 /* PBXTextBookmark */;
-			D428EF230FB229A800576B64 /* PBXTextBookmark */ = D428EF230FB229A800576B64 /* PBXTextBookmark */;
-			D428EF240FB229E100576B64 /* PBXTextBookmark */ = D428EF240FB229E100576B64 /* PBXTextBookmark */;
-			D428EF250FB22BEE00576B64 /* PBXTextBookmark */ = D428EF250FB22BEE00576B64 /* PBXTextBookmark */;
-			D428EF280FB22C7600576B64 /* PBXTextBookmark */ = D428EF280FB22C7600576B64 /* PBXTextBookmark */;
-			D428EF2A0FB23CB100576B64 /* PBXTextBookmark */ = D428EF2A0FB23CB100576B64 /* PBXTextBookmark */;
-			D428EF2B0FB23CB100576B64 /* PBXTextBookmark */ = D428EF2B0FB23CB100576B64 /* PBXTextBookmark */;
-			D428EF2C0FB23CB100576B64 /* PBXTextBookmark */ = D428EF2C0FB23CB100576B64 /* PBXTextBookmark */;
-			D491656C0FAF7614001692E0 = D491656C0FAF7614001692E0 /* PBXTextBookmark */;
-			D491656D0FAF7614001692E0 = D491656D0FAF7614001692E0 /* PBXTextBookmark */;
-			D491656E0FAF7614001692E0 = D491656E0FAF7614001692E0 /* PBXTextBookmark */;
-			D491656F0FAF7614001692E0 = D491656F0FAF7614001692E0 /* PBXTextBookmark */;
-			D49165700FAF7614001692E0 = D49165700FAF7614001692E0 /* PBXTextBookmark */;
-			D49165710FAF7614001692E0 = D49165710FAF7614001692E0 /* PBXTextBookmark */;
-			D49165720FAF7614001692E0 = D49165720FAF7614001692E0 /* PBXTextBookmark */;
-			D49165750FAF7614001692E0 = D49165750FAF7614001692E0 /* PBXTextBookmark */;
-			D49165760FAF7614001692E0 = D49165760FAF7614001692E0 /* PBXTextBookmark */;
-			D49165770FAF7614001692E0 = D49165770FAF7614001692E0 /* PBXTextBookmark */;
-			D49165780FAF7614001692E0 = D49165780FAF7614001692E0 /* PBXTextBookmark */;
-			D49165790FAF7614001692E0 = D49165790FAF7614001692E0 /* PBXTextBookmark */;
-			D491657B0FAF7614001692E0 = D491657B0FAF7614001692E0 /* PBXTextBookmark */;
-			D491657C0FAF7614001692E0 = D491657C0FAF7614001692E0 /* PBXTextBookmark */;
-			D491657D0FAF7614001692E0 = D491657D0FAF7614001692E0 /* PBXTextBookmark */;
+			D40821E90FAFBBE700F8E177 /* PBXTextBookmark */ = D40821E90FAFBBE700F8E177 /* PBXTextBookmark */;
+			D446BAAD0FB4CB5F0097BEDB /* PBXTextBookmark */ = D446BAAD0FB4CB5F0097BEDB /* PBXTextBookmark */;
+			D4652A490FB73CEA000C613E /* PBXTextBookmark */ = D4652A490FB73CEA000C613E /* PBXTextBookmark */;
+			D4652A4E0FB73CEA000C613E /* PBXTextBookmark */ = D4652A4E0FB73CEA000C613E /* PBXTextBookmark */;
+			D4652A4F0FB73CEA000C613E /* PBXTextBookmark */ = D4652A4F0FB73CEA000C613E /* PBXTextBookmark */;
+			D4652A6D0FB74006000C613E /* PBXTextBookmark */ = D4652A6D0FB74006000C613E /* PBXTextBookmark */;
+			D4652AA30FB7472B000C613E /* PBXTextBookmark */ = D4652AA30FB7472B000C613E /* PBXTextBookmark */;
+			D4652BAF0FB86753000C613E /* PBXTextBookmark */ = D4652BAF0FB86753000C613E /* PBXTextBookmark */;
+			D4652BB00FB86753000C613E /* PBXTextBookmark */ = D4652BB00FB86753000C613E /* PBXTextBookmark */;
+			D4652BB10FB86753000C613E /* PBXTextBookmark */ = D4652BB10FB86753000C613E /* PBXTextBookmark */;
+			D4652BB50FB86753000C613E /* PBXTextBookmark */ = D4652BB50FB86753000C613E /* PBXTextBookmark */;
+			D4652BBE0FB87EBB000C613E /* PBXTextBookmark */ = D4652BBE0FB87EBB000C613E /* PBXTextBookmark */;
+			D4652BBF0FB87EBB000C613E /* PBXTextBookmark */ = D4652BBF0FB87EBB000C613E /* PBXTextBookmark */;
+			D4652BC00FB87EBB000C613E /* PBXTextBookmark */ = D4652BC00FB87EBB000C613E /* PBXTextBookmark */;
+			D4652BC20FB87EBB000C613E /* PBXTextBookmark */ = D4652BC20FB87EBB000C613E /* PBXTextBookmark */;
+			D4652BC40FB87EBB000C613E /* PBXTextBookmark */ = D4652BC40FB87EBB000C613E /* PBXTextBookmark */;
+			D497991C0FB8EBC700D893F8 /* PBXTextBookmark */ = D497991C0FB8EBC700D893F8 /* PBXTextBookmark */;
+			D497991D0FB8EBC700D893F8 /* PBXTextBookmark */ = D497991D0FB8EBC700D893F8 /* PBXTextBookmark */;
+			D497991F0FB8EBC700D893F8 /* PBXTextBookmark */ = D497991F0FB8EBC700D893F8 /* PBXTextBookmark */;
+			D49799250FB8EBC900D893F8 /* PBXTextBookmark */ = D49799250FB8EBC900D893F8 /* PBXTextBookmark */;
 		};
 		sourceControlManager = D499E6280D06B06300BA6DEC /* Source Control */;
 		userBuildSettings = {
@@ -172,46 +137,6 @@
 			sepNavVisRange = "{645, 1262}";
 		};
 	};
-	D40821E50FAFBBE700F8E177 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9CB0A8019CD005C7067 /* Graphics.hpp */;
-		name = "Graphics.hpp: 11";
-		rLen = 0;
-		rLoc = 246;
-		rType = 0;
-		vrLen = 563;
-		vrLoc = 0;
-	};
-	D40821E60FAFBBE700F8E177 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 118";
-		rLen = 0;
-		rLoc = 3635;
-		rType = 0;
-		vrLen = 601;
-		vrLoc = 3315;
-	};
-	D40821E70FAFBBE700F8E177 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 0;
-		vrLoc = 0;
-	};
-	D40821E80FAFBBE700F8E177 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9CB0A8019CD005C7067 /* Graphics.hpp */;
-		name = "Graphics.hpp: 11";
-		rLen = 0;
-		rLoc = 246;
-		rType = 0;
-		vrLen = 563;
-		vrLoc = 0;
-	};
 	D40821E90FAFBBE700F8E177 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
@@ -222,16 +147,6 @@
 		vrLen = 601;
 		vrLoc = 3315;
 	};
-	D40821EA0FAFBBE700F8E177 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 14";
-		rLen = 0;
-		rLoc = 564;
-		rType = 0;
-		vrLen = 1118;
-		vrLoc = 1372;
-	};
 	D410D6220EE9D379007740AE /* Iconv.hpp */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1012, 1340}}";
@@ -241,10 +156,10 @@
 	};
 	D410E9BF0A8019CC005C7067 /* Audio.hpp */ = {
 		uiCtxt = {
-			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{755, 121}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 6025}\";\n    s = 0;\n}";
-			sepNavIntBoundsRect = "{{0, 0}, {984, 3180}}";
-			sepNavSelRange = "{5630, 59}";
-			sepNavVisRange = "{4443, 1462}";
+			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{755, 121}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 6065}\";\n    s = 0;\n}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 3420}}";
+			sepNavSelRange = "{1070, 0}";
+			sepNavVisRange = "{540, 1252}";
 			sepNavWindowFrame = "{{38, 171}, {929, 549}}";
 		};
 	};
@@ -290,9 +205,9 @@
 	};
 	D410E9C60A8019CD005C7067 /* Color.hpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {887, 3460}}";
-			sepNavSelRange = "{149, 178}";
-			sepNavVisRange = "{55, 1460}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 3480}}";
+			sepNavSelRange = "{4865, 0}";
+			sepNavVisRange = "{4152, 730}";
 			sepNavWindowFrame = "{{15, 76}, {968, 702}}";
 		};
 	};
@@ -305,10 +220,10 @@
 	};
 	D410E9C80A8019CD005C7067 /* Font.hpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {887, 1240}}";
-			sepNavSelRange = "{2139, 0}";
-			sepNavVisRange = "{232, 2178}";
-			sepNavWindowFrame = "{{84, 184}, {968, 702}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 1400}}";
+			sepNavSelRange = "{1230, 0}";
+			sepNavVisRange = "{1593, 1203}";
+			sepNavWindowFrame = "{{84, 76}, {968, 702}}";
 		};
 	};
 	D410E9C90A8019CD005C7067 /* Fwd.hpp */ = {
@@ -337,9 +252,9 @@
 	};
 	D410E9CD0A8019CD005C7067 /* Image.hpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1002, 3060}}";
-			sepNavSelRange = "{5426, 0}";
-			sepNavVisRange = "{4112, 1592}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 3040}}";
+			sepNavSelRange = "{146, 0}";
+			sepNavVisRange = "{0, 381}";
 		};
 	};
 	D410E9CE0A8019CD005C7067 /* ImageData.hpp */ = {
@@ -419,9 +334,9 @@
 	};
 	D410E9FF0A8019FA005C7067 /* DirectoriesMac.mm */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1012, 741}}";
-			sepNavSelRange = "{345, 6}";
-			sepNavVisRange = "{634, 499}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 780}}";
+			sepNavSelRange = "{655, 0}";
+			sepNavVisRange = "{275, 707}";
 		};
 	};
 	D410EA000A8019FA005C7067 /* DirectoriesUnix.cpp */ = {
@@ -534,17 +449,17 @@
 	};
 	D410EADB0A801B00005C7067 /* Font.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1652, 2888}}";
-			sepNavSelRange = "{3554, 0}";
-			sepNavVisRange = "{0, 1454}";
-			sepNavWindowFrame = "{{227, 326}, {968, 702}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 3400}}";
+			sepNavSelRange = "{3749, 0}";
+			sepNavVisRange = "{2906, 1038}";
+			sepNavWindowFrame = "{{227, 76}, {968, 702}}";
 		};
 	};
 	D410EADC0A801B00005C7067 /* Graphics.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1012, 6900}}";
-			sepNavSelRange = "{7485, 0}";
-			sepNavVisRange = "{8355, 1178}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 7580}}";
+			sepNavSelRange = "{1472, 0}";
+			sepNavVisRange = "{965, 691}";
 			sepNavWindowFrame = "{{323, 168}, {888, 610}}";
 		};
 	};
@@ -609,383 +524,206 @@
 			sepNavVisRange = "{476, 510}";
 		};
 	};
-	D428EED10FB134A000576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 11";
-		rLen = 0;
-		rLoc = 564;
-		rType = 0;
-		vrLen = 1138;
-		vrLoc = 1316;
-	};
-	D428EEE70FB1351600576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 11";
-		rLen = 0;
-		rLoc = 564;
-		rType = 0;
-		vrLen = 807;
-		vrLoc = 1316;
+	D42BC0D00C4F840C00EBF79C /* Gosu.hpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 680}}";
+			sepNavSelRange = "{369, 0}";
+			sepNavVisRange = "{0, 941}";
+			sepNavWindowFrame = "{{84, 91}, {868, 619}}";
+		};
 	};
-	D428EEE80FB1352300576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 11";
-		rLen = 0;
-		rLoc = 564;
-		rType = 0;
-		vrLen = 807;
-		vrLoc = 1316;
+	D42D023E0F7068BC00407E60 /* AudioFmod.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 9620}}";
+			sepNavSelRange = "{4140, 93}";
+			sepNavVisRange = "{3698, 947}";
+		};
 	};
-	D428EEF60FB1E53A00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3290BD78F7200ACF014 /* RubyGosu_wrap.h */;
-		name = "RubyGosu_wrap.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 689;
-		vrLoc = 0;
+	D42D02DC0F7092DF00407E60 /* AudioFileMac.hpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1038, 2220}}";
+			sepNavSelRange = "{1258, 10}";
+			sepNavVisRange = "{1111, 1033}";
+		};
 	};
-	D428EEF70FB1E53A00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 5";
-		rLen = 5;
-		rLoc = 115;
-		rType = 0;
-		vrLen = 637;
-		vrLoc = 0;
+	D42D03430F70989100407E60 /* ALChannelManagement.hpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 1387}}";
+			sepNavSelRange = "{1793, 0}";
+			sepNavVisRange = "{1018, 1179}";
+		};
 	};
-	D428EEF80FB1E53A00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D46C2E240FAE090200A33476 /* st.c */;
-		name = "st.c: 147";
-		rLen = 0;
-		rLoc = 2793;
-		rType = 0;
-		vrLen = 442;
-		vrLoc = 2583;
+	D42DFE380F6F84DA00407E60 /* AudioOpenAL.mm */ = {
+		uiCtxt = {
+			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{1537, 1}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 12324}\";\n    s = 0;\n}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 9253}}";
+			sepNavSelRange = "{4717, 0}";
+			sepNavVisRange = "{4422, 473}";
+			sepNavWindowFrame = "{{15, -1}, {1280, 774}}";
+		};
 	};
-	D428EEF90FB1E53A00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 37";
-		rLen = 0;
-		rLoc = 1529;
-		rType = 0;
-		vrLen = 807;
-		vrLoc = 1316;
+	D446BA940FB4BDD30097BEDB /* AudioSDL.cpp */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.cpp.cpp;
+		name = AudioSDL.cpp;
+		path = /Users/jlnr/Projekte/Gosu/GosuImpl/AudioSDL.cpp;
+		sourceTree = "<absolute>";
 	};
-	D428EEFA0FB1E53A00576B64 /* PBXTextBookmark */ = {
+	D446BAAD0FB4CB5F0097BEDB /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 37";
+		fRef = D446BA940FB4BDD30097BEDB /* AudioSDL.cpp */;
+		name = "AudioSDL.cpp: 138";
 		rLen = 0;
-		rLoc = 1529;
+		rLoc = 2844;
 		rType = 0;
-		vrLen = 807;
-		vrLoc = 1316;
+		vrLen = 634;
+		vrLoc = 2339;
 	};
-	D428EEFB0FB1E53A00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D46C2E240FAE090200A33476 /* st.c */;
-		name = "st.c: 24";
-		rLen = 0;
-		rLoc = 498;
-		rType = 0;
-		vrLen = 503;
-		vrLoc = 384;
+	D459FF430BDCD23500E7F0D6 /* RubyGosu App */ = {
+		activeExec = 0;
+		executables = (
+			D499E6130D06B05200BA6DEC /* RubyGosu App */,
+		);
 	};
-	D428EEFC0FB1E53A00576B64 /* PBXTextBookmark */ = {
+	D4652A490FB73CEA000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD3290BD78F7200ACF014 /* RubyGosu_wrap.h */;
-		name = "RubyGosu_wrap.h: 1";
+		fRef = D410E9CD0A8019CD005C7067 /* Image.hpp */;
+		name = "Image.hpp: 7";
 		rLen = 0;
-		rLoc = 0;
+		rLoc = 146;
 		rType = 0;
-		vrLen = 689;
+		vrLen = 381;
 		vrLoc = 0;
 	};
-	D428EEFD0FB1E53A00576B64 /* PBXTextBookmark */ = {
+	D4652A4E0FB73CEA000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 5";
-		rLen = 5;
-		rLoc = 115;
-		rType = 0;
-		vrLen = 637;
-		vrLoc = 0;
-	};
-	D428EEFE0FB1E53A00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D46C2E240FAE090200A33476 /* st.c */;
-		name = "st.c: 147";
-		rLen = 0;
-		rLoc = 2793;
-		rType = 0;
-		vrLen = 442;
-		vrLoc = 2583;
-	};
-	D428EEFF0FB1E53A00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 1252";
+		fRef = D499E6380D06B51300BA6DEC /* DrawOp.hpp */;
+		name = "DrawOp.hpp: 109";
 		rLen = 0;
-		rLoc = 36018;
-		rType = 0;
-		vrLen = 801;
-		vrLoc = 36032;
-	};
-	D428EF000FB1E61100576B64 /* PBXBookmark */ = {
-		isa = PBXBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-	};
-	D428EF010FB1E73E00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 1251";
-		rLen = 0;
-		rLoc = 36240;
-		rType = 0;
-		vrLen = 787;
-		vrLoc = 36084;
-	};
-	D428EF040FB1E73E00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 1258";
-		rLen = 0;
-		rLoc = 36506;
-		rType = 0;
-		vrLen = 1089;
-		vrLoc = 35805;
-	};
-	D428EF070FB2065B00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 1191";
-		rLen = 19;
-		rLoc = 34295;
-		rType = 0;
-		vrLen = 849;
-		vrLoc = 33910;
-	};
-	D428EF080FB2065B00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 1402";
-		rLen = 0;
-		rLoc = 41344;
-		rType = 0;
-		vrLen = 773;
-		vrLoc = 42242;
-	};
-	D428EF090FB20F5F00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 963;
-		vrLoc = 0;
-	};
-	D428EF0A0FB20F5F00576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 5";
-		rLen = 5;
-		rLoc = 115;
+		rLoc = 3338;
 		rType = 0;
-		vrLen = 637;
-		vrLoc = 0;
+		vrLen = 1293;
+		vrLoc = 3058;
 	};
-	D428EF0B0FB20F5F00576B64 /* PBXTextBookmark */ = {
+	D4652A4F0FB73CEA000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 1";
+		fRef = D410E9CD0A8019CD005C7067 /* Image.hpp */;
+		name = "Image.hpp: 7";
 		rLen = 0;
-		rLoc = 0;
+		rLoc = 146;
 		rType = 0;
-		vrLen = 963;
+		vrLen = 381;
 		vrLoc = 0;
 	};
-	D428EF0C0FB20F5F00576B64 /* PBXTextBookmark */ = {
+	D4652A6D0FB74006000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 6";
+		fRef = D410EADC0A801B00005C7067 /* Graphics.cpp */;
+		name = "Graphics.cpp: 113";
 		rLen = 0;
-		rLoc = 149;
+		rLoc = 2685;
 		rType = 0;
-		vrLen = 686;
-		vrLoc = 0;
+		vrLen = 477;
+		vrLoc = 2520;
 	};
-	D428EF0E0FB2103900576B64 /* PBXTextBookmark */ = {
+	D4652AA30FB7472B000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 12";
+		fRef = D410EADC0A801B00005C7067 /* Graphics.cpp */;
+		name = "Graphics.cpp: 56";
 		rLen = 0;
-		rLoc = 312;
+		rLoc = 1472;
 		rType = 0;
-		vrLen = 686;
-		vrLoc = 0;
+		vrLen = 691;
+		vrLoc = 965;
 	};
-	D428EF110FB219FA00576B64 /* PBXTextBookmark */ = {
+	D4652BAF0FB86753000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 12";
+		fRef = D499E6380D06B51300BA6DEC /* DrawOp.hpp */;
+		name = "DrawOp.hpp: 11";
 		rLen = 0;
-		rLoc = 312;
+		rLoc = 243;
 		rType = 0;
-		vrLen = 686;
-		vrLoc = 0;
+		vrLen = 1107;
+		vrLoc = 709;
 	};
-	D428EF180FB21A3C00576B64 /* PBXTextBookmark */ = {
+	D4652BB00FB86753000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 16";
+		fRef = D446BA940FB4BDD30097BEDB /* AudioSDL.cpp */;
+		name = "AudioSDL.cpp: 217";
 		rLen = 0;
-		rLoc = 408;
+		rLoc = 4879;
 		rType = 0;
-		vrLen = 993;
-		vrLoc = 0;
+		vrLen = 932;
+		vrLoc = 4578;
 	};
-	D428EF200FB21A5400576B64 /* PBXTextBookmark */ = {
+	D4652BB10FB86753000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 16";
+		fRef = D4A7E9080CD377E000621B24 /* Async.cpp */;
+		name = "Async.cpp: 1";
 		rLen = 0;
-		rLoc = 408;
+		rLoc = 0;
 		rType = 0;
-		vrLen = 993;
+		vrLen = 969;
 		vrLoc = 0;
 	};
-	D428EF210FB2271800576B64 /* PBXTextBookmark */ = {
+	D4652BB50FB86753000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 16";
+		fRef = D4A7E9080CD377E000621B24 /* Async.cpp */;
+		name = "Async.cpp: 1";
 		rLen = 0;
-		rLoc = 408;
+		rLoc = 0;
 		rType = 0;
-		vrLen = 633;
+		vrLen = 969;
 		vrLoc = 0;
 	};
-	D428EF230FB229A800576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 16";
-		rLen = 0;
-		rLoc = 408;
-		rType = 0;
-		vrLen = 595;
-		vrLoc = 3115;
-	};
-	D428EF240FB229E100576B64 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 16";
-		rLen = 0;
-		rLoc = 408;
-		rType = 0;
-		vrLen = 580;
-		vrLoc = 3115;
-	};
-	D428EF250FB22BEE00576B64 /* PBXTextBookmark */ = {
+	D4652BBE0FB87EBB000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 16";
+		fRef = D410E9FF0A8019FA005C7067 /* DirectoriesMac.mm */;
+		name = "DirectoriesMac.mm: 23";
 		rLen = 0;
-		rLoc = 408;
+		rLoc = 655;
 		rType = 0;
-		vrLen = 580;
-		vrLoc = 3115;
+		vrLen = 707;
+		vrLoc = 275;
 	};
-	D428EF280FB22C7600576B64 /* PBXTextBookmark */ = {
+	D4652BBF0FB87EBB000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 16";
+		name = "RubyGosu.swg: 480";
 		rLen = 0;
-		rLoc = 408;
+		rLoc = 16685;
 		rType = 0;
-		vrLen = 580;
-		vrLoc = 3115;
+		vrLen = 1634;
+		vrLoc = 15773;
 	};
-	D428EF2A0FB23CB100576B64 /* PBXTextBookmark */ = {
+	D4652BC00FB87EBB000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 103";
+		fRef = D410E9C80A8019CD005C7067 /* Font.hpp */;
+		name = "Font.hpp: 37";
 		rLen = 0;
-		rLoc = 3407;
+		rLoc = 1230;
 		rType = 0;
-		vrLen = 580;
-		vrLoc = 3115;
+		vrLen = 1203;
+		vrLoc = 1593;
 	};
-	D428EF2B0FB23CB100576B64 /* PBXTextBookmark */ = {
+	D4652BC20FB87EBB000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */;
-		name = "RubyGosu.swg: 103";
+		fRef = D410E9FF0A8019FA005C7067 /* DirectoriesMac.mm */;
+		name = "DirectoriesMac.mm: 23";
 		rLen = 0;
-		rLoc = 3407;
+		rLoc = 655;
 		rType = 0;
-		vrLen = 580;
-		vrLoc = 3115;
+		vrLen = 707;
+		vrLoc = 275;
 	};
-	D428EF2C0FB23CB100576B64 /* PBXTextBookmark */ = {
+	D4652BC40FB87EBB000C613E /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */;
-		name = "RubyGosu_wrap.cxx: 7";
+		fRef = D410E9C80A8019CD005C7067 /* Font.hpp */;
+		name = "Font.hpp: 37";
 		rLen = 0;
-		rLoc = 362;
+		rLoc = 1230;
 		rType = 0;
-		vrLen = 924;
-		vrLoc = 0;
-	};
-	D42BC0D00C4F840C00EBF79C /* Gosu.hpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1012, 680}}";
-			sepNavSelRange = "{369, 0}";
-			sepNavVisRange = "{0, 941}";
-			sepNavWindowFrame = "{{84, 91}, {868, 619}}";
-		};
-	};
-	D42D023E0F7068BC00407E60 /* AudioFmod.cpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1012, 9740}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{2313, 758}";
-		};
-	};
-	D42D02DC0F7092DF00407E60 /* AudioFileMac.hpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1038, 2220}}";
-			sepNavSelRange = "{1258, 10}";
-			sepNavVisRange = "{1111, 1033}";
-		};
-	};
-	D42D03430F70989100407E60 /* ALChannelManagement.hpp */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1012, 1387}}";
-			sepNavSelRange = "{1793, 0}";
-			sepNavVisRange = "{1018, 1179}";
-		};
-	};
-	D42DFE380F6F84DA00407E60 /* AudioOpenAL.mm */ = {
-		uiCtxt = {
-			sepNavFolds = "{\n    c =     (\n                {\n            r = \"{1537, 1}\";\n            s = 0;\n        }\n    );\n    r = \"{0, 12324}\";\n    s = 0;\n}";
-			sepNavIntBoundsRect = "{{0, 0}, {1012, 9253}}";
-			sepNavSelRange = "{4717, 0}";
-			sepNavVisRange = "{4422, 473}";
-			sepNavWindowFrame = "{{15, -1}, {1280, 774}}";
-		};
-	};
-	D459FF430BDCD23500E7F0D6 /* RubyGosu App */ = {
-		activeExec = 0;
-		executables = (
-			D499E6130D06B05200BA6DEC /* RubyGosu App */,
-		);
+		vrLen = 1203;
+		vrLoc = 1593;
 	};
 	D46C2E070FAE090200A33476 /* array.c */ = {
 		uiCtxt = {
@@ -1189,9 +927,9 @@
 	};
 	D47BD3280BD78F7200ACF014 /* RubyGosu_wrap.cxx */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1263, 211420}}";
-			sepNavSelRange = "{362, 0}";
-			sepNavVisRange = "{0, 924}";
+			sepNavIntBoundsRect = "{{0, 0}, {1596, 209780}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 1469}";
 			sepNavWindowFrame = "{{611, 4}, {669, 774}}";
 		};
 	};
@@ -1204,9 +942,9 @@
 	};
 	D47BD32A0BD78F7200ACF014 /* RubyGosu.swg */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1012, 10860}}";
-			sepNavSelRange = "{3407, 0}";
-			sepNavVisRange = "{3115, 580}";
+			sepNavIntBoundsRect = "{{0, 0}, {1614, 10400}}";
+			sepNavSelRange = "{16685, 0}";
+			sepNavVisRange = "{15773, 1634}";
 			sepNavWindowFrame = "{{135, 73}, {1086, 705}}";
 		};
 	};
@@ -1238,155 +976,60 @@
 			sepNavVisRange = "{1339, 1194}";
 		};
 	};
-	D491656C0FAF7614001692E0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9BF0A8019CC005C7067 /* Audio.hpp */;
-		name = "Audio.hpp: 157";
-		rLen = 59;
-		rLoc = 5750;
-		rType = 0;
-		vrLen = 1462;
-		vrLoc = 4563;
-	};
-	D491656D0FAF7614001692E0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D4F07B220D934C8B00FB3D99 /* TextInput.hpp */;
-		name = "TextInput.hpp: 14";
-		rLen = 688;
-		rLoc = 239;
-		rType = 0;
-		vrLen = 1307;
-		vrLoc = 0;
-	};
-	D491656E0FAF7614001692E0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9CF0A8019CD005C7067 /* Input.hpp */;
-		name = "Input.hpp: 111";
-		rLen = 0;
-		rLoc = 2695;
-		rType = 0;
-		vrLen = 1285;
-		vrLoc = 2025;
-	};
-	D491656F0FAF7614001692E0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9D90A8019CD005C7067 /* Window.hpp */;
-		name = "Window.hpp: 33";
-		rLen = 120;
-		rLoc = 825;
-		rType = 0;
-		vrLen = 1210;
-		vrLoc = 2619;
-	};
-	D49165700FAF7614001692E0 /* PBXTextBookmark */ = {
+	D497991C0FB8EBC700D893F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D410E9D20A8019CD005C7067 /* Math.hpp */;
-		name = "Math.hpp: 58";
+		fRef = D410EADB0A801B00005C7067 /* Font.cpp */;
+		name = "Font.cpp: 147";
 		rLen = 0;
-		rLoc = 1963;
+		rLoc = 3749;
 		rType = 0;
-		vrLen = 1104;
-		vrLoc = 2215;
+		vrLen = 1038;
+		vrLoc = 2906;
 	};
-	D49165710FAF7614001692E0 /* PBXTextBookmark */ = {
+	D497991D0FB8EBC700D893F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D410E9D70A8019CD005C7067 /* Timing.hpp */;
-		name = "Timing.hpp: 1";
+		fRef = D497991E0FB8EBC700D893F8 /* WindowX.cpp */;
 		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 341;
-		vrLoc = 0;
-	};
-	D49165720FAF7614001692E0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9D60A8019CD005C7067 /* Text.hpp */;
-		name = "Text.hpp: 14";
-		rLen = 86;
-		rLoc = 232;
+		rLoc = 2147483647;
 		rType = 0;
-		vrLen = 1522;
-		vrLoc = 0;
 	};
-	D49165750FAF7614001692E0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9BF0A8019CC005C7067 /* Audio.hpp */;
-		name = "Audio.hpp: 157";
-		rLen = 59;
-		rLoc = 5750;
-		rType = 0;
-		vrLen = 1462;
-		vrLoc = 4563;
+	D497991E0FB8EBC700D893F8 /* WindowX.cpp */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.cpp.cpp;
+		name = WindowX.cpp;
+		path = /Users/jlnr/Projekte/Gosu/GosuImpl/WindowX.cpp;
+		sourceTree = "<absolute>";
 	};
-	D49165760FAF7614001692E0 /* PBXTextBookmark */ = {
+	D497991F0FB8EBC700D893F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D4F07B220D934C8B00FB3D99 /* TextInput.hpp */;
-		name = "TextInput.hpp: 14";
-		rLen = 688;
-		rLoc = 239;
-		rType = 0;
-		vrLen = 1307;
-		vrLoc = 0;
-	};
-	D49165770FAF7614001692E0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9D90A8019CD005C7067 /* Window.hpp */;
-		name = "Window.hpp: 96";
-		rLen = 0;
-		rLoc = 3333;
-		rType = 0;
-		vrLen = 1210;
-		vrLoc = 2619;
-	};
-	D49165780FAF7614001692E0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9CF0A8019CD005C7067 /* Input.hpp */;
-		name = "Input.hpp: 111";
+		fRef = D410EADB0A801B00005C7067 /* Font.cpp */;
+		name = "Font.cpp: 147";
 		rLen = 0;
-		rLoc = 2695;
+		rLoc = 3749;
 		rType = 0;
-		vrLen = 1285;
-		vrLoc = 2025;
+		vrLen = 1038;
+		vrLoc = 2906;
 	};
-	D49165790FAF7614001692E0 /* PBXTextBookmark */ = {
+	D49799250FB8EBC900D893F8 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = D410E9CB0A8019CD005C7067 /* Graphics.hpp */;
-		name = "Graphics.hpp: 53";
+		fRef = D49799260FB8EBC900D893F8 /* WindowX.cpp */;
+		name = "WindowX.cpp: 391";
 		rLen = 0;
-		rLoc = 1647;
+		rLoc = 11634;
 		rType = 0;
-		vrLen = 1037;
-		vrLoc = 0;
-	};
-	D491657B0FAF7614001692E0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9D20A8019CD005C7067 /* Math.hpp */;
-		name = "Math.hpp: 58";
-		rLen = 0;
-		rLoc = 1963;
-		rType = 0;
-		vrLen = 1104;
-		vrLoc = 2215;
+		vrLen = 923;
+		vrLoc = 11320;
 	};
-	D491657C0FAF7614001692E0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9D70A8019CD005C7067 /* Timing.hpp */;
-		name = "Timing.hpp: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 341;
-		vrLoc = 0;
-	};
-	D491657D0FAF7614001692E0 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = D410E9D60A8019CD005C7067 /* Text.hpp */;
-		name = "Text.hpp: 14";
-		rLen = 86;
-		rLoc = 232;
-		rType = 0;
-		vrLen = 1522;
-		vrLoc = 0;
+	D49799260FB8EBC900D893F8 /* WindowX.cpp */ = {
+		isa = PBXFileReference;
+		name = WindowX.cpp;
+		path = /Users/jlnr/Projekte/Gosu/GosuImpl/WindowX.cpp;
+		sourceTree = "<absolute>";
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 8740}}";
+			sepNavSelRange = "{11634, 0}";
+			sepNavVisRange = "{11320, 923}";
+		};
 	};
 	D499E6130D06B05200BA6DEC /* RubyGosu App */ = {
 		isa = PBXExecutable;
@@ -1427,9 +1070,9 @@
 	};
 	D499E6380D06B51300BA6DEC /* DrawOp.hpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1012, 5200}}";
-			sepNavSelRange = "{6307, 0}";
-			sepNavVisRange = "{6180, 748}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 5060}}";
+			sepNavSelRange = "{243, 0}";
+			sepNavVisRange = "{709, 1107}";
 			sepNavWindowFrame = "{{205, 73}, {888, 705}}";
 		};
 	};
@@ -1478,11 +1121,18 @@
 			sepNavVisRange = "{319, 1374}";
 		};
 	};
+	D4A7E9080CD377E000621B24 /* Async.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 760}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 969}";
+		};
+	};
 	D4A7E97B0CD3907D00621B24 /* Texture.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1020, 2420}}";
-			sepNavSelRange = "{1093, 0}";
-			sepNavVisRange = "{981, 473}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 2600}}";
+			sepNavSelRange = "{1460, 0}";
+			sepNavVisRange = "{849, 815}";
 			sepNavWindowFrame = "{{95, 76}, {968, 702}}";
 		};
 	};
@@ -1535,9 +1185,9 @@
 	};
 	D4BC5D6A0CC29D0F002D4236 /* Async.hpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1012, 940}}";
-			sepNavSelRange = "{199, 0}";
-			sepNavVisRange = "{0, 1061}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 1000}}";
+			sepNavSelRange = "{396, 0}";
+			sepNavVisRange = "{0, 903}";
 			sepNavWindowFrame = "{{15, 215}, {750, 558}}";
 		};
 	};
@@ -1546,9 +1196,9 @@
 	};
 	D4D8CB380BD3973400CB51A9 /* RubyGosuStub.mm */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1012, 1000}}";
-			sepNavSelRange = "{1458, 0}";
-			sepNavVisRange = "{493, 1092}";
+			sepNavIntBoundsRect = "{{0, 0}, {1012, 1020}}";
+			sepNavSelRange = "{1580, 0}";
+			sepNavVisRange = "{852, 794}";
 		};
 	};
 	D4F07B220D934C8B00FB3D99 /* TextInput.hpp */ = {