Merge lp:~phablet-team/qtubuntu-media/audio_role into lp:qtubuntu-media

[Jim Hodapp]

Only use the new QAudio based audio role type. No need for the old QMediaPlayer audio role type.

Only use the new QAudio based audio role type. No need for the old QMediaPlayer audio role type.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/142/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/67/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/142/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/143/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/68/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/143/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/144/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/69/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/144/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/qtubuntu-media/audio_role]

108. By Jim Hodapp on 2016-03-21

Unify two redudant case statements

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

See comments.

review: Needs Fixing

[Simon Fels (morphis)]

See comments

review: Needs Fixing

[Jim Hodapp (jhodapp)]

Addressed review comments.

[lp:~phablet-team/qtubuntu-media/audio_role]

109. By Jim Hodapp on 2016-03-22

Addressed review comments

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[lp:~phablet-team/qtubuntu-media/audio_role]

110. By Jim Hodapp on 2016-03-22

Make sure to not break the indicator-sound controls

[Simon Fels (morphis)]

LGTM but tests are still failing.

[Jim Hodapp (jhodapp)]

What tests are failing? Nothing is failing for me.

On Tue, Mar 22, 2016 at 12:47 PM, Simon Fels <email address hidden>
wrote:

> LGTM but tests are still failing.
> --
>
> https://code.launchpad.net/~phablet-team/qtubuntu-media/audio_role/+merge/287368
> Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu-media.
>

[lp:~phablet-team/qtubuntu-media/audio_role]

111. By Jim Hodapp on 2016-03-22

