third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-24 04:40:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make getCoverArt require a non-null entry

Browse Source
This commit is contained in:
tzugen 2021-06-01 14:43:02 +02:00
parent 1dc480b141
commit 90ecbe4b78
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
4 changed files with 4 additions and 8 deletions
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service
CachedMusicService.ktMusicService.ktOfflineMusicService.ktRESTMusicService.kt

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt

@ -257,7 +257,7 @@ class CachedMusicService(private val musicService: MusicService) : MusicService,
@Throws(Exception::class)
override fun getCoverArt(
entry: MusicDirectory.Entry?,
entry: MusicDirectory.Entry,
size: Int,
saveToFile: Boolean,
highQuality: Boolean

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt

@ -113,7 +113,7 @@ interface MusicService {
@Throws(Exception::class)
fun getCoverArt(
entry: MusicDirectory.Entry?,
entry: MusicDirectory.Entry,
size: Int,
saveToFile: Boolean,
highQuality: Boolean

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt

@ -133,7 +133,7 @@ class OfflineMusicService : MusicService, KoinComponent {
}
override fun getCoverArt(
entry: MusicDirectory.Entry?,
entry: MusicDirectory.Entry,
size: Int,
saveToFile: Boolean,
highQuality: Boolean

6
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt

@ -490,17 +490,13 @@ open class RESTMusicService(
@Throws(Exception::class)
override fun getCoverArt(
entry: MusicDirectory.Entry?,
entry: MusicDirectory.Entry,
size: Int,
saveToFile: Boolean,
highQuality: Boolean
): Bitmap? {
// Synchronize on the entry so that we don't download concurrently for
// the same song.
if (entry == null) {
return null
}
synchronized(entry) {
// Use cached file, if existing.
var bitmap = FileUtil.getAlbumArtBitmap(entry, size, highQuality)