Merge pull request #20 from pipelined/allocator-length

Add length to allocator

Author: dudk

example_read_write_test.go

@@ -22,8 +22,8 @@ func Example_readWrite() {
 	signal.ReadInt(buf, output) // read data into output
 	fmt.Println(output)
 
-	output = make([]int, 16)            // reset output
-	signal.ReadInt(buf.Reset(), output) // reset buffer length to 0 and read data into output
+	output = make([]int, 16)                // reset output
+	signal.ReadInt(buf.Slice(0, 0), output) // reset buffer length to 0 and read data into output
 	fmt.Println(output)
 
 	// Output:

float32.go

@@ -134,10 +134,11 @@ var (
 )
 
 const (
-	floating = `// Code generated by go generate; DO NOT EDIT.
+	floating = `package signal
+
+// Code generated by go generate; DO NOT EDIT.
 // This file was generated by robots at
 // {{ .Timestamp }}
-package signal
 
 import "math"
 
@@ -150,7 +151,7 @@ type {{ .Name }} struct {
 // {{ .Name }} allocates a new sequential {{ .Builtin }} signal buffer.
 func (a Allocator) {{ .Name }}() Floating {
 	return {{ .Name }}{
-		buffer:   make([]{{ .Builtin }}, 0, a.Channels*a.Capacity),
+		buffer:   make([]{{ .Builtin }}, a.Channels*a.Length, a.Channels*a.Capacity),
 		channels: channels(a.Channels),
 	}
 }
@@ -175,7 +176,7 @@ func (p *Pool) Put{{ .Name }}(s Floating) {
 		panic("pool put {{ .Builtin }} invalid type")
 	}
 	mustSameCapacity(s.Capacity(), p.allocator.Capacity)
-	p.{{ .Pool }}.Put(s.Reset())
+	p.{{ .Pool }}.Put(s.Slice(0, p.allocator.Length))
 }
 
 
@@ -233,11 +234,6 @@ func (s {{ .Name }}) Slice(start, end int) Floating {
 	return s
 }
 
-// Reset sets length of the buffer to zero.
-func (s {{ .Name }}) Reset() Floating {
-	return s.Slice(0, 0)
-}
-
 // Append appends data from src buffer to the end of the buffer.
 func (s {{ .Name }}) Append(src Floating) Floating {
 	mustSameChannels(s.Channels(), src.Channels())
@@ -307,10 +303,11 @@ func WriteStriped{{ .Name }}(src [][]{{ .Builtin }}, dst Floating) Floating {
 	return dst
 }`
 
-	signed = `// Code generated by go generate; DO NOT EDIT.
+	signed = `package signal
+
+// Code generated by go generate; DO NOT EDIT.
 // This file was generated by robots at
 // {{ .Timestamp }}
-package signal
 
 import "math"
 
@@ -324,7 +321,7 @@ type {{ .Name }} struct {
 // {{ .Name }} allocates a new sequential {{ .Builtin }} signal buffer.
 func (a Allocator) {{ .Name }}(bd BitDepth) Signed {
 	return {{ .Name }}{
-		buffer:   make([]{{ .Builtin }}, 0, a.Capacity*a.Channels),
+		buffer:   make([]{{ .Builtin }}, a.Channels*a.Length, a.Capacity*a.Channels),
 		channels: channels(a.Channels),
 		bitDepth: limitBitDepth(bd, {{ .MaxBitDepth }}),
 	}
@@ -350,7 +347,7 @@ func (p *Pool) Put{{ .Name }}(s Signed) {
 		panic("pool put {{ .Builtin }} invalid type")
 	}
 	mustSameCapacity(s.Capacity(), p.allocator.Capacity)
-	p.{{ .Pool }}.Put(s.Reset())
+	p.{{ .Pool }}.Put(s.Slice(0, p.allocator.Length))
 }
 
 func (s {{ .Name }}) setBitDepth(bd BitDepth) Signed {
@@ -412,11 +409,6 @@ func (s {{ .Name }}) Slice(start, end int) Signed {
 	return s
 }
 
-// Reset sets length of the buffer to zero.
-func (s {{ .Name }}) Reset() Signed {
-	return s.Slice(0, 0)
-}
-
 // Append appends [0:Length] data from src to current buffer and returns new
 // Signed buffer. Both buffers must have same number of channels and bit depth,
 // otherwise function will panic. If current buffer doesn't have enough capacity,
@@ -494,10 +486,11 @@ func WriteStriped{{ .Name }}(src [][]{{ .Builtin }}, dst Signed) Signed {
 }
 `
 
-	unsigned = `// Code generated by go generate; DO NOT EDIT.
+	unsigned = `package signal
+
+// Code generated by go generate; DO NOT EDIT.
 // This file was generated by robots at
 // {{ .Timestamp }}
-package signal
 
 import "math"
 
@@ -511,7 +504,7 @@ type {{ .Name }} struct {
 // {{ .Name }} allocates a new sequential {{ .Builtin }} signal buffer.
 func (a Allocator) {{ .Name }}(bd BitDepth) Unsigned {
 	return {{ .Name }}{
-		buffer:   make([]{{ .Builtin }}, 0, a.Capacity*a.Channels),
+		buffer:   make([]{{ .Builtin }}, a.Channels*a.Length, a.Capacity*a.Channels),
 		channels: channels(a.Channels),
 		bitDepth: limitBitDepth(bd, BitDepth64),
 	}
@@ -537,7 +530,7 @@ func (p *Pool) Put{{ .Name }}(s Unsigned) {
 		panic("pool put {{ .Builtin }} invalid type")
 	}
 	mustSameCapacity(s.Capacity(), p.allocator.Capacity)
-	p.{{ .Pool }}.Put(s.Reset())
+	p.{{ .Pool }}.Put(s.Slice(0, p.allocator.Length))
 }
 
 func (s {{ .Name }}) setBitDepth(bd BitDepth) Unsigned {
@@ -599,11 +592,6 @@ func (s {{ .Name }}) Slice(start, end int) Unsigned {
 	return s
 }
 
-// Reset sets length of the buffer to zero.
-func (s {{ .Name }}) Reset() Unsigned {
-	return s.Slice(0, 0)
-}
-
 // Append appends data from src to current buffer and returns new
 // Unsigned buffer. Both buffers must have same number of channels and bit depth,
 // otherwise function will panic.  If current buffer doesn't have enough capacity,
@@ -680,10 +668,11 @@ func WriteStriped{{ .Name }}(src [][]{{ .Builtin }}, dst Unsigned) Unsigned {
 	return dst
 }`
 
-	fixedTests = `// Code generated by go generate; DO NOT EDIT.
+	fixedTests = `package signal_test
+
+// Code generated by go generate; DO NOT EDIT.
 // This file was generated by robots at
 // {{ .Timestamp }}
-package signal_test
 
 import (
 	"testing"
@@ -720,10 +709,11 @@ func Test{{ .Name }}(t *testing.T) {
 		},
 	))
 }`
-	floatingTests = `// Code generated by go generate; DO NOT EDIT.
+	floatingTests = `package signal_test
+
+// Code generated by go generate; DO NOT EDIT.
 // This file was generated by robots at
 // {{ .Timestamp }}
-package signal_test
 
 import (
 	"testing"