remove unused methods

This commit is contained in:
Markus Tzoe 2017-07-22 00:20:35 +08:00
parent 03aaac588f
commit 2e5afb1fff
3 changed files with 4 additions and 40 deletions

View file

@ -253,30 +253,6 @@ func (d *Decoder) setPosition(seconds uint32) (newPos uint32, err error) {
return
}
func (d *Decoder) SetInfo(info *Info) error {
if info.format > 2 ||
info.bps < minBPS ||
info.bps > maxBPS ||
info.nch > maxNCH {
return errFormat
}
d.format = info.format
d.depth = (info.bps + 7) / 8
d.flenStd = (256 * (info.sps) / 245)
d.flenLast = info.samples % d.flenStd
d.frames = info.samples / d.flenStd
if d.flenLast != 0 {
d.frames++
} else {
d.flenLast = d.flenStd
}
d.rate = 0
d.channels = int(info.nch)
d.fifo.readStart()
d.frameInit(0, false)
return nil
}
func (d *Decoder) ReadHeader(info *Info) (uint32, error) {
size := d.fifo.skipId3v2()
d.fifo.reset()

View file

@ -57,7 +57,7 @@ func Compress(infile io.ReadSeeker, outfile io.ReadWriteSeeker, passwd string, c
}
bufSize := pcmBufferLength * smpSize
buffer := make([]byte, bufSize)
if err = encoder.SetInfo(&info, 0); err != nil {
if err = encoder.SetInfo(&info); err != nil {
return
}
var readLen int
@ -202,7 +202,7 @@ func (e *Encoder) writeSeekTable() (err error) {
if _, err = e.fifo.io.Seek(int64(e.offset), os.SEEK_SET); err != nil {
return
}
e.fifo.writeStart()
e.fifo.pos = 0
e.fifo.reset()
for i := uint32(0); i < e.frames; i++ {
e.fifo.writeUint32(uint32(e.seekTable[i] & 0xFFFFFFFF))
@ -282,26 +282,18 @@ func (e *Encoder) WriteHeader(info *Info) (size uint32, err error) {
}
func (e *Encoder) SetInfo(info *Info, pos int64) (err error) {
func (e *Encoder) SetInfo(info *Info) (err error) {
if info.format > 2 ||
info.bps < minBPS ||
info.bps > maxBPS ||
info.nch > maxNCH {
return errFormat
}
// set start position if required
if pos != 0 {
if _, err = e.fifo.io.Seek(int64(pos), os.SEEK_SET); err != nil {
err = errSeek
return
}
}
e.fifo.writeStart()
var p uint32
if p, err = e.WriteHeader(info); err != nil {
return
}
e.offset = uint64(pos) + uint64(p)
e.offset = uint64(p)
e.format = info.format
e.depth = (info.bps + 7) / 8
e.flenStd = (256 * (info.sps) / 245)

View file

@ -150,10 +150,6 @@ func (s *fifo) getValue(ad *adapter) (value int32) {
return
}
func (s *fifo) writeStart() {
s.pos = 0
}
func (s *fifo) writeDone() error {
if s.pos > 0 {
if n, err := s.io.Write(s.buffer[:s.pos]); err != nil || n != int(s.pos) {