Checkpoint
This commit is contained in:
223 files changed
+14770
-18352
No files matched your search
+12
-4
@@ -7,6 +7,7 @@ import (
|
||||
"os"
|
||||
|
||||
"github.com/BeatGlow/audio"
|
||||
|
||||
"github.com/BeatGlow/beatglow/config"
|
||||
)
|
||||
|
||||
@@ -59,7 +60,7 @@ type Reader struct {
|
||||
bufferInt16 audio.Samples[int16]
|
||||
}
|
||||
|
||||
func newReader(config config.Audio) (Source, error) {
|
||||
func newReader(config *config.Audio) (Source, error) {
|
||||
var (
|
||||
ch = config.Channels
|
||||
bits = config.Bits
|
||||
@@ -108,7 +109,7 @@ func (s Reader) SampleRate() int {
|
||||
return s.Rate
|
||||
}
|
||||
|
||||
func (s *Reader) ReadBuffer(buffer audio.Buffer[float64]) (int, error) {
|
||||
func (s *Reader) ReadBuffer(buffer audio.Buffer[float64]) (n int, err error) {
|
||||
// Ensure we have an open reader.
|
||||
if s.ReadCloser == nil {
|
||||
var err error
|
||||
@@ -120,12 +121,19 @@ func (s *Reader) ReadBuffer(buffer audio.Buffer[float64]) (int, error) {
|
||||
|
||||
switch s.Bits {
|
||||
case 8:
|
||||
return s.readBufferInt8(buffer)
|
||||
n, err = s.readBufferInt8(buffer)
|
||||
case 16:
|
||||
return s.readBufferInt16(buffer)
|
||||
n, err = s.readBufferInt16(buffer)
|
||||
default:
|
||||
return 0, fmt.Errorf("sound: unsupported bit depth %d for Reader", s.Bits)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
_ = s.ReadCloser.Close()
|
||||
s.ReadCloser = nil
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func (s *Reader) readBufferInt8(buffer audio.Buffer[float64]) (int, error) {
|
||||
|
||||
Reference in new issue
Block a user