From b784250fed14bf94ca764bd2608ff53cfdabb16b Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Mon, 23 Sep 2024 15:18:53 -0600 Subject: [PATCH] playback: move player dep module --- .../SystemModule.kt => player/PlayerModule.kt} | 11 +++++++++-- .../auxio/playback/player/PlayerStateHolder.kt | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) rename app/src/main/java/org/oxycblt/auxio/playback/{service/SystemModule.kt => player/PlayerModule.kt} (92%) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/SystemModule.kt b/app/src/main/java/org/oxycblt/auxio/playback/player/PlayerModule.kt similarity index 92% rename from app/src/main/java/org/oxycblt/auxio/playback/service/SystemModule.kt rename to app/src/main/java/org/oxycblt/auxio/playback/player/PlayerModule.kt index 3aade8f3e..05b6160d2 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/SystemModule.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/player/PlayerModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.playback.service +package org.oxycblt.auxio.playback.player import android.content.Context import androidx.media3.datasource.ContentDataSource @@ -32,6 +32,7 @@ import androidx.media3.extractor.mp4.Mp4Extractor import androidx.media3.extractor.ogg.OggExtractor import androidx.media3.extractor.ts.AdtsExtractor import androidx.media3.extractor.wav.WavExtractor +import dagger.Binds import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -40,7 +41,13 @@ import dagger.hilt.components.SingletonComponent @Module @InstallIn(SingletonComponent::class) -class SystemModule { +interface PlayerModule { + @Binds fun playerFactory(factory: PlayerFactoryImpl): PlayerFactory +} + +@Module +@InstallIn(SingletonComponent::class) +class ExoPlayerModule { @Provides fun mediaSourceFactory( dataSourceFactory: DataSource.Factory, diff --git a/app/src/main/java/org/oxycblt/auxio/playback/player/PlayerStateHolder.kt b/app/src/main/java/org/oxycblt/auxio/playback/player/PlayerStateHolder.kt index ae254f713..403bd079e 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/player/PlayerStateHolder.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/player/PlayerStateHolder.kt @@ -54,7 +54,7 @@ import org.oxycblt.auxio.util.logE class PlayerStateHolder( private val context: Context, - private val playerFactory: PlayerFactory, + playerFactory: PlayerFactory, private val playbackManager: PlaybackStateManager, private val persistenceRepository: PersistenceRepository, private val playbackSettings: PlaybackSettings,