Include missing qaudio.h header so that unit tests compile

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-22 19:00:10 +0000
+++ debian/changelog	2016-03-22 19:23:08 +0000
@@ -1,3 +1,9 @@
+qtubuntu-media (0.8.1+16.04.20160226.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Unify the audio role implementation between vivid and xenial.
+
+ -- Jim Hodapp <[e-mail]>  Fri, 26 Feb 2016 21:36:37 +0000
+
 qtubuntu-media (0.8.0+16.04.20160222.1-0ubuntu1) xenial; urgency=medium
 
   * URI encode the URI that we call setMedia() on or add to the playlist

=== modified file 'src/aal/aal.pro'
--- src/aal/aal.pro	2015-12-18 15:38:48 +0000
+++ src/aal/aal.pro	2016-03-22 19:23:08 +0000
@@ -23,6 +23,7 @@
     aalvideorenderercontrol.h \
     aalmediaplaylistprovider.h \
     aalmediaplaylistcontrol.h \
+    aalaudiorolecontrol.h \
     aalutility.h
 
 SOURCES += \
@@ -32,4 +33,5 @@
     aalvideorenderercontrol.cpp \
     aalmediaplaylistprovider.cpp \
     aalmediaplaylistcontrol.cpp \
+    aalaudiorolecontrol.cpp \
     aalutility.cpp

=== added file 'src/aal/aalaudiorolecontrol.cpp'
--- src/aal/aalaudiorolecontrol.cpp	1970-01-01 00:00:00 +0000
+++ src/aal/aalaudiorolecontrol.cpp	2016-03-22 19:23:08 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "aalaudiorolecontrol.h"
+
+#include <QDebug>
+
+namespace media = core::ubuntu::media;
+
+AalAudioRoleControl::AalAudioRoleControl
+    (const std::shared_ptr<core::ubuntu::media::Player>& playerSession)
+    : QAudioRoleControl()
+    , m_audioRole(QAudio::MusicRole)
+    , m_hubPlayerSession(playerSession)
+{
+}
+
+QAudio::Role AalAudioRoleControl::audioRole() const
+{
+    return m_audioRole;
+}
+
+void AalAudioRoleControl::setAudioRole(QAudio::Role role)
+{
+    if (m_hubPlayerSession == nullptr)
+    {
+        qWarning() << "Failed to setAudioRole since m_hubPlayerSession is NULL";
+        return;
+    }
+
+    try {
+        m_hubPlayerSession->audio_stream_role().set(fromQAudioRole(role));
+    }
+    catch (const std::runtime_error &e) {
+        qWarning() << "Failed to set audio stream role: " << e.what();
+        return;
+    }
+
+    if (role != m_audioRole)
+        Q_EMIT audioRoleChanged(m_audioRole = role);
+}
+
+QList<QAudio::Role> AalAudioRoleControl::supportedAudioRoles() const
+{
+    return QList<QAudio::Role>() << QAudio::MusicRole
+                                 << QAudio::VideoRole
+                                 << QAudio::AlarmRole
+                                 << QAudio::NotificationRole
+                                 << QAudio::RingtoneRole
+                                 << QAudio::VoiceCommunicationRole;
+}
+
+QAudio::Role AalAudioRoleControl::toQAudioRole(const media::Player::AudioStreamRole &role)
+{
+    switch (role)
+    {
+        case media::Player::AudioStreamRole::multimedia:
+            return QAudio::MusicRole;
+        case media::Player::AudioStreamRole::alarm:
+            return QAudio::AlarmRole;
+        case media::Player::AudioStreamRole::alert:
+            return QAudio::NotificationRole;
+        case media::Player::AudioStreamRole::phone:
+            return QAudio::VoiceCommunicationRole;
+        default:
+            qWarning() << "Unhandled or invalid core::ubuntu::media::AudioStreamRole: " << role;
+            return QAudio::MusicRole;
+    }
+}
+
+media::Player::AudioStreamRole AalAudioRoleControl::fromQAudioRole(const QAudio::Role &role)
+{
+    // If we don't have a valid role, this should be the default translation
+    if (role == QAudio::Role::UnknownRole)
+        return media::Player::AudioStreamRole::multimedia;
+
+    switch (role)
+    {
+        case QAudio::MusicRole:
+        case QAudio::VideoRole:
+            return media::Player::AudioStreamRole::multimedia;
+        case QAudio::AlarmRole:
+            return media::Player::AudioStreamRole::alarm;
+        case QAudio::NotificationRole:
+        case QAudio::RingtoneRole:
+            return media::Player::AudioStreamRole::alert;
+        case QAudio::VoiceCommunicationRole:
+            return media::Player::AudioStreamRole::phone;
+        default:
+            qWarning() << "Unhandled or invalid QAudio::Role:" << role;
+            return media::Player::AudioStreamRole::multimedia;
+    }
+}

=== added file 'src/aal/aalaudiorolecontrol.h'
--- src/aal/aalaudiorolecontrol.h	1970-01-01 00:00:00 +0000
+++ src/aal/aalaudiorolecontrol.h	2016-03-22 19:23:08 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AALAUDIOROLECONTROL_H
+#define AALAUDIOROLECONTROL_H
+
+#include <core/media/player.h>
+
+#include <qaudiorolecontrol.h>
+
+class AalAudioRoleControl : public QAudioRoleControl
+{
+public:
+    explicit AalAudioRoleControl
+        (const std::shared_ptr<core::ubuntu::media::Player>& playerSession);
+    AalAudioRoleControl(const AalAudioRoleControl&) = delete;
+
+    AalAudioRoleControl& operator=(const AalAudioRoleControl&) = delete;
+    bool operator==(const AalAudioRoleControl&) const = delete;
+
+    QAudio::Role audioRole() const;
+    void setAudioRole(QAudio::Role role);
+    QList<QAudio::Role> supportedAudioRoles() const;
+
+    static QAudio::Role toQAudioRole
+        (const core::ubuntu::media::Player::AudioStreamRole &role);
+    static core::ubuntu::media::Player::AudioStreamRole fromQAudioRole
+        (const QAudio::Role &role);
+
+private:
+    QAudio::Role m_audioRole;
+    std::shared_ptr<core::ubuntu::media::Player> m_hubPlayerSession;
+};
+
+#endif // AALAUDIOROLECONTROL_H

=== modified file 'src/aal/aalmediaplayercontrol.cpp'
--- src/aal/aalmediaplayercontrol.cpp	2015-12-18 15:38:48 +0000
+++ src/aal/aalmediaplayercontrol.cpp	2016-03-22 19:23:08 +0000
@@ -61,20 +61,12 @@
     return m_status;
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-QMediaPlayer::AudioRole AalMediaPlayerControl::audioRole() const
-#else
 QAudio::Role AalMediaPlayerControl::audioRole() const
-#endif
 {
     return m_service->audioRole();
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-void AalMediaPlayerControl::setAudioRole(QMediaPlayer::AudioRole audioRole)
-#else
 void AalMediaPlayerControl::setAudioRole(QAudio::Role audioRole)
-#endif
 {
     qDebug() << __PRETTY_FUNCTION__;
     m_service->setAudioRole(audioRole);

=== modified file 'src/aal/aalmediaplayercontrol.h'
--- src/aal/aalmediaplayercontrol.h	2015-10-06 06:32:14 +0000
+++ src/aal/aalmediaplayercontrol.h	2016-03-22 19:23:08 +0000
@@ -18,6 +18,7 @@
 #define AALMEDIAPLAYER_H
 
 #include <QMediaPlayerControl>
+#include <QtMultimedia/qaudio.h>
 
 class AalMediaPlayerService;
 
@@ -32,13 +33,8 @@
 
     virtual QMediaPlayer::State state() const;
     virtual QMediaPlayer::MediaStatus mediaStatus() const;
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-    virtual QMediaPlayer::AudioRole audioRole() const;
-    virtual void setAudioRole(QMediaPlayer::AudioRole audioRole);
-#else
     virtual QAudio::Role audioRole() const;
     virtual void setAudioRole(QAudio::Role audioRole);
-#endif
     virtual qint64 duration() const;
     virtual qint64 position() const;
     virtual void setPosition(qint64);

=== modified file 'src/aal/aalmediaplayerservice.cpp'
--- src/aal/aalmediaplayerservice.cpp	2016-02-19 16:38:09 +0000
+++ src/aal/aalmediaplayerservice.cpp	2016-03-22 19:23:08 +0000
@@ -18,6 +18,7 @@
 #include "aalmediaplayerservice.h"
 #include "aalmediaplaylistcontrol.h"
 #include "aalmediaplaylistprovider.h"
+#include "aalaudiorolecontrol.h"
 #include "aalutility.h"
 
 #include <qmediaplaylistcontrol_p.h>
@@ -62,29 +63,93 @@
 core::Signal<void> the_void;
 }
 
-AalMediaPlayerService::AalMediaPlayerService(QObject *parent):
-    QMediaService(parent),
-    m_hubPlayerSession(NULL),
-    m_playbackStatusChangedConnection(the_void.connect([](){})),
-    m_errorConnection(the_void.connect([](){})),
-    m_endOfStreamConnection(the_void.connect([](){})),
-    m_mediaPlayerControl(nullptr),
-    m_videoOutput(nullptr),
-    m_mediaPlaylistControl(nullptr),
-    m_mediaPlaylistProvider(nullptr),
-    m_videoOutputReady(false),
-    m_firstPlayback(true),
-    m_cachedDuration(0),
-    m_mediaPlaylist(NULL),
-    m_doReattachSession(false)
+AalMediaPlayerService::AalMediaPlayerService(QObject *parent)
+    :
+     QMediaService(parent),
+     m_hubPlayerSession(NULL),
+     m_playbackStatusChangedConnection(the_void.connect([](){})),
+     m_errorConnection(the_void.connect([](){})),
+     m_endOfStreamConnection(the_void.connect([](){})),
+     m_mediaPlayerControl(nullptr),
+     m_videoOutput(nullptr),
+     m_mediaPlaylistControl(nullptr),
+     m_mediaPlaylistProvider(nullptr),
+     m_audioRoleControl(nullptr),
+     m_videoOutputReady(false),
+     m_firstPlayback(true),
+     m_cachedDuration(0),
+     m_mediaPlaylist(NULL),
+     m_doReattachSession(false)
 #ifdef MEASURE_PERFORMANCE
-     , m_lastFrameDecodeStart(0)
-     , m_currentFrameDecodeStart(0)
-     , m_avgCount(0)
-     , m_frameDecodeAvg(0)
+      , m_lastFrameDecodeStart(0)
+      , m_currentFrameDecodeStart(0)
+      , m_avgCount(0)
+      , m_frameDecodeAvg(0)
 #endif
 {
-    m_hubService = media::Service::Client::instance();
+    constructNewPlayerService();
+    // Note: this must be in the constructor and not part of constructNewPlayerService()
+    // or it won't successfully connect to the signal
+    connect(qGuiApp, &QGuiApplication::applicationStateChanged, this, &AalMediaPlayerService::onApplicationStateChanged);
+}
+
+AalMediaPlayerService::AalMediaPlayerService
+    (const std::shared_ptr<core::ubuntu::media::Service> &service, QObject *parent)
+    :
+      QMediaService(parent),
+      m_hubService(service),
+      m_hubPlayerSession(NULL),
+      m_playbackStatusChangedConnection(the_void.connect([](){})),
+      m_errorConnection(the_void.connect([](){})),
+      m_endOfStreamConnection(the_void.connect([](){})),
+      m_mediaPlayerControl(nullptr),
+      m_videoOutput(nullptr),
+      m_mediaPlaylistControl(nullptr),
+      m_mediaPlaylistProvider(nullptr),
+      m_audioRoleControl(nullptr),
+      m_videoOutputReady(false),
+      m_firstPlayback(true),
+      m_cachedDuration(0),
+      m_mediaPlaylist(NULL),
+      m_doReattachSession(false)
+  #ifdef MEASURE_PERFORMANCE
+       , m_lastFrameDecodeStart(0)
+       , m_currentFrameDecodeStart(0)
+       , m_avgCount(0)
+       , m_frameDecodeAvg(0)
+  #endif
+{
+    constructNewPlayerService();
+    // Note: this must be in the constructor and not part of constructNewPlayerService()
+    // or it won't successfully connect to the signal
+    connect(qGuiApp, &QGuiApplication::applicationStateChanged, this, &AalMediaPlayerService::onApplicationStateChanged);
+}
+
+AalMediaPlayerService::~AalMediaPlayerService()
+{
+    m_errorConnection.disconnect();
+    m_playbackStatusChangedConnection.disconnect();
+
+    if (m_audioRoleControl)
+        deleteAudioRoleControl();
+
+    if (m_videoOutput)
+        deleteVideoRendererControl();
+
+    if (m_mediaPlaylistControl)
+        deletePlaylistControl();
+
+    if (m_mediaPlayerControl)
+        deleteMediaPlayerControl();
+
+    if (m_hubPlayerSession)
+        destroyPlayerSession();
+}
+
+void AalMediaPlayerService::constructNewPlayerService()
+{
+    if (not m_hubService.get())
+        m_hubService = media::Service::Client::instance();
 
     // As core::Connection doesn't allow us to start with a disconnected connection
     // instance we have to connect it first with a dummy signal and then disconnect
@@ -103,6 +168,7 @@
 
     createMediaPlayerControl();
     createVideoRendererControl();
+    createAudioRoleControl();
 
     m_playbackStatusChangedConnection = m_hubPlayerSession->playback_status_changed().connect(
         [this](const media::Player::PlaybackStatus &status) {
@@ -112,26 +178,6 @@
 
     m_errorConnection = m_hubPlayerSession->error().connect(
             std::bind(&AalMediaPlayerService::onError, this, _1));
-
-    connect(qGuiApp, &QGuiApplication::applicationStateChanged, this, &AalMediaPlayerService::onApplicationStateChanged);
-}
-
-AalMediaPlayerService::~AalMediaPlayerService()
-{
-    m_errorConnection.disconnect();
-    m_playbackStatusChangedConnection.disconnect();
-
-    if (m_videoOutput)
-        deleteVideoRendererControl();
-
-    if (m_mediaPlaylistControl)
-        deletePlaylistControl();
-
-    if (m_mediaPlayerControl)
-        deleteMediaPlayerControl();
-
-    if (m_hubPlayerSession)
-        destroyPlayerSession();
 }
 
 QMediaControl *AalMediaPlayerService::requestControl(const char *name)
@@ -164,7 +210,15 @@
         return m_mediaPlaylistControl;
     }
 
-    return NULL;
+    if (qstrcmp(name, QAudioRoleControl_iid) == 0)
+    {
+        if (not m_audioRoleControl)
+            createAudioRoleControl();
+
+        return m_audioRoleControl;
+    }
+
+    return nullptr;
 }
 
 void AalMediaPlayerService::releaseControl(QMediaControl *control)
@@ -176,10 +230,10 @@
 bool AalMediaPlayerService::newMediaPlayer()
 {
     // Only one player session needed
-    if (m_hubPlayerSession != NULL)
+    if (m_hubPlayerSession != nullptr)
         return true;
 
-    if (m_hubService == NULL)
+    if (m_hubService == nullptr)
     {
         qWarning() << "Cannot create new media player instance without a valid media-hub service instance";
         return false;
@@ -228,51 +282,26 @@
         m_videoOutput->playbackComplete();
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-QMediaPlayer::AudioRole AalMediaPlayerService::audioRole() const
-#else
 QAudio::Role AalMediaPlayerService::audioRole() const
-#endif
 {
-    if (m_hubPlayerSession == NULL)
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-        return QMediaPlayer::MultimediaRole;
-#else
-        return QAudio::VideoRole;
-#endif
+    if (m_audioRoleControl == nullptr)
+    {
+        qWarning() << "Failed to get audio role, m_audioRoleControl is NULL";
+        return QAudio::UnknownRole;
+    }
 
-    try {
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-        return static_cast<QMediaPlayer::AudioRole>(m_hubPlayerSession->audio_stream_role().get());
-#else
-        return static_cast<QAudio::Role>(m_hubPlayerSession->audio_stream_role().get());
-#endif
-    }
-    catch (const std::runtime_error &e) {
-        qWarning() << "Failed to get audio stream role: " << e.what();
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-        return QMediaPlayer::MultimediaRole;
-#else
-        return QAudio::VideoRole;
-#endif
-    }
+    return m_audioRoleControl->audioRole();
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-void AalMediaPlayerService::setAudioRole(QMediaPlayer::AudioRole audioRole)
-#else
 void AalMediaPlayerService::setAudioRole(QAudio::Role audioRole)
-#endif
 {
-    if (m_hubPlayerSession == NULL)
+    if (m_audioRoleControl == nullptr)
+    {
+        qWarning() << "Failed to set audio role, m_audioRoleControl is NULL";
         return;
+    }
 
-    try {
-        m_hubPlayerSession->audio_stream_role().set(static_cast<media::Player::AudioStreamRole>(audioRole));
-    }
-    catch (const std::runtime_error &e) {
-        qWarning() << "Failed to set audio stream role: " << e.what();
-    }
+    m_audioRoleControl->setAudioRole(audioRole);
 }
 
 void AalMediaPlayerService::setMediaPlaylist(const QMediaPlaylist &playlist)
@@ -544,7 +573,7 @@
 
 void AalMediaPlayerService::createMediaPlayerControl()
 {
-    if (m_hubPlayerSession == NULL)
+    if (m_hubPlayerSession == nullptr)
         return;
 
     m_mediaPlayerControl = new AalMediaPlayerControl(this);
@@ -553,7 +582,7 @@
 
 void AalMediaPlayerService::createVideoRendererControl()
 {
-    if (m_hubPlayerSession == NULL)
+    if (m_hubPlayerSession == nullptr)
         return;
 
     m_videoOutput = new AalVideoRendererControl(this);
@@ -561,16 +590,21 @@
 
 void AalMediaPlayerService::createPlaylistControl()
 {
-    qDebug() << Q_FUNC_INFO;
     m_mediaPlaylistControl = new AalMediaPlaylistControl(this);
     m_mediaPlaylistProvider = new AalMediaPlaylistProvider(this);
     m_mediaPlaylistControl->setPlaylistProvider(m_mediaPlaylistProvider);
 }
 
+void AalMediaPlayerService::createAudioRoleControl()
+{
+    if (m_hubPlayerSession == nullptr)
+        return;
+
+    m_audioRoleControl = new AalAudioRoleControl(m_hubPlayerSession);
+}
+
 void AalMediaPlayerService::deleteMediaPlayerControl()
 {
-    qDebug() << Q_FUNC_INFO;
-
     if (not m_hubPlayerSession)
         return;
 
@@ -583,8 +617,6 @@
 
 void AalMediaPlayerService::destroyPlayerSession()
 {
-    qDebug() << Q_FUNC_INFO;
-
     if (not m_hubPlayerSession)
         return;
 
@@ -613,8 +645,6 @@
 
 void AalMediaPlayerService::deletePlaylistControl()
 {
-    qDebug() << Q_FUNC_INFO;
-
     if (m_mediaPlaylistProvider)
     {
         delete m_mediaPlaylistProvider;
@@ -627,6 +657,15 @@
     }
 }
 
+void AalMediaPlayerService::deleteAudioRoleControl()
+{
+    if (m_audioRoleControl)
+    {
+        delete m_audioRoleControl;
+        m_audioRoleControl = nullptr;
+    }
+}
+
 void AalMediaPlayerService::signalQMediaPlayerError(const media::Player::Error &error)
 {
     QMediaPlayer::Error outError = QMediaPlayer::NoError;
@@ -788,11 +827,7 @@
 {
         // If this player is a multimedia audioRole, then it should possible to
         // use it for MPRIS control
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-    if (audioRole() == QMediaPlayer::MultimediaRole)
-#else
     if (audioRole() == QAudio::VideoRole || audioRole() == QAudio::MusicRole)
-#endif
     {
         qDebug() << "Setting player as current player";
         try {

=== modified file 'src/aal/aalmediaplayerservice.h'
--- src/aal/aalmediaplayerservice.h	2015-12-18 15:38:48 +0000
+++ src/aal/aalmediaplayerservice.h	2016-03-22 19:23:08 +0000
@@ -34,6 +34,7 @@
 class AalMediaPlaylistProvider;
 class QMediaPlayerControl;
 class AalVideoRendererControl;
+class AalAudioRoleControl;
 class tst_MediaPlayerPlugin;
 class QTimerEvent;
 
@@ -58,7 +59,7 @@
 
     AalMediaPlayerService(QObject *parent = 0);
     AalMediaPlayerService(const std::shared_ptr<core::ubuntu::media::Service> &service,
-            const std::shared_ptr<core::ubuntu::media::Player> &player, QObject *parent = 0);
+            QObject *parent = 0);
     ~AalMediaPlayerService();
 
     QMediaControl* requestControl(const char *name);
@@ -74,13 +75,8 @@
     // Call this before attempting to play the same video a second time (after EOS)
     void resetVideoSink();
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-    QMediaPlayer::AudioRole audioRole() const;
-    void setAudioRole(QMediaPlayer::AudioRole audioRole);
-#else
     QAudio::Role audioRole() const;
     void setAudioRole(QAudio::Role audioRole);
-#endif
 
     void setMedia(const QUrl &url);
     void setMediaPlaylist(const QMediaPlaylist& playlist);
@@ -117,6 +113,7 @@
     void onApplicationStateChanged(Qt::ApplicationState state);
 
 protected:
+    void constructNewPlayerService();
     void updateClientSignals();
     void connectSignals();
     void disconnectSignals();
@@ -129,11 +126,13 @@
     void createMediaPlayerControl();
     void createVideoRendererControl();
     void createPlaylistControl();
+    void createAudioRoleControl();
 
     void deleteMediaPlayerControl();
     void destroyPlayerSession();
     void deleteVideoRendererControl();
     void deletePlaylistControl();
+    void deleteAudioRoleControl();
 
     // Signals the proper QMediaPlayer::Error from a core::ubuntu::media::Error
     void signalQMediaPlayerError(const core::ubuntu::media::Player::Error &error);
@@ -152,6 +151,7 @@
     AalVideoRendererControl *m_videoOutput;
     AalMediaPlaylistControl *m_mediaPlaylistControl;
     AalMediaPlaylistProvider *m_mediaPlaylistProvider;
+    AalAudioRoleControl *m_audioRoleControl;
     bool m_videoOutputReady;
     bool m_firstPlayback;
 

=== added directory 'tests/integration/audiorole'
=== added file 'tests/integration/audiorole/audiorole.pro'
--- tests/integration/audiorole/audiorole.pro	1970-01-01 00:00:00 +0000
+++ tests/integration/audiorole/audiorole.pro	2016-03-22 19:23:08 +0000
@@ -0,0 +1,23 @@
+include(../../coverage.pri)
+
+CONFIG += testcase
+QMAKE_CXXFLAGS += -std=c++11
+DEFINES += QT_NO_KEYWORDS
+TARGET = tst_audiorole
+
+QT += core multimedia testlib
+
+QT_TESTCASE_BUILDDIR = .
+
+INCLUDEPATH += ../../src/aal \
+    /usr/include/qt5/QtMultimedia \
+
+HEADERS += \
+    tst_audiorole.h
+
+SOURCES += \
+    tst_audiorole.cpp \
+    ../../../src/aal/aalutility.cpp
+
+# media-hub is required to be running for these tests
+#system(/sbin/stop media-hub; /sbin/start media-hub)

=== added directory 'tests/integration/audiorole/testdata'
=== added file 'tests/integration/audiorole/testdata/Ubuntu.ogg'
Binary files tests/integration/audiorole/testdata/Ubuntu.ogg	1970-01-01 00:00:00 +0000 and tests/integration/audiorole/testdata/Ubuntu.ogg	2016-03-22 19:23:08 +0000 differ
=== added file 'tests/integration/audiorole/tst_audiorole.cpp'
--- tests/integration/audiorole/tst_audiorole.cpp	1970-01-01 00:00:00 +0000
+++ tests/integration/audiorole/tst_audiorole.cpp	2016-03-22 19:23:08 +0000
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "tst_audiorole.h"
+
+#include <unistd.h>
+
+#include <QMediaPlayer>
+#include <QMediaPlaylist>
+
+#include <QtTest/QtTest>
+
+void tst_AudioRole::initTestCase()
+{
+}
+
+void tst_AudioRole::cleanupTestCase()
+{
+}
+
+void tst_AudioRole::init()
+{
+}
+
+void tst_AudioRole::verifyAudioRolePlays()
+{
+    QMediaPlayer *player = new QMediaPlayer;
+    const QString fullFileUri {"file://" + QFINDTESTDATA("testdata/Ubuntu.ogg")};
+    const QMediaContent content {QUrl{fullFileUri}};
+    qDebug() << "Trying to play file:" << fullFileUri;
+    player->setMedia(content);
+    QSignalSpy spy(player, SIGNAL(audioRoleChanged(QAudio::Role)));
+    player->setAudioRole(QAudio::MusicRole);
+    QCOMPARE(spy.count(), 1);
+
+    player->play();
+    sleep(1);
+    qDebug() << "player->error():" << player->error();
+    qDebug() << "player->mediaStatus():" << player->mediaStatus();
+    QCOMPARE(player->audioRole(), QAudio::MusicRole);
+    QVERIFY(player->mediaStatus() != QMediaPlayer::InvalidMedia);
+    QCOMPARE(player->state(), QMediaPlayer::State::PlayingState);
+}
+
+void tst_AudioRole::verifyVideoRolePlays()
+{
+    QMediaPlayer *player = new QMediaPlayer;
+    const QString fullFileUri {"file://" + QFINDTESTDATA("testdata/Ubuntu.ogg")};
+    const QMediaContent content {QUrl{fullFileUri}};
+    qDebug() << "Trying to play file:" << fullFileUri;
+    player->setMedia(content);
+    QSignalSpy spy(player, SIGNAL(audioRoleChanged(QAudio::Role)));
+    player->setAudioRole(QAudio::VideoRole);
+    QCOMPARE(spy.count(), 1);
+
+    player->play();
+    sleep(1);
+    qDebug() << "player->error():" << player->error();
+    qDebug() << "player->mediaStatus():" << player->mediaStatus();
+    QCOMPARE(player->audioRole(), QAudio::VideoRole);
+    QVERIFY(player->mediaStatus() != QMediaPlayer::InvalidMedia);
+    QCOMPARE(player->state(), QMediaPlayer::State::PlayingState);
+}
+
+void tst_AudioRole::verifyAlarmRolePlays()
+{
+    QMediaPlayer *player = new QMediaPlayer;
+    const QString fullFileUri {"file://" + QFINDTESTDATA("testdata/Ubuntu.ogg")};
+    const QMediaContent content {QUrl{fullFileUri}};
+    qDebug() << "Trying to play file:" << fullFileUri;
+    player->setMedia(content);
+    QSignalSpy spy(player, SIGNAL(audioRoleChanged(QAudio::Role)));
+    player->setAudioRole(QAudio::AlarmRole);
+    QCOMPARE(spy.count(), 1);
+
+    player->play();
+    sleep(1);
+    qDebug() << "player->error():" << player->error();
+    qDebug() << "player->mediaStatus():" << player->mediaStatus();
+    QCOMPARE(player->audioRole(), QAudio::AlarmRole);
+    QVERIFY(player->mediaStatus() != QMediaPlayer::InvalidMedia);
+    QCOMPARE(player->state(), QMediaPlayer::State::PlayingState);
+}
+
+void tst_AudioRole::verifyNotificationRolePlays()
+{
+    QMediaPlayer *player = new QMediaPlayer;
+    const QString fullFileUri {"file://" + QFINDTESTDATA("testdata/Ubuntu.ogg")};
+    const QMediaContent content {QUrl{fullFileUri}};
+    qDebug() << "Trying to play file:" << fullFileUri;
+    player->setMedia(content);
+    QSignalSpy spy(player, SIGNAL(audioRoleChanged(QAudio::Role)));
+    player->setAudioRole(QAudio::NotificationRole);
+    QCOMPARE(spy.count(), 1);
+
+    player->play();
+    sleep(1);
+    qDebug() << "player->error():" << player->error();
+    qDebug() << "player->mediaStatus():" << player->mediaStatus();
+    QCOMPARE(player->audioRole(), QAudio::NotificationRole);
+    QVERIFY(player->mediaStatus() != QMediaPlayer::InvalidMedia);
+    QCOMPARE(player->state(), QMediaPlayer::State::PlayingState);
+}
+
+void tst_AudioRole::verifyVoiceCommunicationRolePlays()
+{
+    QMediaPlayer *player = new QMediaPlayer;
+    const QString fullFileUri {"file://" + QFINDTESTDATA("testdata/Ubuntu.ogg")};
+    const QMediaContent content {QUrl{fullFileUri}};
+    qDebug() << "Trying to play file:" << fullFileUri;
+    player->setMedia(content);
+    QSignalSpy spy(player, SIGNAL(audioRoleChanged(QAudio::Role)));
+    player->setAudioRole(QAudio::VoiceCommunicationRole);
+    QCOMPARE(spy.count(), 1);
+
+    player->play();
+    sleep(1);
+    qDebug() << "player->error():" << player->error();
+    qDebug() << "player->mediaStatus():" << player->mediaStatus();
+    QCOMPARE(player->audioRole(), QAudio::VoiceCommunicationRole);
+    QVERIFY(player->mediaStatus() != QMediaPlayer::InvalidMedia);
+    QCOMPARE(player->state(), QMediaPlayer::State::PlayingState);
+}
+
+QTEST_GUILESS_MAIN(tst_AudioRole)

=== added file 'tests/integration/audiorole/tst_audiorole.h'
--- tests/integration/audiorole/tst_audiorole.h	1970-01-01 00:00:00 +0000
+++ tests/integration/audiorole/tst_audiorole.h	2016-03-22 19:23:08 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef tst_AudioRole_H
+#define tst_AudioRole_H
+
+#include <core/media/player.h>
+
+#include <deque>
+#include <future>
+#include <memory>
+
+#include <QMediaPlayer>
+#include <QMediaPlaylist>
+#include <QObject>
+
+class AalMediaPlaylistControl;
+class QMediaPlayer;
+
+class tst_AudioRole : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    // We want the setup to be run prior to every test case to
+    // ensure correct test isolation, see http://qt-project.org/doc/qt-5/qtest-overview.html.
+    void initTestCase();
+    void cleanupTestCase();
+
+    void init();
+
+    void verifyAudioRolePlays();
+    void verifyVideoRolePlays();
+    void verifyAlarmRolePlays();
+    void verifyNotificationRolePlays();
+    void verifyVoiceCommunicationRolePlays();
+
+private:
+};
+
+#endif // tst_AudioRole_H

=== modified file 'tests/integration/integration.pro'
--- tests/integration/integration.pro	2016-02-12 21:53:36 +0000
+++ tests/integration/integration.pro	2016-03-22 19:23:08 +0000
@@ -4,3 +4,4 @@
 
 SUBDIRS += uris
 SUBDIRS += playlists
+SUBDIRS += audiorole

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2016-02-12 21:59:09 +0000
+++ tests/tests.pro	2016-03-22 19:23:08 +0000
@@ -6,4 +6,7 @@
 
 # We can't run our integration tests yet on other platforms as on arm
 # as they expect a working media-hub we don't have yet anywhere else.
+# However, this needs to remain commented out until for manual test
+# execution until we are able to get a Jenkins instance setup for the
+# media stack.
 #system(uname -a | grep arm):SUBDIRS += integration

=== modified file 'tests/unit/player.cpp'
--- tests/unit/player.cpp	2015-06-08 19:15:43 +0000
+++ tests/unit/player.cpp	2016-03-22 19:23:08 +0000
@@ -77,6 +77,12 @@
     return 0;
 }
 
+media::video::Sink::Ptr TestPlayer::create_gl_texture_video_sink(uint32_t texture_id)
+{
+    Q_UNUSED(texture_id);
+    throw std::runtime_error{"Not implemented"};
+}
+
 bool TestPlayer::open_uri(const Track::UriType& uri)
 {
     Q_UNUSED(uri);
@@ -89,11 +95,6 @@
     return true;
 }
 
-std::shared_ptr<core::ubuntu::media::video::Sink> TestPlayer::create_gl_texture_video_sink(uint32_t texture_id)
-{
-    Q_UNUSED(texture_id); throw std::runtime_error{"Not implemented"};
-}
-
 void TestPlayer::next()
 {
 }
@@ -167,12 +168,6 @@
     return ret;
 }
 
-const core::Property<TestPlayer::Orientation>& TestPlayer::orientation() const
-{
-    static core::Property<Player::Orientation> ret(Player::Orientation::rotate0);
-    return ret;
-}
-
 const core::Property<Player::LoopStatus>& TestPlayer::loop_status() const
 {
     static core::Property<Player::LoopStatus> ret(Player::LoopStatus::none);
@@ -232,6 +227,12 @@
     return role;
 }
 
+const core::Property<Player::Orientation>& TestPlayer::orientation() const
+{
+    static const core::Property<Player::Orientation> orientation(Player::Orientation::rotate0);
+    return orientation;
+}
+
 const core::Property<Player::Lifetime>& TestPlayer::lifetime() const
 {
     static const core::Property<Player::Lifetime> lifetime(Player::Lifetime::normal);
@@ -292,12 +293,6 @@
     return ret;
 }
 
-const core::Signal<Player::PlaybackStatus>& TestPlayer::playback_status_changed() const
-{
-    static core::Signal<Player::PlaybackStatus> ret;
-    return ret;
-}
-
 core::Signal<Player::PlaybackStatus>& TestPlayer::playback_status_changed()
 {
     static core::Signal<Player::PlaybackStatus> ret;
@@ -310,12 +305,6 @@
     return ret;
 }
 
-const core::Signal<uint64_t>& TestPlayer::duration_changed() const
-{
-    static core::Signal<uint64_t> ret;
-    return ret;
-}
-
 const core::Signal<Player::Error>& TestPlayer::error() const
 {
     static core::Signal<Player::Error> ret;

=== modified file 'tests/unit/player.h'
--- tests/unit/player.h	2015-06-08 19:15:43 +0000
+++ tests/unit/player.h	2016-03-22 19:23:08 +0000
@@ -37,8 +37,12 @@
 {
 public:
     TestPlayer();
+    TestPlayer(const TestPlayer&) = delete;
     virtual ~TestPlayer();
 
+    Player& operator=(const Player&) = delete;
+    bool operator==(const Player&) const = delete;
+
     virtual std::string uuid() const;
     virtual void reconnect();
     virtual void abandon();
@@ -46,15 +50,16 @@
     virtual std::shared_ptr<TrackList> track_list();
     virtual PlayerKey key() const;
 
+    virtual video::Sink::Ptr create_gl_texture_video_sink(std::uint32_t texture_id);
+
     virtual bool open_uri(const Track::UriType& uri);
-    virtual bool open_uri(const Track::UriType&, const HeadersType&);
-    virtual std::shared_ptr<core::ubuntu::media::video::Sink> create_gl_texture_video_sink(uint32_t texture_id);
+    virtual bool open_uri(const Track::UriType& uri, const HeadersType&);
     virtual void next();
     virtual void previous();
     virtual void play();
     virtual void pause();
+    virtual void stop();
     virtual void seek_to(const std::chrono::microseconds& offset);
-    virtual void stop();
 
     virtual const core::Property<bool>& can_play() const;
     virtual const core::Property<bool>& can_pause() const;
@@ -64,7 +69,6 @@
     virtual const core::Property<bool>& is_video_source() const;
     virtual const core::Property<bool>& is_audio_source() const;
     virtual const core::Property<PlaybackStatus>& playback_status() const;
-    virtual const core::Property<Orientation>& orientation() const;
     virtual const core::Property<LoopStatus>& loop_status() const;
     virtual const core::Property<PlaybackRate>& playback_rate() const;
     virtual const core::Property<bool>& shuffle() const;
@@ -75,6 +79,7 @@
     virtual const core::Property<int64_t>& position() const;
     virtual const core::Property<int64_t>& duration() const;
     virtual const core::Property<AudioStreamRole>& audio_stream_role() const;
+    virtual const core::Property<Orientation>& orientation() const;
     virtual const core::Property<Lifetime>& lifetime() const;
 
     virtual core::Property<LoopStatus>& loop_status();
@@ -87,10 +92,9 @@
     virtual const core::Signal<int64_t>& seeked_to() const;
     virtual const core::Signal<void>& about_to_finish() const;
     virtual const core::Signal<void>& end_of_stream() const;
-    virtual const core::Signal<PlaybackStatus>& playback_status_changed() const;
     virtual core::Signal<PlaybackStatus>& playback_status_changed();
-    virtual const core::Signal<core::ubuntu::media::video::Dimensions>& video_dimension_changed() const;
-    virtual const core::Signal<uint64_t>& duration_changed() const;
+    virtual const core::Signal<video::Dimensions>& video_dimension_changed() const;
+    /** Signals all errors and warnings (typically from GStreamer and below) */
     virtual const core::Signal<Error>& error() const;
 
 private:

=== modified file 'tests/unit/service.cpp'
--- tests/unit/service.cpp	2015-10-20 13:06:11 +0000
+++ tests/unit/service.cpp	2016-03-22 19:23:08 +0000
@@ -15,6 +15,11 @@
  */
 
 #include "service.h"
+#include "player.h"
+
+#include <core/media/player.h>
+
+#include <memory>
 
 namespace core {
 namespace ubuntu {
@@ -22,12 +27,12 @@
 
 const std::shared_ptr<media::Service> TestService::Client::instance()
 {
-    return NULL;
+    return std::make_shared<TestService>();
 }
 
 std::shared_ptr<Player> TestService::create_session(const Player::Configuration&)
 {
-    return NULL;
+    return std::make_shared<TestPlayer>();
 }
 
 void TestService::detach_session(const std::string&, const Player::Configuration&)

=== modified file 'tests/unit/tst_mediaplayerplugin.cpp'
--- tests/unit/tst_mediaplayerplugin.cpp	2015-12-18 15:38:48 +0000
+++ tests/unit/tst_mediaplayerplugin.cpp	2016-03-22 19:23:08 +0000
@@ -34,10 +34,10 @@
 
 void tst_MediaPlayerPlugin::init()
 {
-    m_hubService.reset(new TestService());
-    m_service = new AalMediaPlayerService(this);
+    m_hubService = TestService::Client::instance();
+    m_service = new AalMediaPlayerService(m_hubService, this);
     m_service->setService(m_hubService);
-    m_player.reset(new TestPlayer());
+    m_player = m_hubService->create_session(TestPlayer::Client::default_configuration());
     m_service->setPlayer(m_player);
     m_playerControl = m_service->requestControl(QMediaPlayerControl_iid);
     m_mediaPlayerControl = m_service->mediaPlayerControl();

=== modified file 'tests/unit/unit.pro'
--- tests/unit/unit.pro	2015-12-18 15:38:48 +0000
+++ tests/unit/unit.pro	2016-03-22 19:23:08 +0000
@@ -21,6 +21,7 @@
     ../../src/aal/aalvideorenderercontrol.h \
     ../../src/aal/aalmediaplaylistprovider.h \
     ../../src/aal/aalmediaplaylistcontrol.h \
+    ../../src/aal/aalaudiorolecontrol.h \
     ../../src/aal/aalutility.h \
     tst_mediaplayerplugin.h \
     tst_mediaplaylistcontrol.h \
@@ -40,4 +41,5 @@
     ../../src/aal/aalmediaplayerservice.cpp \
     ../../src/aal/aalmediaplayerserviceplugin.cpp \
     ../../src/aal/aalvideorenderercontrol.cpp \
+    ../../src/aal/aalaudiorolecontrol.cpp \
     ../../src/aal/aalutility.cpp