musikr: merge ktaglib into musikr.metadata

No longer makes sense as an independent module.

musikr/src/main/cpp/CMakeLists.txt

@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.22.1)
 # Since this is the top level CMakeLists.txt, the project name is also accessible
 # with ${CMAKE_PROJECT_NAME} (both CMake variables are in-sync within the top level
 # build script scope).
-project("ktaglib")
+project("taglib_jni")
 
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.
@@ -45,7 +45,7 @@ set_target_properties(
 
 add_library(${CMAKE_PROJECT_NAME} SHARED
         # List C/C++ source files with relative paths to this CMakeLists.txt.
-        ktaglib.cpp
+        taglib_jni.cpp
         JVMInputStream.cpp
         JVMTagMap.cpp
         JVMMetadataBuilder.cpp

musikr/src/main/cpp/taglib_jni.cpp

@@ -13,7 +13,7 @@
 #include "taglib/wavfile.h"
 
 extern "C" JNIEXPORT jobject JNICALL
-Java_org_oxycblt_ktaglib_KTagLib_openNative(
+Java_org_oxycblt_musikr_metadata_TagLibJNI_openNative(
         JNIEnv* env,
         jobject /* this */,
         jobject inputStream) {

musikr/src/main/java/org/oxycblt/musikr/cache/CacheDatabase.kt

@@ -30,7 +30,7 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverter
 import androidx.room.TypeConverters
-import org.oxycblt.ktaglib.Properties
+import org.oxycblt.musikr.metadata.Properties
 import org.oxycblt.musikr.cover.Cover
 import org.oxycblt.musikr.fs.query.DeviceFile
 import org.oxycblt.musikr.pipeline.RawSong

musikr/src/main/java/org/oxycblt/musikr/metadata/AndroidInputStream.kt

@@ -1,4 +1,4 @@
-package org.oxycblt.ktaglib
+package org.oxycblt.musikr.metadata
 
 import android.content.Context
 import java.io.FileInputStream

musikr/src/main/java/org/oxycblt/musikr/metadata/MetadataExtractor.kt

@@ -21,9 +21,6 @@ package org.oxycblt.musikr.metadata
 import android.content.Context
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import org.oxycblt.ktaglib.FileRef
-import org.oxycblt.ktaglib.KTagLib
-import org.oxycblt.ktaglib.Metadata
 import org.oxycblt.musikr.fs.query.DeviceFile
 import org.oxycblt.musikr.util.unlikelyToBeNull
 
@@ -38,6 +35,6 @@ interface MetadataExtractor {
 private class MetadataExtractorImpl(private val context: Context) : MetadataExtractor {
     override suspend fun extract(file: DeviceFile) =
         withContext(Dispatchers.IO) {
-            KTagLib.open(context, FileRef(unlikelyToBeNull(file.path.name), file.uri))
+            TagLibJNI.open(context, FileRef(unlikelyToBeNull(file.path.name), file.uri))
         }
 }

musikr/src/main/java/org/oxycblt/musikr/metadata/NativeInputStream.kt

@@ -1,4 +1,4 @@
-package org.oxycblt.ktaglib
+package org.oxycblt.musikr.metadata
 
 /**
  * Java interface for the read-only methods in TagLib's IOStream API.

musikr/src/main/java/org/oxycblt/musikr/metadata/TagLibJNI.kt

@@ -1,11 +1,11 @@
-package org.oxycblt.ktaglib
+package org.oxycblt.musikr.metadata
 
 import android.content.Context
 import android.net.Uri
 
-object KTagLib {
+object TagLibJNI {
     init {
-        System.loadLibrary("ktaglib")
+        System.loadLibrary("taglib_jni")
     }
 
     /**

musikr/src/main/java/org/oxycblt/musikr/pipeline/ExtractStep.kt

@@ -28,7 +28,7 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.merge
-import org.oxycblt.ktaglib.Properties
+import org.oxycblt.musikr.metadata.Properties
 import org.oxycblt.musikr.Storage
 import org.oxycblt.musikr.cache.CacheResult
 import org.oxycblt.musikr.cover.Cover

musikr/src/main/java/org/oxycblt/musikr/tag/parse/ExoPlayerTagFields.kt

@@ -19,7 +19,7 @@
 package org.oxycblt.musikr.tag.parse
 
 import androidx.core.text.isDigitsOnly
-import org.oxycblt.ktaglib.Metadata
+import org.oxycblt.musikr.metadata.Metadata
 import org.oxycblt.musikr.tag.Date
 import org.oxycblt.musikr.tag.util.parseId3v2PositionField
 import org.oxycblt.musikr.tag.util.parseXiphPositionField

musikr/src/main/java/org/oxycblt/musikr/tag/parse/TagParser.kt

@@ -18,7 +18,7 @@
  
 package org.oxycblt.musikr.tag.parse
 
-import org.oxycblt.ktaglib.Metadata
+import org.oxycblt.musikr.metadata.Metadata
 import org.oxycblt.musikr.fs.query.DeviceFile
 
 interface TagParser {