Merge lp:~jamesh/mediascanner/qml-plugin into lp:mediascanner/v2

[James Henstridge]

First stages of a QML plugin for the Media Scanner. At present it only exposes the query() and lookup() interfaces.

QML binding for mediascanner library. Not yet complete, but enough to perform a simple query from QML.

Currently work in progress, but I wanted Jenkins to see it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:195
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner/qml-plugin/+merge/199078/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner-v2-ci/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-amd64-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-i386-ci/13/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner-v2-ci/13/rebuild

review: Needs Fixing (continuous-integration)

[Michal Hruby (mhr3)]

124 + return new MediaFileWrapper(store.lookup(filename.toStdString()));

This doesn't indicate who's the owner of the object, you should either set parent, or explicitly assign ownership to QML.

review: Needs Fixing

[Michal Hruby (mhr3)]

You probably want:

QQmlEngine::setObjectOwnership(wrapper, QQmlEngine::JavaScriptOwnership);

[Michal Hruby (mhr3)]

153 + Q_INVOKABLE QList<QObject*> query(const QString &q, MediaType type);

It'd probably be better if this was returning a real model instance - subclass of QAbstractItemModel, it's not clear to me whether QML would know how to manage the object lifecycle of the List + ObjectPtrs.

[Jussi Pakkanen (jpakkane)]

From what I know of QML, looks fine so far.

[Jussi Pakkanen (jpakkane)]

The documentation says that a QML engine will take ownership of every Qt object without a parent that is passed to it.

[Michał Sawicz (saviq)]

Added ubuntu-sdk-team to review the QML API.

[lp:~jamesh/mediascanner/qml-plugin]

196. By James Henstridge on 2013-12-17

Update packaging to cover QML plugin, and set plugin version to 0.1.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:196
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner/qml-plugin/+merge/199078/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner-v2-ci/14/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner-v2-ci/14/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jamesh/mediascanner/qml-plugin]

197. By James Henstridge on 2013-12-17

Depend on qtdeclarative5-dev too.

198. By James Henstridge on 2013-12-17

Correctly namespace the QML file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:198
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner/qml-plugin/+merge/199078/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner-v2-ci/15/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-i386-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner-v2-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

A policy for our own QML plugins is that it's installed into a version specific folder (/usr/lib/ARCH/qt5/qml/Foo.0.1) and has a package name of sort "qtdeclarative5-plugin-foo0.1". See Friends for an example http://bazaar.launchpad.net/~super-friends/qml-friends/trunk/files/head:/debian/

review: Needs Fixing

[Timo Jyrinki (timo-jyrinki)]

(in order to have, if necessary, multiple API versions of the plugin available for backwards compatibility)

[lp:~jamesh/mediascanner/qml-plugin]

199. By James Henstridge on 2013-12-17

Version the QML plugin package and installation dir.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:199
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner/qml-plugin/+merge/199078/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner-v2-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner-v2-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jamesh/mediascanner/qml-plugin]

200. By James Henstridge on 2013-12-18

Explicitly set ownership of MediaFileWrapper objects.

201. By James Henstridge on 2013-12-18

Add remaining MediaFile properties to QML wrapper.

[James Henstridge (jamesh)]

Thanks for everyone's feedback.

@mhr3: I've added the explicit QQmlEngine::setObjectOwnership() calls, and verified that the MediaFileWrapper instances are being destroyed when my test program exits. That would seem to indicate that it can handle a QList<QObject*> okay.

I agree that we should provide some QAbstractItemModel based APIs, but at this point I just wanted to get the basics working so we could ask the music-app guys what kind of interface they're after. The alternative would be to spend a lot of time on something they ultimately can't use.

@timo: thanks for the pointers. I think I've got the install directory and package name fixed up now.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:201
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jamesh/mediascanner/qml-plugin/+merge/199078/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner-v2-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner-v2-ci/17/rebuild

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Looks good to me!

review: Approve

[lp:~jamesh/mediascanner/qml-plugin]

202. By James Henstridge on 2014-01-02

Merge from trunk.

203. By James Henstridge on 2014-01-02

