audio: move some services between the abstraction and the Android layers

[nit.git] / lib / app / audio.nit

diff --git a/lib/app/audio.nit b/lib/app/audio.nit
index 51c0c12..b26ae7b 100644 (file)
--- a/lib/app/audio.nit
+++ b/lib/app/audio.nit
@@ -14,61 +14,56 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# App audio abstraction
+# Services to load and play `Sound` and `Music` from the assets folder
 #
-# Once the application has started (after `App.setup`)
-# use `App.load_sound` to get a sound
-# then `Sound.play` to play it
+# Get a handle to a sound using `new Sound` or `new Music` at any time.
+# Call `load` at or after `App::on_create` or leave it to be loaded
+# on demand by the first call to `play`.
 module audio
 
 import app_base
-import standard::error
+import core::error
 
 # Platform variations
-# TODO: move on the platform once qualified names are understand in the condition
 import linux::audio is conditional(linux)
 import android::audio is conditional(android)
 
 # Abstraction of a playable Audio
 abstract class PlayableAudio
 
-       # Name of this playable audio
-       var name: String
+       init do sounds.add self
 
-       # Error which is not null if an error happened
-       var error: nullable Error = null is writable
+       # Path to the audio file in the assets folder
+       var path: String
 
-       # Is this already loaded ?
-       protected var is_loaded = false is writable
+       # Last error on this sound, if any
+       fun error: nullable Error do return null
 
-       # load this playable audio
-       fun load is abstract
+       # Load this playable audio
+       fun load do end
 
-       # Plays the sound
-       fun play is abstract
+       # Play the sound
+       fun play do end
 
-       # Pauses the sound
-       fun pause is abstract
+       # Pause the sound
+       fun pause do end
 
-       # Resumes the sound
-       fun resume is abstract
+       # Resume the sound
+       fun resume do end
 end
 
-# Abstraction of a short sound
+# Short sound
 class Sound
        super PlayableAudio
 end
 
-# Abstraction of a long song, that can bee looped
+# Long sound that can bee looped
 class Music
        super PlayableAudio
 end
 
-redef class App
+redef class Sys
 
-       # Load a sound
-       fun load_sound(name: String): Sound is abstract
-
-       # Load a music
-       fun load_music(name: String): Music is abstract
+       # All instantiated sounds
+       var sounds = new Array[PlayableAudio]
 end