From 93a602b592a2fe9ae4d8139470c4d5ffd8db8027 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Fri, 13 Dec 2024 11:35:24 -0700 Subject: [PATCH] all: misc cleanup --- app/src/main/java/org/oxycblt/musikr/cover/CoverFiles.kt | 7 ++----- ktaglib/src/main/cpp/JVMMetadataBuilder.cpp | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/oxycblt/musikr/cover/CoverFiles.kt b/app/src/main/java/org/oxycblt/musikr/cover/CoverFiles.kt index 4eb20fa3c..e1cb17000 100644 --- a/app/src/main/java/org/oxycblt/musikr/cover/CoverFiles.kt +++ b/app/src/main/java/org/oxycblt/musikr/cover/CoverFiles.kt @@ -26,7 +26,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext -import timber.log.Timber as L internal interface CoverFiles { suspend fun read(id: String): InputStream? @@ -39,10 +38,8 @@ internal interface CoverFiles { } } -private class CoverFilesImpl( - private val dir: File, - private val coverFormat: CoverFormat -) : CoverFiles { +private class CoverFilesImpl(private val dir: File, private val coverFormat: CoverFormat) : + CoverFiles { private val fileMutexes = mutableMapOf() private val mapMutex = Mutex() diff --git a/ktaglib/src/main/cpp/JVMMetadataBuilder.cpp b/ktaglib/src/main/cpp/JVMMetadataBuilder.cpp index eb2c11a91..c2fe48e54 100644 --- a/ktaglib/src/main/cpp/JVMMetadataBuilder.cpp +++ b/ktaglib/src/main/cpp/JVMMetadataBuilder.cpp @@ -68,7 +68,7 @@ void JVMMetadataBuilder::setMp4(const TagLib::MP4::Tag &tag) { if (type == TagLib::MP4::Item::Type::IntPair) { // It's inefficient going from the integer representation back into // a string, but I fully expect taggers to just write "NN/TT" strings - // anyway. + // anyway, and musikr doesn't have to do as much fiddly variant handling. auto value = std::to_string(itemValue.toIntPair().first) + "/" + std::to_string(itemValue.toIntPair().second); id3v2.add(itemName, value);