summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-04-24 15:15:42 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-04-28 00:29:25 +0200
commitb1ee9d6cb0f28ba3dc5b35be97cd9507c39ede48 (patch)
tree2fe9ee45196c6fa8ee907503dc2bb1495489087c /recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch
parent8885505217f4180eb82ffc3ac8b0b9a24f5036b5 (diff)
2nd part of the layer/profile rework [2/2]
Main goal of this is to move the agl-service-* bindings into the core and to unify common recipes like wayland/weston into meta-agl-profile-graphical. As a placeholder for recipes is meta-agl-profile-demo which are being reshuffled. TLDR: remove recipes from meta-agl-demo that were moved to other layers Bug-AGL: SPEC-145 , SPEC-876 , SPEC-877 v2: moving updated udisks changes to meta-agl Change-Id: I873107f00adadeb6f3f266cce37b513fe6d44cf2 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch')
-rw-r--r--recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch80
1 files changed, 0 insertions, 80 deletions
diff --git a/recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch b/recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch
deleted file mode 100644
index 007e4676..00000000
--- a/recipes-qt/qt5/qtmultimedia/0001-metadata-image-support-with-the-data-URL-scheme-for-.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From ed61f1d932c5c6d38458fcd2e1d5d154383f017e Mon Sep 17 00:00:00 2001
-From: Tasuku Suzuki <tasuku.suzuki@qt.io>
-Date: Mon, 12 Dec 2016 16:32:47 +0900
-Subject: [PATCH] metadata image support with the "data" URL scheme for QtQuick
-
-add posterImage, coverArtImage and thumbnailImage to metadata
-
-Change-Id: I10b9bae10c219ffa41506d6e6b345020790217a6
----
- .../multimedia/qdeclarativemediametadata_p.h | 33 ++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
-diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h
-index ede7f87..6a6a815 100644
---- a/src/imports/multimedia/qdeclarativemediametadata_p.h
-+++ b/src/imports/multimedia/qdeclarativemediametadata_p.h
-@@ -51,6 +51,9 @@
- // We mean it.
- //
-
-+#include <QtCore/QBuffer>
-+#include <QtGui/QImage>
-+#include <QtGui/QImageWriter>
- #include <QtQml/qqml.h>
- #include <QtMultimedia/qmediametadata.h>
- #include <QtMultimedia/qmediaservice.h>
-@@ -153,6 +156,9 @@ class QDeclarativeMediaMetaData : public QObject
- Q_PROPERTY(QVariant gpsProcessingMethod READ gpsProcessingMethod WRITE setGPSProcessingMethod NOTIFY metaDataChanged)
- Q_PROPERTY(QVariant gpsAreaInformation READ gpsAreaInformation WRITE setGPSAreaInformation NOTIFY metaDataChanged)
-
-+ Q_PROPERTY(QVariant posterImage READ posterImage NOTIFY metaDataChanged)
-+ Q_PROPERTY(QVariant coverArtImage READ coverArtImage NOTIFY metaDataChanged)
-+ Q_PROPERTY(QVariant thumbnailImage READ thumbnailImage NOTIFY metaDataChanged)
- public:
- QDeclarativeMediaMetaData(QMediaObject *player, QObject *parent = 0)
- : QObject(parent)
-@@ -425,6 +431,16 @@ QT_WARNING_POP
- void setGPSAreaInformation(const QVariant &information) {
- setMetaData(QMediaMetaData::GPSAreaInformation, information); }
-
-+ QVariant posterImage() const {
-+ return convertImageToUrl(m_mediaObject->metaData(QMediaMetaData::PosterImage));
-+ }
-+ QVariant coverArtImage() const {
-+ return convertImageToUrl(m_mediaObject->metaData(QMediaMetaData::CoverArtImage));
-+ }
-+ QVariant thumbnailImage() const {
-+ return convertImageToUrl(m_mediaObject->metaData(QMediaMetaData::ThumbnailImage));
-+ }
-+
- Q_SIGNALS:
- void metaDataChanged();
-
-@@ -440,6 +456,23 @@ private:
- m_writerControl->setMetaData(key, value);
- }
-
-+ QUrl convertImageToUrl(const QVariant &variant) const
-+ {
-+ if (variant.type() != QVariant::Image)
-+ return QUrl();
-+
-+ QImage image = variant.value<QImage>();
-+ QByteArray data;
-+ QBuffer buffer(&data);
-+ buffer.open(QBuffer::WriteOnly);
-+ QImageWriter png(&buffer, "png");
-+ if (!png.write(image)) {
-+ return QUrl();
-+ }
-+ buffer.close();
-+ return QUrl(QStringLiteral("data:image/png;base64,") + data.toBase64());
-+ }
-+
- QMediaObject *m_mediaObject;
- QMetaDataWriterControl *m_writerControl;
- bool m_requestedWriterControl;
---
-2.7.4
-
n337'>337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404