normalize channels and methods (#2127)

needed by #2068
bluenviron · Jul 30, 2023 · 72b1d23 · 72b1d23
1 parent e3d4856
commit 72b1d23
Show file tree

Hide file tree

Showing 10 changed files with 221 additions and 224 deletions.
diff --git a/internal/core/hls_manager.go b/internal/core/hls_manager.go
@@ -128,7 +128,7 @@ func newHLSManager(
 
 	m.Log(logger.Info, "listener opened on "+address)
 
-	m.pathManager.hlsManagerSet(m)
+	m.pathManager.setHLSManager(m)
 
 	if m.metrics != nil {
 		m.metrics.setHLSManager(m)
@@ -223,7 +223,7 @@ outer:
 
 	m.httpServer.close()
 
-	m.pathManager.hlsManagerSet(nil)
+	m.pathManager.setHLSManager(nil)
 
 	if m.metrics != nil {
 		m.metrics.setHLSManager(nil)

diff --git a/internal/core/hls_muxer.go b/internal/core/hls_muxer.go
@@ -241,7 +241,7 @@ func (m *hlsMuxer) clearQueuedRequests() {
 }
 
 func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{}) error {
-	res := m.pathManager.readerAdd(pathReaderAddReq{
+	res := m.pathManager.addReader(pathAddReaderReq{
 		author:   m,
 		pathName: m.pathName,
 		skipAuth: true,
@@ -252,7 +252,7 @@ func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{})
 
 	m.path = res.path
 
-	defer m.path.readerRemove(pathReaderRemoveReq{author: m})
+	defer m.path.removeReader(pathRemoveReaderReq{author: m})
 
 	m.ringBuffer, _ = ringbuffer.New(uint64(m.readBufferCount))