From 98c48463d2e57bbf011510b25617cb6358570b84 Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Sat, 3 Jun 2017 01:12:58 +0900
Subject: [PATCH] audio: NewPlayerFromBytes now never returns errors

---
 audio/audio.go         |  9 +++++++--
 examples/audio/main.go |  3 ++-
 examples/piano/main.go | 10 ++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/audio/audio.go b/audio/audio.go
index 907750967..52b7ae57e 100644
--- a/audio/audio.go
+++ b/audio/audio.go
@@ -350,10 +350,15 @@ func NewPlayer(context *Context, src ReadSeekCloser) (*Player, error) {
 //
 // The format of src should be same as noted at NewPlayer.
 //
-// NewPlayerFromBytes returns error in the same situation of NewPlayer.
+// NewPlayerFromBytes's error is always nil as of 1.5.0-alpha.
 func NewPlayerFromBytes(context *Context, src []byte) (*Player, error) {
 	b := BytesReadSeekCloser(src)
-	return NewPlayer(context, b)
+	p, err := NewPlayer(context, b)
+	if err != nil {
+		// Errors should never happen.
+		panic(err)
+	}
+	return p, nil
 }
 
 // Close closes the stream. Ths source stream passed by NewPlayer will also be closed.
diff --git a/examples/audio/main.go b/examples/audio/main.go
index c6160557f..7c476c492 100644
--- a/examples/audio/main.go
+++ b/examples/audio/main.go
@@ -88,7 +88,8 @@ func (p *Player) updateSE() error {
 	if err != nil {
 		return err
 	}
-	return sePlayer.Play()
+	sePlayer.Play()
+	return nil
 }
 
 func (p *Player) updateVolume() {
diff --git a/examples/piano/main.go b/examples/piano/main.go
index 4549da2cf..3f7e0fc23 100644
--- a/examples/piano/main.go
+++ b/examples/piano/main.go
@@ -87,10 +87,7 @@ func addNote(freq float64, vol float64) error {
 	// collects a *audio.Player object.
 	f := int(freq)
 	if n, ok := noteCache[f]; ok {
-		p, err := audio.NewPlayerFromBytes(audioContext, n)
-		if err != nil {
-			return err
-		}
+		p, _ := audio.NewPlayerFromBytes(audioContext, n)
 		if err := p.Play(); err != nil {
 			return err
 		}
@@ -110,10 +107,7 @@ func addNote(freq float64, vol float64) error {
 	}
 	n := toBytes(l, r)
 	noteCache[f] = n
-	p, err := audio.NewPlayerFromBytes(audioContext, n)
-	if err != nil {
-		return err
-	}
+	p, _ := audio.NewPlayerFromBytes(audioContext, n)
 	if err := p.Play(); err != nil {
 		return err
 	}