From 2802b4bbbf11311f18b637c276e7fffd87f38799 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 26 Feb 2021 09:57:27 +0200 Subject: [PATCH] generic: adjust to media classes changes Signed-off-by: Ivailo Monev --- kdeplasma-addons/applets/bball/bball.cpp | 1 + kdeplasma-addons/applets/bball/bball.h | 7 +++---- kdeplasma-addons/applets/bball/plasma-applet-bball.desktop | 2 +- okular/core/audioplayer.cpp | 1 + okular/okular_part.desktop | 2 +- okular/ui/snapshottaker.cpp | 1 + okular/ui/videowidget.cpp | 1 + 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kdeplasma-addons/applets/bball/bball.cpp b/kdeplasma-addons/applets/bball/bball.cpp index 577eaa19..1b0af080 100644 --- a/kdeplasma-addons/applets/bball/bball.cpp +++ b/kdeplasma-addons/applets/bball/bball.cpp @@ -408,6 +408,7 @@ void bballApplet::playBoingSound() // create the player if missing if (!m_soundPlayer) { m_soundPlayer = new KAudioPlayer(this); + m_soundPlayer->setPlayerID("plasma_applet_bball"); m_soundPlayer->setVolume(m_sound_volume); } diff --git a/kdeplasma-addons/applets/bball/bball.h b/kdeplasma-addons/applets/bball/bball.h index 12dfbb56..1bd2ef19 100644 --- a/kdeplasma-addons/applets/bball/bball.h +++ b/kdeplasma-addons/applets/bball/bball.h @@ -22,8 +22,10 @@ #define bball_HEADER #include -#include +#include #include +#include +#include #include #include @@ -32,9 +34,6 @@ #include "ui_bballConfig.h" -#include -#include - class bballApplet : public Plasma::Applet { Q_OBJECT diff --git a/kdeplasma-addons/applets/bball/plasma-applet-bball.desktop b/kdeplasma-addons/applets/bball/plasma-applet-bball.desktop index 6a50906d..9551d2df 100644 --- a/kdeplasma-addons/applets/bball/plasma-applet-bball.desktop +++ b/kdeplasma-addons/applets/bball/plasma-applet-bball.desktop @@ -120,7 +120,7 @@ X-KDE-PluginInfo-Category=Fun and Games X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true -X-KDE-MediaPlayer=true +X-KDE-MediaPlayer=plasma_applet_bball X-Plasma-Requires-FileDialog=Unused X-Plasma-Requires-LaunchApp=Unused diff --git a/okular/core/audioplayer.cpp b/okular/core/audioplayer.cpp index 64924d82..73a4c92c 100644 --- a/okular/core/audioplayer.cpp +++ b/okular/core/audioplayer.cpp @@ -102,6 +102,7 @@ bool AudioPlayerPrivate::play( const SoundInfo& si ) kDebug() ; PlayData * data = new PlayData(); data->m_player = new KAudioPlayer(); + data->m_player->setPlayerID("okulartpart_audio"); data->m_player->setVolume( float(si.volume) ); data->m_info = si; bool valid = false; diff --git a/okular/okular_part.desktop b/okular/okular_part.desktop index a1922c3a..1a61fd77 100644 --- a/okular/okular_part.desktop +++ b/okular/okular_part.desktop @@ -62,6 +62,6 @@ Name[zh_CN]=Okular Name[zh_TW]=文件檢視_Okular X-KDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart X-KDE-Library=okularpart -X-KDE-MediaPlayer=true +X-KDE-MediaPlayer=okularpart_audio,okularpart_video,okularpart_snapshot Type=Service MimeType=application/vnd.kde.okular-archive; diff --git a/okular/ui/snapshottaker.cpp b/okular/ui/snapshottaker.cpp index 63c134d1..1518e370 100644 --- a/okular/ui/snapshottaker.cpp +++ b/okular/ui/snapshottaker.cpp @@ -17,6 +17,7 @@ SnapshotTaker::SnapshotTaker( const QString &url, QObject *parent ) : QObject( parent ) , m_player( new KMediaPlayer ) { + m_player->setPlayerID("okularpart_snapshot"); m_player->load( url ); m_player->hide(); diff --git a/okular/ui/videowidget.cpp b/okular/ui/videowidget.cpp index 5159443d..754c9f25 100644 --- a/okular/ui/videowidget.cpp +++ b/okular/ui/videowidget.cpp @@ -236,6 +236,7 @@ VideoWidget::VideoWidget( const Okular::Annotation *annotation, Okular::Movie *m mainlay->setSpacing( 0 ); d->player = new KMediaPlayer( playerPage ); + d->player->setPlayerID("okulartpart_video"); d->player->installEventFilter( playerPage ); mainlay->addWidget( d->player ); -- 2.11.0