From bb435b7296cb5e9f665057f265ea31aa3be56ed0 Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Mon, 16 Jan 2017 02:36:18 +0900
Subject: [PATCH] audio: Remove NopCloser and Add BytesReadSeekCloser

---
 audio/audio.go | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/audio/audio.go b/audio/audio.go
index ab1e3d4a3..197c89d85 100644
--- a/audio/audio.go
+++ b/audio/audio.go
@@ -279,18 +279,26 @@ type ReadSeekCloser interface {
 	io.Closer
 }
 
-type nopCloser struct {
-	io.ReadSeeker
+type bytesReadSeekCloser struct {
+	reader *bytes.Reader
 }
 
-func (*nopCloser) Close() error {
+func (b *bytesReadSeekCloser) Read(buf []uint8) (int, error) {
+	return b.reader.Read(buf)
+}
+
+func (b *bytesReadSeekCloser) Seek(offset int64, whence int) (int64, error) {
+	return b.reader.Seek(offset, whence)
+}
+
+func (b *bytesReadSeekCloser) Close() error {
+	b.reader = nil
 	return nil
 }
 
-// NopCloser creates ReadSeekCloser from io.ReadSeeker.
-// The added Close function is empty and does nothing.
-func NopCloser(r io.ReadSeeker) ReadSeekCloser {
-	return &nopCloser{r}
+// BytesReadSeekCloser creates ReadSeekCloser from bytes.
+func BytesReadSeekCloser(b []uint8) ReadSeekCloser {
+	return &bytesReadSeekCloser{bytes.NewReader(b)}
 }
 
 // Player is an audio player which has one stream.
@@ -333,14 +341,6 @@ func NewPlayer(context *Context, src ReadSeekCloser) (*Player, error) {
 	return p, nil
 }
 
-type bytesReadSeekCloser struct {
-	*bytes.Reader
-}
-
-func (b *bytesReadSeekCloser) Close() error {
-	return nil
-}
-
 // NewPlayerFromBytes creates a new player with the given bytes.
 //
 // As opposed to NewPlayer, you don't have to care if src is already used by another player or not.
@@ -350,7 +350,7 @@ func (b *bytesReadSeekCloser) Close() error {
 //
 // This function is concurrent-safe.
 func NewPlayerFromBytes(context *Context, src []byte) (*Player, error) {
-	b := &bytesReadSeekCloser{bytes.NewReader(src)}
+	b := BytesReadSeekCloser(src)
 	return NewPlayer(context, b)
 }