tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Add album art support for mpris plugin"

Browse source 
This was very poorly implemented and can't stay as it is right now:
 - Every second or so the art image was being loaded from disk, scaled,
   base64 encoded and sent over the freakin network!
 - The Android interface didn't take into account small screens, and
   adding the image would cut stuff out of the screen.
 - Didn't manage "edge cases" like playing a song without cover after one
   with cover (previous image was still being shown) or changing players.

This reverts commit e66096d05a.

# Conflicts:
#	plugins/mpriscontrol/mpriscontrolplugin.cpp
This commit is contained in:
Albert Vaca 2016-12-08 23:49:06 +01:00
parent a05ab9f841
commit 0f643d9c57
3 changed files with 2 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 2.8.12)
find_package(ECM 0.0.9 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake)
find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Gui)
find_package(Qt5 5.2 REQUIRED COMPONENTS Quick)
find_package(KF5 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons)
find_package(KF5DocTools)
find_package(Qca-qt5 2.1.0 REQUIRED)

2
plugins/mpriscontrol/CMakeLists.txt
View file

@ -16,4 +16,4 @@ qt5_add_dbus_interface(
kdeconnect_add_plugin(kdeconnect_mpriscontrol JSON kdeconnect_mpriscontrol.json SOURCES ${kdeconnect_mpriscontrol_SRCS})
target_link_libraries(kdeconnect_mpriscontrol Qt5::DBus kdeconnectcore Qt5::Gui)
target_link_libraries(kdeconnect_mpriscontrol Qt5::DBus kdeconnectcore)

30
plugins/mpriscontrol/mpriscontrolplugin.cpp
View file

@ -28,10 +28,6 @@
#include <QDBusMessage>
#include <QDBusServiceWatcher>
#include <QImage>
#include <QBuffer>
#include <QByteArray>
#include <KPluginFactory>
#include <core/device.h>
@ -142,32 +138,6 @@ void MprisControlPlugin::propertiesChanged(const QString& propertyInterface, con
}
somethingToSend = true;
}
if (nowPlayingMap.contains(QStringLiteral("mpris:artUrl"))) {
const QUrl artUrl(nowPlayingMap[QStringLiteral("mpris:artUrl")].toString());
/*
* We only handle images stored locally right now but it should be easy
* enough to download remote images and send them.
*/
const int artMaxWidth = 512;
const int artMaxHeight = 512;
if (artUrl.isLocalFile()) {
QImage artImage(artUrl.path());
// Scale the image to a sane size
artImage = artImage.scaled({artMaxWidth, artMaxHeight}, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QByteArray imageBufferArray;
QBuffer imageBuffer(&imageBufferArray);
imageBuffer.open(QIODevice::WriteOnly);
artImage.save(&imageBuffer, "PNG");
const QString base64Image = QString::fromLatin1(imageBufferArray.toBase64());
np.set(QStringLiteral("artImage"), base64Image);
somethingToSend = true;
}
}
}
if (properties.contains(QStringLiteral("PlaybackStatus"))) {