chore(core): fix a type on releasable interface

ThibaultBee · Dec 12, 2024 · 7947dce · 7947dce
1 parent cfccc91
commit 7947dce
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 20 deletions.
diff --git a/core/src/main/java/io/github/thibaultbee/streampack/core/internal/encoders/IEncoder.kt b/core/src/main/java/io/github/thibaultbee/streampack/core/internal/encoders/IEncoder.kt
@@ -18,7 +18,7 @@ package io.github.thibaultbee.streampack.core.internal.encoders
 import android.view.Surface
 import io.github.thibaultbee.streampack.core.data.Config
 import io.github.thibaultbee.streampack.core.internal.data.Frame
-import io.github.thibaultbee.streampack.core.internal.interfaces.Releaseable
+import io.github.thibaultbee.streampack.core.internal.interfaces.Releasable
 import io.github.thibaultbee.streampack.core.internal.interfaces.SuspendStreamable
 import java.nio.ByteBuffer
 import java.util.concurrent.Executor
@@ -61,7 +61,7 @@ interface IEncoder {
     fun requestKeyFrame()
 }
 
-interface IEncoderInternal : SuspendStreamable, Releaseable,
+interface IEncoderInternal : SuspendStreamable, Releasable,
     IEncoder {
 
     /**

diff --git a/core/src/main/java/io/github/thibaultbee/streampack/core/internal/endpoints/IEndpoint.kt b/core/src/main/java/io/github/thibaultbee/streampack/core/internal/endpoints/IEndpoint.kt
@@ -19,14 +19,14 @@ import io.github.thibaultbee.streampack.core.data.Config
 import io.github.thibaultbee.streampack.core.data.mediadescriptor.MediaDescriptor
 import io.github.thibaultbee.streampack.core.internal.data.Frame
 import io.github.thibaultbee.streampack.core.internal.endpoints.composites.sinks.FileSink
-import io.github.thibaultbee.streampack.core.internal.interfaces.Releaseable
+import io.github.thibaultbee.streampack.core.internal.interfaces.Releasable
 import io.github.thibaultbee.streampack.core.internal.interfaces.SuspendCloseable
 import io.github.thibaultbee.streampack.core.internal.interfaces.SuspendStreamable
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.runBlocking
 
 interface IEndpointInternal : IEndpoint, SuspendStreamable,
-    SuspendCloseable, Releaseable {
+    SuspendCloseable, Releasable {
     /**
      * Opens the endpoint.
      * The endpoint must check if the [MediaDescriptor] is supported and if it is not already opened.

diff --git a/...github/thibaultbee/streampack/core/internal/endpoints/composites/muxers/IMuxerInternal.kt b/...github/thibaultbee/streampack/core/internal/endpoints/composites/muxers/IMuxerInternal.kt
@@ -18,12 +18,12 @@ package io.github.thibaultbee.streampack.core.internal.endpoints.composites.muxe
 import io.github.thibaultbee.streampack.core.data.Config
 import io.github.thibaultbee.streampack.core.internal.data.Frame
 import io.github.thibaultbee.streampack.core.internal.data.Packet
-import io.github.thibaultbee.streampack.core.internal.interfaces.Releaseable
+import io.github.thibaultbee.streampack.core.internal.interfaces.Releasable
 import io.github.thibaultbee.streampack.core.internal.interfaces.Streamable
 
 interface IMuxerInternal :
     IMuxer, Streamable,
-    Releaseable {
+    Releasable {
     var listener: IMuxerListener?
 
     interface IMuxerListener {

diff --git a/core/src/main/java/io/github/thibaultbee/streampack/core/internal/interfaces/Streamable.kt b/core/src/main/java/io/github/thibaultbee/streampack/core/internal/interfaces/Streamable.kt
@@ -60,7 +60,7 @@ interface Configurable<T> {
     fun configure(config: T)
 }
 
-interface Releaseable {
+interface Releasable {
     /**
      * Closes and releases resources
      */

diff --git a/...java/io/github/thibaultbee/streampack/core/internal/processing/video/ISurfaceProcessor.kt b/...java/io/github/thibaultbee/streampack/core/internal/processing/video/ISurfaceProcessor.kt
@@ -17,12 +17,12 @@ package io.github.thibaultbee.streampack.core.internal.processing.video
 
 import android.util.Size
 import android.view.Surface
-import io.github.thibaultbee.streampack.core.internal.interfaces.Releaseable
+import io.github.thibaultbee.streampack.core.internal.interfaces.Releasable
 import io.github.thibaultbee.streampack.core.internal.processing.video.outputs.AbstractSurfaceOutput
 
 interface ISurfaceProcessor
 
-interface ISurfaceProcessorInternal : ISurfaceProcessor, Releaseable {
+interface ISurfaceProcessorInternal : ISurfaceProcessor, Releasable {
     fun createInputSurface(surfaceSize: Size): Surface?
 
     fun removeInputSurface(surface: Surface)

diff --git a/core/src/main/java/io/github/thibaultbee/streampack/core/internal/sources/IFrameSource.kt b/core/src/main/java/io/github/thibaultbee/streampack/core/internal/sources/IFrameSource.kt
@@ -16,9 +16,6 @@
 package io.github.thibaultbee.streampack.core.internal.sources
 
 import io.github.thibaultbee.streampack.core.internal.data.Frame
-import io.github.thibaultbee.streampack.core.internal.interfaces.Configurable
-import io.github.thibaultbee.streampack.core.internal.interfaces.Releaseable
-import io.github.thibaultbee.streampack.core.internal.interfaces.Streamable
 import java.nio.ByteBuffer
 
 interface IFrameSource<T> {

diff --git a/core/src/main/java/io/github/thibaultbee/streampack/core/internal/sources/ISurfaceSource.kt b/core/src/main/java/io/github/thibaultbee/streampack/core/internal/sources/ISurfaceSource.kt
@@ -16,10 +16,6 @@
 package io.github.thibaultbee.streampack.core.internal.sources
 
 import android.view.Surface
-import io.github.thibaultbee.streampack.core.data.VideoConfig
-import io.github.thibaultbee.streampack.core.internal.interfaces.Configurable
-import io.github.thibaultbee.streampack.core.internal.interfaces.Releaseable
-import io.github.thibaultbee.streampack.core.internal.interfaces.Streamable
 
 interface ISurfaceSource {
     /**

diff --git a/...rc/main/java/io/github/thibaultbee/streampack/core/internal/sources/audio/IAudioSource.kt b/...rc/main/java/io/github/thibaultbee/streampack/core/internal/sources/audio/IAudioSource.kt
@@ -17,12 +17,12 @@ package io.github.thibaultbee.streampack.core.internal.sources.audio
 
 import io.github.thibaultbee.streampack.core.data.AudioConfig
 import io.github.thibaultbee.streampack.core.internal.interfaces.Configurable
-import io.github.thibaultbee.streampack.core.internal.interfaces.Releaseable
+import io.github.thibaultbee.streampack.core.internal.interfaces.Releasable
 import io.github.thibaultbee.streampack.core.internal.interfaces.Streamable
 import io.github.thibaultbee.streampack.core.internal.sources.IFrameSource
 
 interface IAudioSourceInternal : IAudioSource, IFrameSource<AudioConfig>, Streamable,
-    Configurable<AudioConfig>, Releaseable
+    Configurable<AudioConfig>, Releasable
 
 interface IAudioSource {
     /**

diff --git a/...rc/main/java/io/github/thibaultbee/streampack/core/internal/sources/video/IVideoSource.kt b/...rc/main/java/io/github/thibaultbee/streampack/core/internal/sources/video/IVideoSource.kt
@@ -17,14 +17,14 @@ package io.github.thibaultbee.streampack.core.internal.sources.video
 
 import io.github.thibaultbee.streampack.core.data.VideoConfig
 import io.github.thibaultbee.streampack.core.internal.interfaces.Configurable
-import io.github.thibaultbee.streampack.core.internal.interfaces.Releaseable
+import io.github.thibaultbee.streampack.core.internal.interfaces.Releasable
 import io.github.thibaultbee.streampack.core.internal.interfaces.SuspendStreamable
 import io.github.thibaultbee.streampack.core.internal.processing.video.source.ISourceInfoProvider
 import io.github.thibaultbee.streampack.core.internal.sources.IFrameSource
 import io.github.thibaultbee.streampack.core.internal.sources.ISurfaceSource
 
 interface IVideoSourceInternal : IFrameSource<VideoConfig>, ISurfaceSource, IVideoSource,
-    SuspendStreamable, Configurable<VideoConfig>, Releaseable {
+    SuspendStreamable, Configurable<VideoConfig>, Releasable {
     /**
      * Set to [Boolean.true] to use video source as a Surface renderer (see [ISurfaceSource]). For example, this is useful
      * for camera and screen recording. If set to [Boolean.false], the encoder will use source as a