Rearrange source tree to match QML import paths so we can generate the
plugins.qmltypes file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/mediascanner-v2-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-i386-ci/20/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner-v2-ci/20/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jamesh/mediascanner/qml-plugin]

204. By James Henstridge on 2014-01-02

Build-depend on QtQuick, since qmlplugindump seems to need it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/mediascanner-v2-ci/21/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-i386-ci/21/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner-v2-ci/21/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jamesh/mediascanner/qml-plugin]

205. By James Henstridge on 2014-01-02

Include the generated plugin.qmltypes file under source control, and add
a "make update-qmltypes" command to update it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:205
http://jenkins.qa.ubuntu.com/job/mediascanner-v2-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner-v2-ci/22/rebuild

review: Approve (continuous-integration)

Unmerged revisions

205. By James Henstridge on 2014-01-02

Include the generated plugin.qmltypes file under source control, and add
a "make update-qmltypes" command to update it.

204. By James Henstridge on 2014-01-02

Build-depend on QtQuick, since qmlplugindump seems to need it.

203. By James Henstridge on 2014-01-02

Rearrange source tree to match QML import paths so we can generate the
plugins.qmltypes file.

202. By James Henstridge on 2014-01-02

Merge from trunk.

201. By James Henstridge on 2013-12-18

Add remaining MediaFile properties to QML wrapper.

200. By James Henstridge on 2013-12-18

Explicitly set ownership of MediaFileWrapper objects.

199. By James Henstridge on 2013-12-17

Version the QML plugin package and installation dir.

198. By James Henstridge on 2013-12-17

Correctly namespace the QML file.

197. By James Henstridge on 2013-12-17

Depend on qtdeclarative5-dev too.

196. By James Henstridge on 2013-12-17

Update packaging to cover QML plugin, and set plugin version to 0.1.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-12-18 10:57:10 +0000
+++ CMakeLists.txt	2014-01-02 10:16:09 +0000
@@ -17,6 +17,7 @@
 pkg_check_modules(GST gstreamer-1.0 gstreamer-pbutils-1.0 REQUIRED)
 pkg_check_modules(UNITY unity REQUIRED)
 find_package(Threads REQUIRED)
+find_package(Qt5Core REQUIRED)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -Wextra -std=c99")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -std=c++11")
@@ -32,6 +33,7 @@
 
 add_subdirectory(src/mediascanner)
 add_subdirectory(src/daemon)
+add_subdirectory(src/qml/Ubuntu/MediaScanner)
 add_subdirectory(src/utils)
 add_subdirectory(test)
 
 
=== modified file 'debian/control'
--- debian/control	2013-12-18 10:42:48 +0000
+++ debian/control	2014-01-02 10:16:09 +0000
@@ -10,6 +10,12 @@
                libgstreamer1.0-dev,
                libgtest-dev,
                libsqlite3-dev,
+               qt5-default,
+               qtbase5-dev,
+               qtbase5-dev-tools,
+               qtdeclarative5-dev,
+               qtdeclarative5-dev-tools,
+               qtdeclarative5-qtquick2-plugin,
 # For running unit tests
                gstreamer1.0-plugins-base,
                gstreamer1.0-plugins-good,
@@ -52,3 +58,13 @@
 Description: Development files for libmediascanner
  This package provides the infrastructure for using the media scanner's
  access library in C++ based projects.
