Browse Source

rename findConfForPath()

pull/80/head
aler9 5 years ago
parent
commit
d28a14588a
  1. 10
      client.go
  2. 4
      main.go

10
client.go

@ -330,7 +330,7 @@ func (c *client) handleRequest(req *gortsplib.Request) bool {
return false return false
} }
confp := c.p.findConfForPath(path) confp := c.p.findConfForPathName(path)
if confp == nil { if confp == nil {
c.writeResError(cseq, gortsplib.StatusBadRequest, c.writeResError(cseq, gortsplib.StatusBadRequest,
fmt.Errorf("unable to find a valid configuration for path '%s'", path)) fmt.Errorf("unable to find a valid configuration for path '%s'", path))
@ -382,7 +382,7 @@ func (c *client) handleRequest(req *gortsplib.Request) bool {
return false return false
} }
confp := c.p.findConfForPath(path) confp := c.p.findConfForPathName(path)
if confp == nil { if confp == nil {
c.writeResError(cseq, gortsplib.StatusBadRequest, c.writeResError(cseq, gortsplib.StatusBadRequest,
fmt.Errorf("unable to find a valid configuration for path '%s'", path)) fmt.Errorf("unable to find a valid configuration for path '%s'", path))
@ -466,7 +466,7 @@ func (c *client) handleRequest(req *gortsplib.Request) bool {
switch c.state { switch c.state {
// play // play
case clientStateInitial, clientStatePrePlay: case clientStateInitial, clientStatePrePlay:
confp := c.p.findConfForPath(basePath) confp := c.p.findConfForPathName(basePath)
if confp == nil { if confp == nil {
c.writeResError(cseq, gortsplib.StatusBadRequest, c.writeResError(cseq, gortsplib.StatusBadRequest,
fmt.Errorf("unable to find a valid configuration for path '%s'", basePath)) fmt.Errorf("unable to find a valid configuration for path '%s'", basePath))
@ -829,7 +829,7 @@ func (c *client) handleRequest(req *gortsplib.Request) bool {
} }
func (c *client) runPlay(path string) { func (c *client) runPlay(path string) {
confp := c.p.findConfForPath(path) confp := c.p.findConfForPathName(path)
if c.streamProtocol == gortsplib.StreamProtocolTcp { if c.streamProtocol == gortsplib.StreamProtocolTcp {
c.events = make(chan clientEvent) c.events = make(chan clientEvent)
@ -947,7 +947,7 @@ func (c *client) runPlay(path string) {
} }
func (c *client) runRecord(path string) { func (c *client) runRecord(path string) {
confp := c.p.findConfForPath(path) confp := c.p.findConfForPathName(path)
c.rtcpReceivers = make([]*gortsplib.RtcpReceiver, len(c.streamTracks)) c.rtcpReceivers = make([]*gortsplib.RtcpReceiver, len(c.streamTracks))
for trackId := range c.streamTracks { for trackId := range c.streamTracks {

4
main.go

@ -359,7 +359,7 @@ outer:
} }
} else { } else {
p.paths[evt.path] = newPath(p, evt.path, p.findConfForPath(evt.path), false) p.paths[evt.path] = newPath(p, evt.path, p.findConfForPathName(evt.path), false)
} }
p.paths[evt.path].publisher = evt.client p.paths[evt.path].publisher = evt.client
@ -565,7 +565,7 @@ func (p *program) close() {
<-p.done <-p.done
} }
func (p *program) findConfForPath(name string) *confPath { func (p *program) findConfForPathName(name string) *confPath {
if confp, ok := p.conf.Paths[name]; ok { if confp, ok := p.conf.Paths[name]; ok {
return confp return confp
} }

Loading…
Cancel
Save