nonoo/kappanhang
1
0
Fork 0
mirror of https://github.com/nonoo/kappanhang.git synced 2026-01-07 01:09:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move common stuff

Browse source
This commit is contained in:
Nonoo 2020-10-26 08:56:30 +01:00
parent d97575cc0e
commit d764108359
4 changed files with 25 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
audiostream.go
View file

@ -134,27 +134,18 @@ func (s *audioStream) start(devName string) error {
return err
}
if err := s.common.sendPkt3(); err != nil {
if err := s.common.start(); err != nil {
return err
}
if err := s.common.waitForPkt4Answer(); err != nil {
return err
}
if err := s.common.sendPkt6(); err != nil {
return err
}
if err := s.common.waitForPkt6Answer(); err != nil {
return err
}
log.Print("stream started")
s.timeoutTimer = time.NewTimer(audioTimeoutDuration)
s.common.pkt7.startPeriodicSend(&s.common, 1, false)
// This stream does not use periodic pkt0 idle packets.
s.audioSendSeq = 1
log.Print("stream started")
s.timeoutTimer = time.NewTimer(audioTimeoutDuration)
s.deinitNeededChan = make(chan bool)
s.deinitFinishedChan = make(chan bool)
go s.loop()

18
controlstream.go
View file

@ -261,21 +261,11 @@ func (s *controlStream) start() error {
return err
}
if err := s.common.start(); err != nil {
return err
}
s.common.pkt7.startPeriodicSend(&s.common, 2, false)
if err := s.common.sendPkt3(); err != nil {
return err
}
if err := s.common.waitForPkt4Answer(); err != nil {
return err
}
if err := s.common.sendPkt6(); err != nil {
return err
}
if err := s.common.waitForPkt6Answer(); err != nil {
return err
}
s.common.pkt0.startPeriodicSend(&s.common)
if err := s.sendPktLogin(); err != nil {

15
serialstream.go
View file

@ -218,20 +218,9 @@ func (s *serialStream) start(devName string) error {
}
}
if err := s.common.sendPkt3(); err != nil {
if err := s.common.start(); err != nil {
return err
}
if err := s.common.waitForPkt4Answer(); err != nil {
return err
}
if err := s.common.sendPkt6(); err != nil {
return err
}
if err := s.common.waitForPkt6Answer(); err != nil {
return err
}
log.Print("stream started")
s.common.pkt7.startPeriodicSend(&s.common, 1, false)
s.common.pkt0.startPeriodicSend(&s.common)
@ -240,6 +229,8 @@ func (s *serialStream) start(devName string) error {
return err
}
log.Print("stream started")
if err := s.tcpsrv.start(); err != nil {
return err
}

13
streamcommon.go
View file

@ -218,6 +218,19 @@ func (s *streamCommon) sendDisconnect() error {
return nil
}
func (s *streamCommon) start() error {
if err := s.sendPkt3(); err != nil {
return err
}
if err := s.waitForPkt4Answer(); err != nil {
return err
}
if err := s.sendPkt6(); err != nil {
return err
}
return s.waitForPkt6Answer()
}
func (s *streamCommon) init(name string, portNumber int) error {
s.name = name
hostPort := fmt.Sprint(connectAddress, ":", portNumber)