qtubuntu-media

Merge lp:~timo-jyrinki/qtubuntu-media/port_to_new_audio_role_api into lp:qtubuntu-media

  1. port_to_new_audio_role_api
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Approved by: Jim Hodapp
Approved revision: 91
Merged at revision: 91
Proposed branch: lp:~timo-jyrinki/qtubuntu-media/port_to_new_audio_role_api
Merge into: lp:qtubuntu-media
Diff against target: 118 lines (+42/-0)
4 files modified
src/aal/aalmediaplayercontrol.cpp (+8/-0)
src/aal/aalmediaplayercontrol.h (+5/-0)
src/aal/aalmediaplayerservice.cpp (+24/-0)
src/aal/aalmediaplayerservice.h (+5/-0)
To merge this branch: bzr merge lp:~timo-jyrinki/qtubuntu-media/port_to_new_audio_role_api
Reviewer Review Type Date Requested Status
Jim Hodapp (community) code Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+273392@code.launchpad.net

Commit message

Port to the new Audio Role API (LP: #1493851)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Jim Hodapp (jhodapp) wrote :

LGTM

review: Approve (code)
Revision history for this message
Jim Hodapp (jhodapp) :
review: Needs Information (code)
Revision history for this message
Jim Hodapp (jhodapp) :
lp:~timo-jyrinki/qtubuntu-media/port_to_new_audio_role_api updated
91. By Timo Jyrinki

add || for MusicRole as suggested in the comment

Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Ok added the MusicRole to the latter one and answered to the first question. Note that I'm not familiar with the whole chain (Android/PulseAudio/Qt) so I don't know as such the correct selections necessarily.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Jim Hodapp (jhodapp) wrote :

Looks good. One reminder. Before this will function correctly we need to update at least media-hub but I'm also thinking we need to update pulseaudio as it is the layer that gives meaning to these various roles and this new list is completely different.

review: Approve (code)
lp:~timo-jyrinki/qtubuntu-media/port_to_new_audio_role_api updated
92. By Timo Jyrinki

Fix invalid non-breaking space character :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/aal/aalmediaplayercontrol.cpp'
--- src/aal/aalmediaplayercontrol.cpp 2015-08-18 15:48:31 +0000
+++ src/aal/aalmediaplayercontrol.cpp 2015-11-04 08:24:34 +0000
@@ -61,12 +61,20 @@
61 return m_status;61 return m_status;
62}62}
6363
64#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
64QMediaPlayer::AudioRole AalMediaPlayerControl::audioRole() const65QMediaPlayer::AudioRole AalMediaPlayerControl::audioRole() const
66#else
67QAudio::Role AalMediaPlayerControl::audioRole() const
68#endif
65{69{
66 return m_service->audioRole();70 return m_service->audioRole();
67}71}
6872
73#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
69void AalMediaPlayerControl::setAudioRole(QMediaPlayer::AudioRole audioRole)74void AalMediaPlayerControl::setAudioRole(QMediaPlayer::AudioRole audioRole)
75#else
76void AalMediaPlayerControl::setAudioRole(QAudio::Role audioRole)
77#endif
70{78{
71 qDebug() << __PRETTY_FUNCTION__;79 qDebug() << __PRETTY_FUNCTION__;
72 m_service->setAudioRole(audioRole);80 m_service->setAudioRole(audioRole);
7381
=== modified file 'src/aal/aalmediaplayercontrol.h'
--- src/aal/aalmediaplayercontrol.h 2015-07-24 18:44:13 +0000
+++ src/aal/aalmediaplayercontrol.h 2015-11-04 08:24:34 +0000
@@ -32,8 +32,13 @@
3232
33 virtual QMediaPlayer::State state() const;33 virtual QMediaPlayer::State state() const;
34 virtual QMediaPlayer::MediaStatus mediaStatus() const;34 virtual QMediaPlayer::MediaStatus mediaStatus() const;
35#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
35 virtual QMediaPlayer::AudioRole audioRole() const;36 virtual QMediaPlayer::AudioRole audioRole() const;
36 virtual void setAudioRole(QMediaPlayer::AudioRole audioRole);37 virtual void setAudioRole(QMediaPlayer::AudioRole audioRole);
38#else
39 virtual QAudio::Role audioRole() const;
40 virtual void setAudioRole(QAudio::Role audioRole);
41#endif
37 virtual qint64 duration() const;42 virtual qint64 duration() const;
38 virtual qint64 position() const;43 virtual qint64 position() const;
39 virtual void setPosition(qint64);44 virtual void setPosition(qint64);
4045
=== modified file 'src/aal/aalmediaplayerservice.cpp'
--- src/aal/aalmediaplayerservice.cpp 2015-10-20 13:06:11 +0000
+++ src/aal/aalmediaplayerservice.cpp 2015-11-04 08:24:34 +0000
@@ -228,21 +228,41 @@
228 m_videoOutput->playbackComplete();228 m_videoOutput->playbackComplete();
229}229}
230230
231#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
231QMediaPlayer::AudioRole AalMediaPlayerService::audioRole() const232QMediaPlayer::AudioRole AalMediaPlayerService::audioRole() const
233#else
234QAudio::Role AalMediaPlayerService::audioRole() const
235#endif
232{236{
233 if (m_hubPlayerSession == NULL)237 if (m_hubPlayerSession == NULL)
238#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
234 return QMediaPlayer::MultimediaRole;239 return QMediaPlayer::MultimediaRole;
240#else
241 return QAudio::VideoRole;
242#endif
235243
236 try {244 try {
245#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
237 return static_cast<QMediaPlayer::AudioRole>(m_hubPlayerSession->audio_stream_role().get());246 return static_cast<QMediaPlayer::AudioRole>(m_hubPlayerSession->audio_stream_role().get());
247#else
248 return static_cast<QAudio::Role>(m_hubPlayerSession->audio_stream_role().get());
249#endif
238 }250 }
239 catch (const std::runtime_error &e) {251 catch (const std::runtime_error &e) {
240 qWarning() << "Failed to get audio stream role: " << e.what();252 qWarning() << "Failed to get audio stream role: " << e.what();
253#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
241 return QMediaPlayer::MultimediaRole;254 return QMediaPlayer::MultimediaRole;
255#else
256 return QAudio::VideoRole;
257#endif
242 }258 }
243}259}
244260
261#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
245void AalMediaPlayerService::setAudioRole(QMediaPlayer::AudioRole audioRole)262void AalMediaPlayerService::setAudioRole(QMediaPlayer::AudioRole audioRole)
263#else
264void AalMediaPlayerService::setAudioRole(QAudio::Role audioRole)
265#endif
246{266{
247 if (m_hubPlayerSession == NULL)267 if (m_hubPlayerSession == NULL)
248 return;268 return;
@@ -793,7 +813,11 @@
793{813{
794 // If this player is a multimedia audioRole, then it should possible to814 // If this player is a multimedia audioRole, then it should possible to
795 // use it for MPRIS control815 // use it for MPRIS control
816#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
796 if (audioRole() == QMediaPlayer::MultimediaRole)817 if (audioRole() == QMediaPlayer::MultimediaRole)
818#else
819 if (audioRole() == QAudio::VideoRole || audioRole() == QAudio::MusicRole)
820#endif
797 {821 {
798 qDebug() << "Setting player as current player";822 qDebug() << "Setting player as current player";
799 try {823 try {
800824
=== modified file 'src/aal/aalmediaplayerservice.h'
--- src/aal/aalmediaplayerservice.h 2015-09-08 19:31:18 +0000
+++ src/aal/aalmediaplayerservice.h 2015-11-04 08:24:34 +0000
@@ -74,8 +74,13 @@
74 // Call this before attempting to play the same video a second time (after EOS)74 // Call this before attempting to play the same video a second time (after EOS)
75 void resetVideoSink();75 void resetVideoSink();
7676
77#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
77 QMediaPlayer::AudioRole audioRole() const;78 QMediaPlayer::AudioRole audioRole() const;
78 void setAudioRole(QMediaPlayer::AudioRole audioRole);79 void setAudioRole(QMediaPlayer::AudioRole audioRole);
80#else
81 QAudio::Role audioRole() const;
82 void setAudioRole(QAudio::Role audioRole);
83#endif
7984
80 void setMedia(const QUrl &url);85 void setMedia(const QUrl &url);
81 void setMedia(const QMediaContent &media);86 void setMedia(const QMediaContent &media);

Subscribers

People subscribed via source and target branches