From 064734bfda28ef275d5fbe643c95f091eef9f5ea Mon Sep 17 00:00:00 2001 From: Swapnil Tripathi Date: Mon, 16 Aug 2021 01:58:12 +0530 Subject: [PATCH] Fixes compilation. --- android/AndroidManifest.xml | 2 +- src/audiomanager.cpp | 2 -- src/mediasessionclient.cpp | 31 +++++++++++++++++++++++++++++++ src/mediasessionclient.h | 3 +++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 64430d42..f70a54ed 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -7,7 +7,7 @@ diff --git a/src/audiomanager.cpp b/src/audiomanager.cpp index 1a0599c7..d2cf0e2e 100644 --- a/src/audiomanager.cpp +++ b/src/audiomanager.cpp @@ -12,8 +12,6 @@ #include #include #include -#include -#include #include diff --git a/src/mediasessionclient.cpp b/src/mediasessionclient.cpp index 22cb8845..fd374944 100644 --- a/src/mediasessionclient.cpp +++ b/src/mediasessionclient.cpp @@ -7,6 +7,8 @@ #include "audiomanager.h" #include + +#ifdef Q_OS_ANDROID #include #include @@ -42,6 +44,7 @@ static void seek(JNIEnv *env, jobject thiz, jlong position) { Q_UNUSED(env) Q_UNUSED(thiz) + Q_UNUSED(position) qDebug() << "JAVA seek() working."; // implement seek } @@ -70,6 +73,7 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) } return JNI_VERSION_1_4; } +#endif MediaSessionClient* MediaSessionClient::s_instance = nullptr; @@ -116,7 +120,13 @@ void MediaSessionClient::setSessionPlaybackState() status = 2; break; } +#ifndef Q_OS_ANDROID + Q_UNUSED(status) +#endif + +#ifdef Q_OS_ANDROID QAndroidJniObject::callStaticMethod("org/kde/kasts/KastsActivity", "setSessionState", "(I)V", status); +#endif } void MediaSessionClient::setSessionMetadata() @@ -134,6 +144,7 @@ void MediaSessionClient::setSessionMetadata() authorString.append(QStringLiteral(", ")); } } +#ifdef Q_OS_ANDROID QAndroidJniObject title = QAndroidJniObject::fromString(entry->title()); // Title string QAndroidJniObject author = QAndroidJniObject::fromString(authorString); @@ -148,6 +159,7 @@ void MediaSessionClient::setSessionMetadata() // Playback rate QAndroidJniObject::callStaticMethod("org/kde/kasts/KastsActivity", "setMetadata","(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JJF)V",title.object(), author.object(), album.object(), (jlong)position, (jlong)duration, (jfloat)rate); +#endif } void MediaSessionClient::setPlaybackRate() @@ -156,7 +168,13 @@ void MediaSessionClient::setPlaybackRate() * Sets the media session's rate metadata. */ int rate = m_audioPlayer->playbackRate(); +#ifndef Q_OS_ANDROID + Q_UNUSED(rate) +#endif + +#ifdef Q_OS_ANDROID QAndroidJniObject::callStaticMethod("org/kde/kasts/KastsActivity", "setPlaybackSpeed", "(I)V", rate); +#endif } void MediaSessionClient::setDuration() @@ -165,7 +183,13 @@ void MediaSessionClient::setDuration() * Sets the media session's playback duration. */ qint64 duration = qint64(m_audioPlayer->duration()); +#ifndef Q_OS_ANDROID + Q_UNUSED(duration) +#endif + +#ifdef Q_OS_ANDROID QAndroidJniObject::callStaticMethod("org/kde/kasts/KastsActivity", "setDuration", "(J)V", (jlong)duration); +#endif } void MediaSessionClient::setPosition() @@ -174,5 +198,12 @@ void MediaSessionClient::setPosition() * Sets the media session's current playback position. */ qint64 position = qint64(m_audioPlayer->position()); + +#ifndef Q_OS_ANDROID + Q_UNUSED(position) +#endif + +#ifdef Q_OS_ANDROID QAndroidJniObject::callStaticMethod("org/kde/kasts/KastsActivity", "setPosition", "(J)V", (jlong)position); +#endif } diff --git a/src/mediasessionclient.h b/src/mediasessionclient.h index ee2b366a..da0fcb81 100644 --- a/src/mediasessionclient.h +++ b/src/mediasessionclient.h @@ -6,7 +6,10 @@ #pragma once #include + +#ifdef Q_OS_ANDROID #include +#endif class AudioManager; class Entry;