Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr: update classpaths in native code

Browse source
This commit is contained in:
Alexander Capehart 2024-12-16 15:20:46 -05:00
parent 00520f7fda
commit 9d1978850b
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
musikr/src/main/cpp/JVMInputStream.cpp
View file

@ -26,11 +26,11 @@ JVMInputStream::JVMInputStream(JNIEnv *env, jobject inputStream)
: env(env), inputStream(inputStream) { : env(env), inputStream(inputStream) {
if (!env->IsInstanceOf( if (!env->IsInstanceOf(
inputStream, inputStream,
env->FindClass("org/oxycblt/ktaglib/NativeInputStream"))) { env->FindClass("org/oxycblt/musikr/metadata/NativeInputStream"))) {
throw std::runtime_error("oStream is not an instance of TagLibOStream"); throw std::runtime_error("oStream is not an instance of TagLibOStream");
} }
jclass inputStreamClass = jclass inputStreamClass =
env->FindClass("org/oxycblt/ktaglib/NativeInputStream"); env->FindClass("org/oxycblt/musikr/metadata/NativeInputStream");
inputStreamNameMethod = inputStreamNameMethod =
env->GetMethodID(inputStreamClass, "name", "()Ljava/lang/String;"); env->GetMethodID(inputStreamClass, "name", "()Ljava/lang/String;");
inputStreamReadBlockMethod = inputStreamReadBlockMethod =

6
musikr/src/main/cpp/JVMMetadataBuilder.cpp
View file

@ -129,7 +129,7 @@ void JVMMetadataBuilder::setProperties(TagLib::AudioProperties *properties) {
} }
jobject JVMMetadataBuilder::build() { jobject JVMMetadataBuilder::build() {
jclass propertiesClass = env->FindClass("org/oxycblt/ktaglib/Properties"); jclass propertiesClass = env->FindClass("org/oxycblt/musikr/metadata/Properties");
jmethodID propertiesInit = jmethodID propertiesInit =
env->GetMethodID(propertiesClass, "<init>", "(Ljava/lang/String;JII)V"); env->GetMethodID(propertiesClass, "<init>", "(Ljava/lang/String;JII)V");
jobject propertiesObj = env->NewObject( jobject propertiesObj = env->NewObject(
@ -138,11 +138,11 @@ jobject JVMMetadataBuilder::build() {
properties->sampleRate()); properties->sampleRate());
env->DeleteLocalRef(propertiesClass); env->DeleteLocalRef(propertiesClass);
jclass metadataClass = env->FindClass("org/oxycblt/ktaglib/Metadata"); jclass metadataClass = env->FindClass("org/oxycblt/musikr/metadata/Metadata");
jmethodID metadataInit = jmethodID metadataInit =
env->GetMethodID(metadataClass, "<init>", env->GetMethodID(metadataClass, "<init>",
"(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;[BLorg/" "(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;[BLorg/"
"oxycblt/ktaglib/Properties;)V"); "oxycblt/musikr/metadata/Properties;)V");
jobject id3v2Map = id3v2.getObject(); jobject id3v2Map = id3v2.getObject();
jobject xiphMap = xiph.getObject(); jobject xiphMap = xiph.getObject();
jobject mp4Map = mp4.getObject(); jobject mp4Map = mp4.getObject();