Add Decoder.init method, for common initialisation

decoder-stream.go

@@ -4,10 +4,8 @@ package opus
 import "C"
 
 import (
-	"fmt"
 	"io"
 	"sync"
-	"time"
 	"unsafe"
 )
 
@@ -47,11 +45,7 @@ func NewStreamDecoder(stream io.ReadSeekCloser) (*Decoder, error) {
 		return nil, errorFromOpusFileError(opusFileErr)
 	}
 
-	d.opusFile = opusFile
-	d.link = C.op_current_link(opusFile)
-	d.channelCount = C.op_channel_count(opusFile, d.link)
-	pcmTotal := C.op_pcm_total(opusFile, d.link)
-	d.duration = time.Millisecond * time.Duration((float64(pcmTotal) / 48_000 * 1_000))
+	d.init(opusFile)
 	d.callbacks = callbacks
 
 	return d, nil
@@ -104,6 +98,9 @@ func goFileTell(stream unsafe.Pointer) C.opus_int64 {
 //export goFileClose
 func goFileClose(stream unsafe.Pointer) C.int {
 	d := getDecoderForId(stream)
-	fmt.Println("  ", d)
+	err := d.stream.Close()
+	if err != nil {
+		return -1
+	}
 	return 0
 }

decoder.go

@@ -29,22 +29,19 @@ func NewDecoder(data []byte) (*Decoder, error) {
 		return nil, errorFromOpusFileError(opusFileErr)
 	}
 
-	d := newDecoder(opusFile)
+	d := &Decoder{}
+	d.init(opusFile)
 	d.data = data
+
 	return d, nil
 }
 
-func newDecoder(opusFile *C.OggOpusFile) *Decoder {
-	link := C.op_current_link(opusFile)
-	channelCount := C.op_channel_count(opusFile, link)
-	d := &Decoder{
-		opusFile:     opusFile,
-		link:         link,
-		channelCount: channelCount,
-	}
+func (d *Decoder) init(opusFile *C.OggOpusFile) {
+	d.opusFile = opusFile
+	d.opusFile = opusFile
+	d.link = C.op_current_link(opusFile)
+	d.channelCount = C.op_channel_count(opusFile, d.link)
 	d.duration = time.Millisecond * time.Duration((float64(d.Len()) / 48_000 * 1_000))
-
-	return d
 }
 
 func (d *Decoder) Close() {

example/simple/main.go

@@ -30,6 +30,7 @@ func main() {
 
 	fmt.Println("channel count :", decoder.ChannelCount())
 	fmt.Println("duration (seconds) :", decoder.Duration().Seconds())
+	fmt.Println("len :", decoder.Len())
 	fmt.Printf("tags, vendor : %#v\n", decoder.TagsVendor())
 	fmt.Println("tags, user comments :", decoder.TagsUserComments())
 	fmt.Printf("head : %#v\n", decoder.Head())

example/stream/main.go

@@ -25,6 +25,7 @@ func main() {
 
 	fmt.Println("channel count :", decoder.ChannelCount())
 	fmt.Println("duration (seconds) :", decoder.Duration().Seconds())
+	fmt.Println("len :", decoder.Len())
 	fmt.Printf("tags, vendor : %#v\n", decoder.TagsVendor())
 	fmt.Println("tags, user comments :", decoder.TagsUserComments())
 	fmt.Printf("head : %#v\n", decoder.Head())