+
+Package: qtdeclarative5-ubuntu-mediascanner0.1
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends},
+Depends: mediascanner (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: QML plugin for the Ubuntu Media Scanner
+ This package provides components that allow access to the media
+ scanner index from Qt Quick 2 / QML applications.
 
=== modified file 'debian/copyright'
--- debian/copyright	2013-12-20 11:11:54 +0000
+++ debian/copyright	2014-01-02 10:16:09 +0000
@@ -17,7 +17,7 @@
  On Debian/Ubuntu systems, the full text of the GPL v3 can be found in
  `/usr/share/common-licenses/GPL-3'
 
-Files: src/mediascanner/*
+Files: src/mediascanner/* src/qml/*
 Copyright: 2013 Canonical Ltd.
 License: LGPL-3
  This library is free software; you can redistribute it and/or
 
=== added file 'debian/qtdeclarative5-ubuntu-mediascanner0.1.install'
--- debian/qtdeclarative5-ubuntu-mediascanner0.1.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-ubuntu-mediascanner0.1.install	2014-01-02 10:16:09 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml/Ubuntu/MediaScanner.0.1/*
 
=== added directory 'src/qml'
=== added directory 'src/qml/Ubuntu'
=== added directory 'src/qml/Ubuntu/MediaScanner'
=== added file 'src/qml/Ubuntu/MediaScanner/CMakeLists.txt'
--- src/qml/Ubuntu/MediaScanner/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/qml/Ubuntu/MediaScanner/CMakeLists.txt	2014-01-02 10:16:09 +0000
@@ -0,0 +1,52 @@
+include_directories(../../..)
+
+set(QML_PLUGIN_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml/Ubuntu/MediaScanner.0.1")
+
+add_library(mediascanner-qml MODULE
+  plugin.cc
+  MediaFileWrapper.cc
+  MediaStoreWrapper.cc
+)
+
+set_target_properties(mediascanner-qml PROPERTIES AUTOMOC TRUE)
+qt5_use_modules(mediascanner-qml Qml)
+target_link_libraries(mediascanner-qml mediascanner)
+
+install(
+  TARGETS mediascanner-qml
+  LIBRARY DESTINATION ${QML_PLUGIN_DIR}
+)
+
+file(GLOB QMLFILES
+  qmldir
+)
+
+add_custom_target(mediascanner-qmlfiles ALL
+  COMMAND cp ${QMLFILES} ${CMAKE_CURRENT_BINARY_DIR}
+  DEPENDS ${QMLFILES}
+)
+
+install(
+  FILES ${QMLFILES}
+  DESTINATION ${QML_PLUGIN_DIR}
+)
+
+if(NOT CMAKE_CROSSCOMPILING)
+  find_program(qmlplugindump_exe qmlplugindump)
+  if(NOT qmlplugindump_exe)
+    msg(FATAL_ERROR "Could not locate qmlplugindump.")
+  endif()
+
+  # qmlplugindump doesn't run reliably in the CI environment (it seems
+  # to be instantiating the types, which fails when there is no media
+  # database).  So add a 
+  add_custom_target(update-qmltypes
+    COMMAND QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/src/qml ${qmlplugindump_exe} -notrelocatable Ubuntu.MediaScanner 0.1 > ${CMAKE_CURRENT_SOURCE_DIR}/plugin.qmltypes
+    DEPENDS mediascanner-qml mediascanner-qmlfiles
+  )
+endif()
+
+install(
+  FILES plugin.qmltypes
+  DESTINATION ${QML_PLUGIN_DIR}
+)
 
=== added file 'src/qml/Ubuntu/MediaScanner/MediaFileWrapper.cc'
--- src/qml/Ubuntu/MediaScanner/MediaFileWrapper.cc	1970-01-01 00:00:00 +0000
+++ src/qml/Ubuntu/MediaScanner/MediaFileWrapper.cc	2014-01-02 10:16:09 +0000
@@ -0,0 +1,49 @@
+#include "MediaFileWrapper.hh"
+
+MediaFileWrapper::MediaFileWrapper(const MediaFile media, QObject *parent)
+    : QObject(parent), media(media) {
+}
+
+QString MediaFileWrapper::filename() const {
+    return QString::fromStdString(media.getFileName());
+}
+
+QString MediaFileWrapper::uri() const {
+    return QString::fromStdString(media.getUri());
+}
+
+QString MediaFileWrapper::contentType() const {
+    return QString::fromStdString(media.getContentType());
+}
+
+QString MediaFileWrapper::eTag() const {
+    return QString::fromStdString(media.getETag());
+}
+
+QString MediaFileWrapper::title() const {
+    return QString::fromStdString(media.getTitle());
+}
+
+QString MediaFileWrapper::author() const {
+    return QString::fromStdString(media.getAuthor());
+}
+
+QString MediaFileWrapper::album() const {
+    return QString::fromStdString(media.getAlbum());
+}
+
+QString MediaFileWrapper::albumArtist() const {
+    return QString::fromStdString(media.getAlbumArtist());
+}
+
+QString MediaFileWrapper::date() const {
+    return QString::fromStdString(media.getDate());
+}
+
+int MediaFileWrapper::trackNumber() const {
+    return media.getTrackNumber();
+}
+
+int MediaFileWrapper::duration() const {
+    return media.getDuration();
+}
 
=== added file 'src/qml/Ubuntu/MediaScanner/MediaFileWrapper.hh'
--- src/qml/Ubuntu/MediaScanner/MediaFileWrapper.hh	1970-01-01 00:00:00 +0000
+++ src/qml/Ubuntu/MediaScanner/MediaFileWrapper.hh	2014-01-02 10:16:09 +0000
@@ -0,0 +1,39 @@
+#ifndef MEDIASCANNER_QML_MEDIAFILEWRAPPER_H
+#define MEDIASCANNER_QML_MEDIAFILEWRAPPER_H
+
+#include <QObject>
+#include <QString>
+
+#include <mediascanner/MediaFile.hh>
+
+class MediaFileWrapper : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString filename READ filename CONSTANT)
+    Q_PROPERTY(QString uri READ uri CONSTANT)
+    Q_PROPERTY(QString contentType READ contentType CONSTANT)
+    Q_PROPERTY(QString eTag READ eTag CONSTANT)
+    Q_PROPERTY(QString title READ title CONSTANT)
+    Q_PROPERTY(QString author READ author CONSTANT)
+    Q_PROPERTY(QString album READ album CONSTANT)
+    Q_PROPERTY(QString albumArtist READ albumArtist CONSTANT)
+    Q_PROPERTY(QString date READ date CONSTANT)
+    Q_PROPERTY(int trackNumber READ trackNumber CONSTANT)
+    Q_PROPERTY(int duration READ duration CONSTANT)
+public:
+    MediaFileWrapper(MediaFile media, QObject *parent=0);
+    QString filename() const;
+    QString uri() const;
+    QString contentType() const;
+    QString eTag() const;
+    QString title() const;
+    QString author() const;
+    QString album() const;
+    QString albumArtist() const;
+    QString date() const;
+    int trackNumber() const;
+    int duration() const;
+private:
+    const MediaFile media;
+};
+
+#endif
 
=== added file 'src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.cc'
--- src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.cc	1970-01-01 00:00:00 +0000
+++ src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.cc	2014-01-02 10:16:09 +0000
@@ -0,0 +1,22 @@
+#include "MediaStoreWrapper.hh"
+#include <QQmlEngine>
+
+MediaStoreWrapper::MediaStoreWrapper(QObject *parent)
+    : QObject(parent), store(MS_READ_ONLY) {
+}
+
+QList<QObject*> MediaStoreWrapper::query(const QString &q, MediaType type) {
+    QList<QObject*> result;
+    for (const auto &media : store.query(q.toStdString(), static_cast<::MediaType>(type))) {
+        auto wrapper = new MediaFileWrapper(media);
+        QQmlEngine::setObjectOwnership(wrapper, QQmlEngine::JavaScriptOwnership);
+        result.append(wrapper);
+    }
+    return result;
+}
+
+MediaFileWrapper *MediaStoreWrapper::lookup(const QString &filename) {
+    auto wrapper = new MediaFileWrapper(store.lookup(filename.toStdString()));
+    QQmlEngine::setObjectOwnership(wrapper, QQmlEngine::JavaScriptOwnership);
+    return wrapper;
+}
 
=== added file 'src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.hh'
--- src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.hh	1970-01-01 00:00:00 +0000
+++ src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.hh	2014-01-02 10:16:09 +0000
@@ -0,0 +1,30 @@
+#ifndef MEDIASCANNER_QML_MEDIASTOREWRAPPER_H
+#define MEDIASCANNER_QML_MEDIASTOREWRAPPER_H
+
+#include <QList>
+#include <QObject>
+#include <QString>
+
+#include <mediascanner/MediaStore.hh>
+#include "MediaFileWrapper.hh"
+
+class MediaStoreWrapper : public QObject {
+    Q_OBJECT
+    Q_ENUMS(MediaType)
+public:
+    enum MediaType {
+        Audio = AudioMedia,
+        Video = VideoMedia,
+        All = AllMedia,
+    };
+    typedef enum MediaType MediaType;
+    MediaStoreWrapper(QObject *parent=0);
+
+    Q_INVOKABLE QList<QObject*> query(const QString &q, MediaType type);
+    Q_INVOKABLE MediaFileWrapper *lookup(const QString &filename);
+
+private:
+    MediaStore store;
+};
+
+#endif
 
=== added file 'src/qml/Ubuntu/MediaScanner/plugin.cc'
--- src/qml/Ubuntu/MediaScanner/plugin.cc	1970-01-01 00:00:00 +0000
+++ src/qml/Ubuntu/MediaScanner/plugin.cc	2014-01-02 10:16:09 +0000
@@ -0,0 +1,9 @@
+#include "plugin.hh"
+#include "MediaFileWrapper.hh"
+#include "MediaStoreWrapper.hh"
+
+void MediaScannerPlugin::registerTypes(const char *uri) {
+    qmlRegisterType<MediaStoreWrapper>(uri, 0, 1, "MediaStore");
+    qmlRegisterUncreatableType<MediaFileWrapper>(uri, 0, 1, "MediaFile",
+        "Use a MediaStore to retrieve MediaFiles");
+}
 
=== added file 'src/qml/Ubuntu/MediaScanner/plugin.hh'
--- src/qml/Ubuntu/MediaScanner/plugin.hh	1970-01-01 00:00:00 +0000
+++ src/qml/Ubuntu/MediaScanner/plugin.hh	2014-01-02 10:16:09 +0000
@@ -0,0 +1,15 @@
+#ifndef PLUGIN_HH_
+#define PLUGIN_HH_
+
+#include <QtQml>
+
+class MediaScannerPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    virtual void registerTypes(const char *uri) override;
+};
+
+#endif
 
=== added file 'src/qml/Ubuntu/MediaScanner/plugin.qmltypes'
--- src/qml/Ubuntu/MediaScanner/plugin.qmltypes	1970-01-01 00:00:00 +0000
+++ src/qml/Ubuntu/MediaScanner/plugin.qmltypes	2014-01-02 10:16:09 +0000
@@ -0,0 +1,49 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated with the command '/usr/lib/x86_64-linux-gnu/qt5/bin/qmlplugindump -notrelocatable Ubuntu.MediaScanner 0.1'.
+
+Module {
+    Component {
+        name: "MediaFileWrapper"
+        prototype: "QObject"
+        exports: ["Ubuntu.MediaScanner/MediaFile 0.1"]
+        Property { name: "filename"; type: "string"; isReadonly: true }
+        Property { name: "uri"; type: "string"; isReadonly: true }
+        Property { name: "contentType"; type: "string"; isReadonly: true }
+        Property { name: "eTag"; type: "string"; isReadonly: true }
+        Property { name: "title"; type: "string"; isReadonly: true }
+        Property { name: "author"; type: "string"; isReadonly: true }
+        Property { name: "album"; type: "string"; isReadonly: true }
+        Property { name: "albumArtist"; type: "string"; isReadonly: true }
+        Property { name: "date"; type: "string"; isReadonly: true }
+        Property { name: "trackNumber"; type: "int"; isReadonly: true }
+        Property { name: "duration"; type: "int"; isReadonly: true }
+    }
+    Component {
+        name: "MediaStoreWrapper"
+        prototype: "QObject"
+        exports: ["Ubuntu.MediaScanner/MediaStore 0.1"]
+        Enum {
+            name: "MediaType"
+            values: {
+                "Audio": 1,
+                "Video": 2,
+                "All": 3
+            }
+        }
+        Method {
+            name: "query"
+            type: "QList<QObject*>"
+            Parameter { name: "q"; type: "string" }
+            Parameter { name: "type"; type: "MediaType" }
+        }
+        Method {
+            name: "lookup"
+            type: "MediaFileWrapper*"
+            Parameter { name: "filename"; type: "string" }
+        }
+    }
+}
 
=== added file 'src/qml/Ubuntu/MediaScanner/qmldir'
--- src/qml/Ubuntu/MediaScanner/qmldir	1970-01-01 00:00:00 +0000
+++ src/qml/Ubuntu/MediaScanner/qmldir	2014-01-02 10:16:09 +0000
@@ -0,0 +1,2 @@
+module Ubuntu.MediaScanner
+plugin mediascanner-qml