11 files changed, 226 insertions, 4 deletions
diff --git a/src/doc/src/qtivi-modules.qdoc b/src/doc/src/qtivi-modules.qdoc
index 3498531..852158d 100644
--- a/src/doc/src/qtivi-modules.qdoc
+++ b/src/doc/src/qtivi-modules.qdoc
@@ -42,6 +42,9 @@
 
     \section2 Qt IVI Vehicle Functions C++ Classes
     \generatelist classesbymodule QtIviVehicleFunctions
+
+    \section2 Qt IVI Media C++ Classes
+    \generatelist classesbymodule QtIviMedia
 */
 
 /*!
@@ -62,4 +65,7 @@
 
     \section2 Qt IVI VehicleFunctions QML Types
     \generatelist qmltypesbymodule QtIvi.VehicleFunctions
+
+    \section2 Qt IVI Media QML Types
+    \generatelist qmltypesbymodule QtIvi.Media
 */
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index c862df4..c42b57b 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS = core \
-          vehiclefunctions
+          vehiclefunctions \
+          media
 
diff --git a/src/imports/media/media.pro b/src/imports/media/media.pro
new file mode 100644
index 0000000..b50d282
--- /dev/null
+++ b/src/imports/media/media.pro
@@ -0,0 +1,13 @@
+CXX_MODULE = qml
+TARGET  = qtivimediaplugin
+TARGETPATH = QtIvi/Media
+
+SOURCES += \
+    plugin.cpp
+
+QT += ivicore ivimedia
+
+load(qml_plugin)
+
+qml_files = $$_PRO_FILE_PWD_/qmldir
+OTHER_FILES += $$qml_files
diff --git a/src/imports/media/plugin.cpp b/src/imports/media/plugin.cpp
new file mode 100644
index 0000000..ef80131
--- /dev/null
+++ b/src/imports/media/plugin.cpp
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtIvi module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+#include <QtQml/qqmlextensionplugin.h>
+#include <qqml.h>
+
+QT_BEGIN_NAMESPACE
+
+class QIviMediaPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+public:
+    virtual void registerTypes(const char *uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtIvi.Media"));
+        Q_UNUSED(uri);
+    }
+};
+
+QT_END_NAMESPACE
+
+#include "plugin.moc"
diff --git a/src/imports/media/qmldir b/src/imports/media/qmldir
new file mode 100644
index 0000000..61b5653
--- /dev/null
+++ b/src/imports/media/qmldir
@@ -0,0 +1,3 @@
+module QtIvi.Media
+plugin qtivimediaplugin
+classname QIviMediaPlugin
diff --git a/src/ivimedia/doc/qtivimedia.qdocconf b/src/ivimedia/doc/qtivimedia.qdocconf
new file mode 100644
index 0000000..588ded4
--- /dev/null
+++ b/src/ivimedia/doc/qtivimedia.qdocconf
@@ -0,0 +1,5 @@
+headerdirs  += .. \
+               ../../imports/media
+
+sourcedirs  += .. \
+               ../../imports/media
diff --git a/src/ivimedia/doc/src/qtivimedia.qdoc b/src/ivimedia/doc/src/qtivimedia.qdoc
new file mode 100644
index 0000000..0e0d589
--- /dev/null
+++ b/src/ivimedia/doc/src/qtivimedia.qdoc
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the QtIvi module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \module QtIviMedia
+    \title Qt IVI Media C++ Classes
+    \ingroup modules
+    \ingroup qtivi_modules
+    \qtvariable ivimedia
+
+    \brief C++ classes for the Qt IVI Media API.
+*/
+
+/*!
+    \qmlmodule QtIvi.Media 1.0
+    \title Qt IVI Media QML Types
+    \ingroup qmlmodules
+    \ingroup qtivi_qmlmodules
+
+    \brief QML types for the Qt IVI Media API.
+
+    The Qt IVI Media QML API provides media functions for in-vehicle infotainment systems.
+
+    \section1 QML Types
+*/
+
diff --git a/src/ivimedia/ivimedia.pro b/src/ivimedia/ivimedia.pro
new file mode 100644
index 0000000..1b2a7d5
--- /dev/null
+++ b/src/ivimedia/ivimedia.pro
@@ -0,0 +1,18 @@
+TARGET = QtIviMedia
+
+QT = ivicore
+CONFIG += c++11
+VERSION = 1.0.0
+
+OTHER_FILES += \
+    $$PWD/doc/*.qdocconf \
+    $$PWD/doc/src/*.qdoc
+
+CMAKE_MODULE_TESTS = '-'
+
+HEADERS += \
+    qtivimediaglobal.h
+
+SOURCES += \
+
+load(qt_module)
diff --git a/src/ivimedia/qtivimediaglobal.h b/src/ivimedia/qtivimediaglobal.h
new file mode 100644
index 0000000..cd15ec1
--- /dev/null
+++ b/src/ivimedia/qtivimediaglobal.h
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtIvi module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: LGPL-3.0
+**
+****************************************************************************/
+
+#ifndef QTIVIMEDIAGLOBAL_H
+#define QTIVIMEDIAGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_STATIC
+#  if defined(QT_BUILD_IVIMEDIA_LIB)
+#    define Q_QTIVIMEDIA_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_QTIVIMEDIA_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_QTIVIMEDIA_EXPORT
+#endif
+
+QT_END_NAMESPACE
+
+#endif // QTIVIMEDIAGLOBAL_H
diff --git a/src/src.pro b/src/src.pro
index 039baeb..2f5551e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,13 +1,15 @@
 TEMPLATE = subdirs
 SUBDIRS = ivicore \
           ivivehiclefunctions \
+          ivimedia \
           plugins \
           imports \
           doc
 
 ivivehiclefunctions.depends = ivicore
-plugins.depends = ivivehiclefunctions
-imports.depends = ivivehiclefunctions
+ivimedia.depends = ivicore
+plugins.depends = ivivehiclefunctions ivimedia
+imports.depends = ivivehiclefunctions ivimedia
 
 config_dlt {
     SUBDIRS += geniviextras
diff --git a/sync.profile b/sync.profile
index c5df974..c150e63 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,6 +1,7 @@
 %modules = ( # path to module name map
     "QtIviCore" => "$basedir/src/ivicore",
     "QtIviVehicleFunctions" => "$basedir/src/ivivehiclefunctions",
+    "QtIviMedia" => "$basedir/src/ivimedia",
     "QtGeniviExtras" => "$basedir/src/geniviextras",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
@@ -19,6 +20,7 @@
 #
 %dependencies = (
     "qtbase" => "",
-    "qtdeclarative" => ""
+    "qtdeclarative" => "",
+    "qtmultimedia" => ""
 );