From d28a14588a3eb9ec90b03fa9e294fa3fd131d68f Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Sun, 30 Aug 2020 13:20:18 +0200 Subject: [PATCH] rename findConfForPath() --- client.go | 10 +++++----- main.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client.go b/client.go index 2b3bc154..5fe3d7e0 100644 --- a/client.go +++ b/client.go @@ -330,7 +330,7 @@ func (c *client) handleRequest(req *gortsplib.Request) bool { return false } - confp := c.p.findConfForPath(path) + confp := c.p.findConfForPathName(path) if confp == nil { c.writeResError(cseq, gortsplib.StatusBadRequest, 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 } - confp := c.p.findConfForPath(path) + confp := c.p.findConfForPathName(path) if confp == nil { c.writeResError(cseq, gortsplib.StatusBadRequest, 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 { // play case clientStateInitial, clientStatePrePlay: - confp := c.p.findConfForPath(basePath) + confp := c.p.findConfForPathName(basePath) if confp == nil { c.writeResError(cseq, gortsplib.StatusBadRequest, 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) { - confp := c.p.findConfForPath(path) + confp := c.p.findConfForPathName(path) if c.streamProtocol == gortsplib.StreamProtocolTcp { c.events = make(chan clientEvent) @@ -947,7 +947,7 @@ func (c *client) runPlay(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)) for trackId := range c.streamTracks { diff --git a/main.go b/main.go index 73480ebd..10f6a62c 100644 --- a/main.go +++ b/main.go @@ -359,7 +359,7 @@ outer: } } 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 @@ -565,7 +565,7 @@ func (p *program) close() { <-p.done } -func (p *program) findConfForPath(name string) *confPath { +func (p *program) findConfForPathName(name string) *confPath { if confp, ok := p.conf.Paths[name]; ok { return confp }