From: Jean Privat <jean@pryen.org>
Date: Mon, 14 Sep 2015 20:22:55 +0000 (-0400)
Subject: Merge: Fix Music loading bug for friendz
X-Git-Tag: v0.7.8~29
X-Git-Url: http://nitlanguage.org?hp=feea1e8bcb1e0f48b0c838569b6eed9a9d97c255

Merge: Fix Music loading bug for friendz

Added "music.ogg" to the res folder, android is aparently not able to load a .ogg from the assets.
I will investigate on the problem for a next PR

Pull-Request: #1707
Reviewed-by: Jean Privat <jean@pryen.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net>
---

diff --git a/contrib/friendz/res/raw/music.ogg b/contrib/friendz/res/raw/music.ogg
new file mode 100644
index 0000000..8dcfa3b
Binary files /dev/null and b/contrib/friendz/res/raw/music.ogg differ
diff --git a/lib/android/audio.nit b/lib/android/audio.nit
index b729219..b361b4f 100644
--- a/lib/android/audio.nit
+++ b/lib/android/audio.nit
@@ -138,7 +138,6 @@ private extern class NativeMediaPlayer in "Java" `{ android.media.MediaPlayer `}
 			self.setDataSource(fd, start_offset, length);
 			return 1;
 		}catch(Exception e) {
-			Log.e("Error loading the Media Player with a file descriptor", e.getMessage());
 			return 0;
 		}
 	`}
@@ -537,8 +536,8 @@ redef class Sound
 	end
 
 	redef fun play do
-		if self.error != null then return
 		if not is_loaded then load
+		if self.error != null then return
 		soundpool.play(soundpool_id)
 	end
 
@@ -599,8 +598,8 @@ redef class Music
 	end
 
 	redef fun play do
-		if self.error != null then return
 		if not is_loaded then load
+		if self.error != null then return
 		media_player.start
 	end