From 69bb00778e779fdaa7971811e619366459e4e4f6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexis=20Laferri=C3=A8re?= <alexis.laf@xymus.net>
Date: Sun, 28 Aug 2016 09:01:17 -0400
Subject: [PATCH] app::audio: drop the old load_sound and load_music
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>
---
 contrib/mnit_test/src/test_audio.nit |    8 ++++----
 lib/android/audio.nit                |   24 ------------------------
 lib/app/audio.nit                    |    9 ---------
 lib/linux/audio.nit                  |   12 ------------
 4 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/contrib/mnit_test/src/test_audio.nit b/contrib/mnit_test/src/test_audio.nit
index 9ef5d92..ae94e70 100644
--- a/contrib/mnit_test/src/test_audio.nit
+++ b/contrib/mnit_test/src/test_audio.nit
@@ -22,10 +22,10 @@ import android::audio
 
 redef class App
 	# Sound
-	var soundsp: Sound
+	var soundsp: Sound is noinit
 
 	# Music
-	var soundmp: Music
+	var soundmp: Music is noinit
 
 	# Sound
 	var easy_soundsp = new Sound("testsound")
@@ -47,8 +47,8 @@ redef class App
 		super
 		default_mediaplayer.looping = true
 		if test_assets then
-			soundsp = load_sound("testsound.og")
-			soundmp = load_music("xylofon.og")
+			soundsp = new Sound("testsound.og")
+			soundmp = new Music("xylofon.og")
 			soundmp.play
 		end
 		if test_ressources then
diff --git a/lib/android/audio.nit b/lib/android/audio.nit
index e985891..d1c50d4 100644
--- a/lib/android/audio.nit
+++ b/lib/android/audio.nit
@@ -658,30 +658,6 @@ redef class App
 		App_native_activity(self).setVolumeControlStream(AudioManager.STREAM_MUSIC);
 	`}
 
-	# Retrieves a sound with a soundpool in the `assets` folder using its name.
-	# Used to play short songs, can play multiple sounds simultaneously
-	redef fun load_sound(path) do
-		var fd = asset_manager.open_fd(path)
-		if not fd.is_java_null then
-			return add_to_sounds(default_soundpool.load_asset_fd(fd)).as(Sound)
-		else
-			var error = new Error("Failed to load Sound {path}")
-			return new Sound.priv_init(null, -1, default_soundpool, error)
-		end
-	end
-
-	# Retrieves a music with a media player in the `assets` folder using its name.
-	# Used to play long sounds or musics, can't play multiple sounds simultaneously
-	redef fun load_music(path) do
-		var fd = asset_manager.open_fd(path)
-		if not fd.is_java_null then
-			return add_to_sounds(default_mediaplayer.data_source_fd(fd)).as(Music)
-		else
-			var error = new Error("Failed to load music {path}")
-			return new Music.priv_init(null, default_mediaplayer, error)
-		end
-	end
-
 	# Same as `load_sound` but load the sound from the `res/raw` folder
 	fun load_sound_from_res(sound_name: String): Sound do
 		return add_to_sounds(default_soundpool.load_name(resource_manager,self.native_activity, sound_name)).as(Sound)
diff --git a/lib/app/audio.nit b/lib/app/audio.nit
index 7f22c78..761ba25 100644
--- a/lib/app/audio.nit
+++ b/lib/app/audio.nit
@@ -64,12 +64,3 @@ end
 class Music
 	super PlayableAudio
 end
-
-redef class App
-
-	# Load a sound
-	fun load_sound(name: String): Sound is abstract
-
-	# Load a music
-	fun load_music(name: String): Music is abstract
-end
diff --git a/lib/linux/audio.nit b/lib/linux/audio.nit
index 297c7e9..938333b 100644
--- a/lib/linux/audio.nit
+++ b/lib/linux/audio.nit
@@ -50,15 +50,3 @@ redef class Music
 	redef fun pause do end
 	redef fun resume do end
 end
-
-redef class App
-	redef fun load_sound(name)
-	do
-		return new Sound(name)
-	end
-
-	redef fun load_music(name)
-	do
-		return new Music(name)
-	end
-end
-- 
1.7.9.5