Merge branch 'next' of https://github.com/blackberry/GamePlay into next

gameplay/src/AudioBuffer.cpp

@@ -101,6 +101,7 @@ AudioBuffer* AudioBuffer::create(const char* path)
         goto cleanup;
     }
 
+	//NOTE: loadOgg actually sets this null, so it is expected
     if (file)    
         fclose(file);
 
@@ -304,7 +305,7 @@ bool AudioBuffer::loadWav(FILE* file, ALuint buffer)
     }
 }
     
-bool AudioBuffer::loadOgg(FILE* file, ALuint buffer)
+bool AudioBuffer::loadOgg(FILE*& file, ALuint buffer)
 {
     GP_ASSERT(file);
 

gameplay/src/AudioBuffer.h

@@ -45,7 +45,7 @@ private:
     
     static bool loadWav(FILE* file, ALuint buffer);
     
-    static bool loadOgg(FILE* file, ALuint buffer);
+    static bool loadOgg(FILE*& file, ALuint buffer);
 
     std::string _filePath;
     ALuint _alBuffer;

gameplay/src/PlatformLinux.cpp

@@ -643,7 +643,6 @@ int Platform::enterMessagePump()
                         if (evt.xmotion.state & Button1Mask)
                         {
                             gameplay::Platform::touchEventInternal(gameplay::Touch::TOUCH_MOVE, evt.xmotion.x, evt.xmotion.y, 0);
-                            return 0;
                         }
                         else if (evt.xmotion.state & Button3Mask)
                         {