From f2cb9637ec808aedde1b48eb8c0c4eccb51b2cb4 Mon Sep 17 00:00:00 2001
From: Viktor Lidholt <viktorl@google.com>
Date: Thu, 13 Aug 2015 15:48:13 -0700
Subject: [PATCH] Rename SoundCompleteCallback to SoundEffectStreamCallback

---
 examples/game/lib/sound.dart | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/game/lib/sound.dart b/examples/game/lib/sound.dart
index 80798696689..5794837d7a6 100644
--- a/examples/game/lib/sound.dart
+++ b/examples/game/lib/sound.dart
@@ -3,7 +3,7 @@ part of sprites;
 // TODO: The sound effects should probably use Android's SoundPool instead of
 // MediaPlayer as it is more efficient and flexible for playing back sound effects
 
-typedef void SoundCompleteCallback();
+typedef void SoundEffectStreamCallback(SoundEffectStream);
 
 class SoundEffect {
   SoundEffect(this._url);
@@ -26,7 +26,7 @@ class SoundEffectStream {
     this.volume,
     this.pitch,
     this.pan,
-    this.callback
+    this.onSoundComplete
   );
 
   // TODO: Make these properties work
@@ -40,20 +40,20 @@ class SoundEffectStream {
 
   // TODO: Implement completion callback. On completion, sounds should
   // also be removed from the list of playing sounds.
-  SoundCompleteCallback callback;
+  SoundEffectStreamCallback onSoundComplete;
 
   MediaPlayerProxy _player;
 }
 
-SoundEffectPlayer _sharedSoundPool;
+SoundEffectPlayer _sharedSoundEffectPlayer;
 
 class SoundEffectPlayer {
 
   static SoundEffectPlayer sharedInstance() {
-    if (_sharedSoundPool == null) {
-      _sharedSoundPool = new SoundEffectPlayer();
+    if (_sharedSoundEffectPlayer == null) {
+      _sharedSoundEffectPlayer = new SoundEffectPlayer();
     }
-    return _sharedSoundPool;
+    return _sharedSoundEffectPlayer;
   }
 
   SoundEffectPlayer() {
@@ -92,7 +92,7 @@ class SoundEffectPlayer {
       double volume = 1.0,
       double pitch = 1.0,
       double pan = 0.0,
-      SoundCompleteCallback callback = null]) {
+      SoundEffectStreamCallback callback = null]) {
 
     // Create new PlayingSound object
     SoundEffectStream playingSound = new SoundEffectStream(