From 788538ee6a70147be2b6a673b0922dc560a39de5 Mon Sep 17 00:00:00 2001 From: tzugen Date: Sun, 17 Apr 2022 06:55:24 +0200 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit c7d9af4529bd9bfba49c46208819d7ef53542cd4 Author: Holger Müller Date: Sat Apr 16 17:56:41 2022 +0200 fixed CI failure commit 59e18bc5c0264a4a41ead2d819142458c8053ee8 Author: Holger Müller Date: Sat Apr 16 17:42:49 2022 +0200 removed unused dataSourceFactory, commented debug output --- .../kotlin/org/moire/ultrasonic/playback/APIDataSource.kt | 2 +- .../org/moire/ultrasonic/playback/CachedDataSource.kt | 4 ++-- .../kotlin/org/moire/ultrasonic/playback/PlaybackService.kt | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/APIDataSource.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/APIDataSource.kt index 0a071dbe..469e1f30 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/APIDataSource.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/APIDataSource.kt @@ -220,7 +220,7 @@ open class APIDataSource private constructor( @Throws(HttpDataSourceException::class) override fun read(buffer: ByteArray, offset: Int, length: Int): Int { - Timber.d("APIDatasource: Read: %s %s", offset, length) + // Timber.d("APIDatasource: Read: %s %s", offset, length) return try { readInternal(buffer, offset, length) } catch (e: IOException) { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/CachedDataSource.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/CachedDataSource.kt index 15d04580..64381403 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/CachedDataSource.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/CachedDataSource.kt @@ -85,8 +85,8 @@ class CachedDataSource( @Suppress("MagicNumber") override fun read(buffer: ByteArray, offset: Int, length: Int): Int { - if (offset > 0 || length > 4) - Timber.d("CachedDatasource: Read: %s %s", offset, length) + // if (offset > 0 || length > 4) + // Timber.d("CachedDatasource: Read: %s %s", offset, length) return if (cachePath != null) { try { readInternal(buffer, offset, length) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/PlaybackService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/PlaybackService.kt index 2a08df67..1d446797 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/PlaybackService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/PlaybackService.kt @@ -44,7 +44,6 @@ class PlaybackService : MediaLibraryService(), KoinComponent { private lateinit var player: ExoPlayer private lateinit var mediaLibrarySession: MediaLibrarySession private lateinit var apiDataSource: APIDataSource.Factory - private lateinit var dataSourceFactory: DataSource.Factory private lateinit var librarySessionCallback: MediaLibrarySession.MediaLibrarySessionCallback @@ -102,14 +101,13 @@ class PlaybackService : MediaLibraryService(), KoinComponent { // Create a MediaSource which passes calls through our OkHttp Stack apiDataSource = APIDataSource.Factory(subsonicAPIClient) - - dataSourceFactory = APIDataSource.Factory(subsonicAPIClient) val cacheDataSourceFactory: DataSource.Factory = CachedDataSource.Factory(apiDataSource) // Create a renderer with HW rendering support val renderer = DefaultRenderersFactory(this) - if (Settings.useHwOffload) renderer.setEnableAudioOffload(true) + if (Settings.useHwOffload) + renderer.setEnableAudioOffload(true) // Create the player player = ExoPlayer.Builder(this)