From 4655e314b9bab01dfba93f863b4d145fbf143272 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Wed, 19 Feb 2025 10:43:38 -0700 Subject: [PATCH] musikr: connect metajni lib to app --- .../java/org/oxycblt/musikr/metadata/MetadataExtractor.kt | 4 +--- .../src/main/java/org/oxycblt/musikr/metadata/MetadataJNI.kt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/musikr/src/main/java/org/oxycblt/musikr/metadata/MetadataExtractor.kt b/musikr/src/main/java/org/oxycblt/musikr/metadata/MetadataExtractor.kt index cb37b5133..a15e187e2 100644 --- a/musikr/src/main/java/org/oxycblt/musikr/metadata/MetadataExtractor.kt +++ b/musikr/src/main/java/org/oxycblt/musikr/metadata/MetadataExtractor.kt @@ -38,8 +38,6 @@ private object MetadataExtractorImpl : MetadataExtractor { withContext(Dispatchers.IO) { val fis = FileInputStream(fd.fileDescriptor) val input = NativeInputStream(deviceFile, fis) - Log.d("MetadataExtractorImpl", MetadataJNI.openFile(input)) - // MetadataJNI.open(deviceFile, fis).also { fis.close() } - null + MetadataJNI.openFile(input).also { fis.close() } } } diff --git a/musikr/src/main/java/org/oxycblt/musikr/metadata/MetadataJNI.kt b/musikr/src/main/java/org/oxycblt/musikr/metadata/MetadataJNI.kt index 08c6d05a3..3ebbadaa1 100644 --- a/musikr/src/main/java/org/oxycblt/musikr/metadata/MetadataJNI.kt +++ b/musikr/src/main/java/org/oxycblt/musikr/metadata/MetadataJNI.kt @@ -24,5 +24,5 @@ internal object MetadataJNI { } // This is a rust function, Android Studio has no idea how to link to it - external fun openFile(input: NativeInputStream): String + external fun openFile(input: NativeInputStream): Metadata? }