Merge pull request #279 from JiepengTan/builder_443

builder#443 Simplify process to add & play sound

audio.go

@@ -90,6 +90,7 @@ type soundMgr struct {
 	audioContext *audio.Context
 	players      map[*soundPlayer]chan bool
 	playersM     sync.Mutex
+	audios       map[string]Sound
 }
 
 const (
@@ -109,6 +110,7 @@ func (p *soundMgr) init(g *Game) {
 	p.audioContext = audioContext
 	p.players = make(map[*soundPlayer]chan bool)
 	p.g = g
+	p.audios = make(map[string]Sound)
 }
 
 func (p *soundMgr) update() {

game.go

@@ -294,15 +294,6 @@ func instance(gamer reflect.Value) *Game {
 	return fld.Addr().Interface().(*Game)
 }
 
-func lookupSound(gamer reflect.Value, name string) (Sound, bool) {
-	if val := findFieldPtr(gamer, name, 0); val != nil {
-		if m, ok := val.(*Sound); ok {
-			return *m, true
-		}
-	}
-	return nil, false
-}
-
 func getFieldPtrOrAlloc(v reflect.Value, i int) (name string, val interface{}) {
 	tFld := v.Type().Field(i)
 	vFld := v.Field(i)
@@ -1201,6 +1192,10 @@ func (p *Game) ClearSoundEffects() {
 type Sound *soundConfig
 
 func (p *Game) loadSound(name string) (media Sound, err error) {
+	if media, ok := p.sounds.audios[name]; ok {
+		return media, nil
+	}
+
 	if debugLoad {
 		log.Println("==> LoadSound", name)
 	}
@@ -1210,6 +1205,7 @@ func (p *Game) loadSound(name string) (media Sound, err error) {
 		return
 	}
 	media.Path = prefix + "/" + media.Path
+	p.sounds.audios[name] = media
 	return
 }
 
@@ -1219,6 +1215,9 @@ func (p *Game) loadSound(name string) (media Sound, err error) {
 //	Play(video) -- maybe
 //	Play(media, wait) -- sync
 //	Play(media, opts)
+//	Play(mediaName)
+//	Play(mediaName, wait) -- sync
+//	Play(mediaName, opts)
 func (p *Game) Play__0(media Sound) {
 	p.Play__2(media, &PlayOptions{})
 }
@@ -1237,6 +1236,22 @@ func (p *Game) Play__2(media Sound, action *PlayOptions) {
 		panic(err)
 	}
 }
+func (p *Game) Play__3(mediaName string) {
+	p.Play__5(mediaName, &PlayOptions{})
+}
+
+func (p *Game) Play__4(mediaName string, wait bool) {
+	p.Play__5(mediaName, &PlayOptions{Wait: wait})
+}
+
+func (p *Game) Play__5(mediaName string, action *PlayOptions) {
+	media, err := p.loadSound(mediaName)
+	if err != nil {
+		log.Println(err)
+		return
+	}
+	p.Play__2(media, action)
+}
 
 func (p *Game) StopAllSounds() {
 	p.sounds.stopAll()

sprite.go

@@ -526,11 +526,7 @@ func (p *Sprite) goAnimate(name string, ani *aniConfig) {
 
 	if ani.OnStart != nil {
 		if ani.OnStart.Play != "" {
-			media, playSound := lookupSound(p.gamer, ani.OnStart.Play)
-			if !playSound {
-				panic("lookupSound: media not found")
-			}
-			p.g.Play__0(media)
+			p.g.Play__3(ani.OnStart.Play)
 		}
 	}