From ce76f2a23629bf55b6fd6fbad0e1e8c40718bdfb Mon Sep 17 00:00:00 2001 From: Swapnil Tripathi Date: Sat, 14 Aug 2021 20:43:38 +0530 Subject: [PATCH] Applied suggestions. --- src/audiomanager.cpp | 1 - src/mediasessionclient.cpp | 12 ++++++------ src/mediasessionclient.h | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/audiomanager.cpp b/src/audiomanager.cpp index aeab9350..b6027e9b 100644 --- a/src/audiomanager.cpp +++ b/src/audiomanager.cpp @@ -79,7 +79,6 @@ AudioManager::AudioManager(QObject *parent) connect(this, &AudioManager::logError, &ErrorLogModel::instance(), &ErrorLogModel::monitorErrorMessages); - // MediaSessionClient object. new MediaSessionClient(this); // Check if an entry was playing when the program was shut down and restore it diff --git a/src/mediasessionclient.cpp b/src/mediasessionclient.cpp index 2577a26e..7d9cb266 100644 --- a/src/mediasessionclient.cpp +++ b/src/mediasessionclient.cpp @@ -17,11 +17,11 @@ MediaSessionClient::MediaSessionClient(AudioManager *audioPlayer, QObject *paren // Sets the current playback state. connect(m_audioPlayer, &AudioManager::entryChanged, this, &MediaSessionClient::setSessionMetadata); // Updates the android session's metadata. - connect(m_audioPlayer, &AudioManager::playbackRateChanged, this, &MediaSessionClient::setSessionRate); + connect(m_audioPlayer, &AudioManager::playbackRateChanged, this, &MediaSessionClient::setPlaybackRate); // Sets the rate of the media playback. - connect(m_audioPlayer, &AudioManager::durationChanged, this, &MediaSessionClient::setSessionDuration); + connect(m_audioPlayer, &AudioManager::durationChanged, this, &MediaSessionClient::setDuration); // Sets the playback duration metadata. - connect(m_audioPlayer, &AudioManager::positionChanged, this, &MediaSessionClient::setSessionPosition); + connect(m_audioPlayer, &AudioManager::positionChanged, this, &MediaSessionClient::setPosition); // Sets the playback position metadata. connect(m_audioPlayer, &AudioManager::playing, this, &MediaSessionClient::setPlaying); // Sets the playback to playing. @@ -79,7 +79,7 @@ void MediaSessionClient::setSessionMetadata() QAndroidJniObject::callStaticMethod("org/kde/kasts/KastsActivity", "setMetadata","(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;J;J;F)V",title.object(), author.object(), album.object(), position, duration, rate); } -void MediaSessionClient::setSessionRate() +void MediaSessionClient::setPlaybackRate() { /* * Sets the media session's rate metadata. @@ -88,7 +88,7 @@ void MediaSessionClient::setSessionRate() QAndroidJniObject::callStaticMethod("org/kde/kasts/KastsActivity", "setPlaybackSpeed", "(I)V", rate); } -void MediaSessionClient::setSessionDuration() +void MediaSessionClient::setDuration() { /* * Sets the media session's playback duration. @@ -97,7 +97,7 @@ void MediaSessionClient::setSessionDuration() QAndroidJniObject::callStaticMethod("org/kde/kasts/KastsActivity", "setDuration", "(I)V", duration); } -void MediaSessionClient::setSessionPosition() +void MediaSessionClient::setPosition() { /* * Sets the media session's current playback position. diff --git a/src/mediasessionclient.h b/src/mediasessionclient.h index a7af3063..446b4c2b 100644 --- a/src/mediasessionclient.h +++ b/src/mediasessionclient.h @@ -20,9 +20,9 @@ public: private Q_SLOTS: void setSessionPlaybackState(); void setSessionMetadata(); - void setSessionRate(); - void setSessionDuration(); - void setSessionPosition(); + void setPlaybackRate(); + void setDuration(); + void setPosition(); void setPlaying(); void setPaused(); void setStopped();