Merge lp:~phablet-team/qtubuntu-media/fix-1528898 into lp:qtubuntu-media/stable

[Jim Hodapp]

Fix bug #1528898

Fix bug #1528898

[Andrew Hayzen (ahayzen)]

LGTM :-)

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

See inline comment.

review: Needs Fixing

[lp:~phablet-team/qtubuntu-media/fix-1528898]

98. By Jim Hodapp on 2016-01-05

Make sure that selecting a random track from the songs list still works as expected.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Looks good, but I have spotted a small formatting issue, see comment.

[lp:~phablet-team/qtubuntu-media/fix-1528898]

99. By Jim Hodapp on 2016-01-07

Get rid of spurious '+'

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[lp:~phablet-team/qtubuntu-media/fix-1528898]

100. By Jim Hodapp on 2016-01-12

Merged with trunk

Unmerged revisions

100. By Jim Hodapp on 2016-01-12

Merged with trunk

99. By Jim Hodapp on 2016-01-07

Get rid of spurious '+'

98. By Jim Hodapp on 2016-01-05

Make sure that selecting a random track from the songs list still works as expected.

97. By Jim Hodapp on 2016-01-04

Fix bug #1528898

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-04 14:09:33 +0000
+++ debian/changelog	2016-01-12 14:48:24 +0000
@@ -1,3 +1,10 @@
+qtubuntu-media (0.8.0+16.04.20160105-0ubuntu1) xenial; urgency=medium
+
+  [ CI Train Bot ]
+  * No-change rebuild.
+
+ -- Thomas Voß <[e-mail]>  Tue, 05 Jan 2016 13:07:12 +0000
+
 qtubuntu-media (0.8.0+15.04.20160104-0ubuntu1) vivid; urgency=medium
 
   * Fix removeMedia(start, end) so that it always removes the correct
@@ -29,44 +36,93 @@
 
  -- Jim Hodapp <[e-mail]>  Wed, 18 Nov 2015 16:32:22 +0000
 
-qtubuntu-media (0.7.1+15.04.20151023.3-0ubuntu1) vivid; urgency=medium
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
-  [ Jim Hodapp ]
-  * Added addTracks support for batch track adding. Improved the
-    robustness of the QMediaPlaylist integration tests.
-
- -- Jim Hodapp <[e-mail]>  Fri, 23 Oct 2015 16:43:38 +0000
-
-qtubuntu-media (0.7.1+15.04.20151014-0ubuntu1) vivid; urgency=medium
-
-  [ Alfonso Sanchez-Beato ]
-  * Make sure the that the current player instance is controlable by
-    MPRIS controls if the type of player is appropriate for playlist
-    control. Also, don't add a track to the tracklist when
-    AalMediaPlayerService::setMedia() is called. (LP: #1500859)
-
-  [ Jim Hodapp ]
-  * Make sure the that the current player instance is controlable by
-    MPRIS controls if the type of player is appropriate for playlist
-    control. Also, don't add a track to the tracklist when
-    AalMediaPlayerService::setMedia() is called. (LP: #1500859)
-
- -- CI Train Bot <[e-mail]>  Wed, 14 Oct 2015 20:58:46 +0000
-
-qtubuntu-media (0.7.1+15.04.20150828-0ubuntu1) vivid; urgency=medium
-
-  [ Jim Hodapp ]
-  * Bump version for vivid sync
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
- -- CI Train Bot <[e-mail]>  Fri, 28 Aug 2015 13:52:24 +0000
-
-qtubuntu-media (0.7.1+15.04.20150710-0ubuntu1) vivid; urgency=medium
+qtubuntu-media (0.7.1+16.04.20151104.1-0ubuntu1) xenial; urgency=medium
+
+  [ Timo Jyrinki ]
+  * Port to the new Audio Role API (LP: #1493851) (LP: #1493851)
+
+ -- CI Train Bot <[e-mail]>  Wed, 04 Nov 2015 08:31:35 +0000
+
+qtubuntu-media (0.7.1+15.10.20151020.1-0ubuntu1) wily; urgency=medium
+
+  [ Alfonso Sanchez-Beato ]
+  * Make sure the that the current player instance is controlable by
+    MPRIS controls if the type of player is appropriate for playlist
+    control. Also, don't add a track to the tracklist when
+    AalMediaPlayerService::setMedia() is called. (LP: #1500859)
+
+  [ Jim Hodapp ]
+  * Make sure the that the current player instance is controlable by
+    MPRIS controls if the type of player is appropriate for playlist
+    control. Also, don't add a track to the tracklist when
+    AalMediaPlayerService::setMedia() is called. (LP: #1500859)
+
+  [ CI Train Bot ]
+  * No-change rebuild.
+
+ -- Alfonso Sanchez-Beato <[e-mail]>  Tue, 20 Oct 2015 13:10:40 +0000
+
+qtubuntu-media (0.7.1+15.10.20151019.1-0ubuntu1) wily; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Jim Hodapp ]
+  * Get rid of the unnecessary dependency on libmediascanner. Update
+    mock service interface with changes from media-hub. (LP: #1500859)
+
+ -- Jim Hodapp <[e-mail]>  Mon, 19 Oct 2015 16:21:01 +0000
+
+qtubuntu-media (0.7.1+15.10.20150903.1-0ubuntu1) wily; urgency=medium
+
+  [ Alfonso Sanchez-Beato ]
+  * [ Jim Hodapp ] Added background playlist support connecting
+    qtmultimedia with media-hub. added:
+    src/aal/aalmediaplaylistcontrol.cpp
+    src/aal/aalmediaplaylistcontrol.h
+    src/aal/aalmediaplaylistprovider.cpp
+    src/aal/aalmediaplaylistprovider.h src/aal/aalutility.cpp
+    src/aal/aalutility.h src/aal/private/
+    src/aal/private/qmediaplaylistnavigator_p.h
+    src/aal/private/qmediaplaylistprovider_p.h
+    src/aal/qmediaplaylistcontrol_p.h tests/integration/
+    tests/integration/integration.pro tests/integration/testdata/
+    tests/integration/testdata/testfile.mp4
+    tests/integration/testdata/testfile.ogg
+    tests/integration/tst_mediaplaylist.cpp
+    tests/integration/tst_mediaplaylist.h tests/tests.pro tests/unit/
+    tests/unit/player_mock.cpp tests/unit/player_mock.h
+    tests/unit/tst_mediaplaylistcontrol.cpp
+    tests/unit/tst_mediaplaylistcontrol.h renamed: unittests/ => tests/
+    unittests/player.cpp => tests/unit/player.cpp unittests/player.h =>
+    tests/unit/player.h unittests/service.cpp => tests/unit/service.cpp
+    unittests/service.h => tests/unit/service.h
+    unittests/setup_mediascanner.sh => tests/unit/setup_mediascanner.sh
+    unittests/tst_mediaplayerplugin.cpp =>
+    tests/unit/tst_mediaplayerplugin.cpp
+    unittests/tst_mediaplayerplugin.h =>
+    tests/unit/tst_mediaplayerplugin.h
+    unittests/tst_metadatareadercontrol.cpp =>
+    tests/unit/tst_metadatareadercontrol.cpp
+    unittests/tst_metadatareadercontrol.h =>
+    tests/unit/tst_metadatareadercontrol.h unittests/unittests.pro =>
+    tests/unit/unit.pro
+
+ -- CI Train Bot <[e-mail]>  Thu, 03 Sep 2015 08:25:29 +0000
+
+qtubuntu-media (0.7.1+15.10.20150710-0ubuntu2~gcc5.2) wily; urgency=medium
+
+  * No-change test rebuild for g++5 ABI transition
+
+ -- Matthias Klose <[e-mail]>  Thu, 30 Jul 2015 12:09:11 +0200
+
+qtubuntu-media (0.7.1+15.10.20150710-0ubuntu2~gcc5.1) wily; urgency=medium
+
+  * No-change test rebuild for g++5 ABI transition
+
+ -- Steve Langasek <[e-mail]>  Wed, 22 Jul 2015 23:30:42 +0000
+
+qtubuntu-media (0.7.1+15.10.20150710-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]
   * New rebuild forced.
@@ -77,7 +133,7 @@
 
  -- CI Train Bot <[e-mail]>  Fri, 10 Jul 2015 18:12:45 +0000
 
-qtubuntu-media (0.7.1+15.04.20150602.3-0ubuntu1) vivid; urgency=medium
+qtubuntu-media (0.7.1+15.10.20150602.3-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]
   * New rebuild forced.
@@ -88,7 +144,7 @@
 
  -- CI Train Bot <[e-mail]>  Tue, 02 Jun 2015 19:37:22 +0000
 
-qtubuntu-media (0.7.1+15.04.20150602.1-0ubuntu1) vivid; urgency=medium
+qtubuntu-media (0.7.1+15.10.20150602.1-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]
   * New rebuild forced.
@@ -98,7 +154,7 @@
 
  -- CI Train Bot <[e-mail]>  Tue, 02 Jun 2015 16:55:53 +0000
 
-qtubuntu-media (0.7.1+15.04.20150527.2-0ubuntu1) vivid; urgency=medium
+qtubuntu-media (0.7.1+15.10.20150527.2-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]
   * New rebuild forced.
@@ -110,7 +166,7 @@
 
  -- CI Train Bot <[e-mail]>  Wed, 27 May 2015 18:38:32 +0000
 
-qtubuntu-media (0.7.1+15.04.20150522-0ubuntu1) vivid; urgency=medium
+qtubuntu-media (0.7.1+15.10.20150522-0ubuntu1) wily; urgency=medium
 
   [ Jim Hodapp ]
   * Make sure that stopped and ready (same state for QMediaPlayer) are
@@ -118,6 +174,17 @@
 
  -- CI Train Bot <[e-mail]>  Fri, 22 May 2015 17:36:57 +0000
 
+qtubuntu-media (0.7.1+15.04.20151023.3-0ubuntu1) vivid; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Jim Hodapp ]
+  * Added addTracks support for batch track adding. Improved the
+    robustness of the QMediaPlaylist integration tests.
+
+ -- Jim Hodapp <[e-mail]>  Fri, 23 Oct 2015 16:43:38 +0000
+
 qtubuntu-media (0.7.1+15.04.20150513.1-0ubuntu1) vivid; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'src/aal/aalmediaplayercontrol.cpp'
--- src/aal/aalmediaplayercontrol.cpp	2015-11-04 17:17:50 +0000
+++ src/aal/aalmediaplayercontrol.cpp	2016-01-12 14:48:24 +0000
@@ -61,12 +61,20 @@
     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-07-24 18:44:13 +0000
+++ src/aal/aalmediaplayercontrol.h	2016-01-12 14:48:24 +0000
@@ -32,8 +32,13 @@
 
     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	2015-11-02 14:26:44 +0000
+++ src/aal/aalmediaplayerservice.cpp	2016-01-12 14:48:24 +0000
@@ -228,21 +228,41 @@
         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
 
     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
     }
 }
 
+#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)
         return;
@@ -756,7 +776,11 @@
 {
         // 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-10-09 20:06:40 +0000
+++ src/aal/aalmediaplayerservice.h	2016-01-12 14:48:24 +0000
@@ -74,8 +74,13 @@
     // 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);

=== modified file 'src/aal/aalmediaplaylistcontrol.cpp'
--- src/aal/aalmediaplaylistcontrol.cpp	2016-01-04 14:07:05 +0000
+++ src/aal/aalmediaplaylistcontrol.cpp	2016-01-12 14:48:24 +0000
@@ -293,12 +293,33 @@
     }
 }
 
+void AalMediaPlaylistControl::onRemoveTracks(int start, int end)
+{
+    // If the current track and everything after has been removed
+    // then we need to set the currentIndex to 0 otherwise it is
+    // left at the position it was before removing
+    if (start <= m_currentIndex
+            and m_currentIndex <= end
+            and (end + 1) == m_playlistProvider->mediaCount()
+            and start != 0)
+    {
+        m_currentIndex = 0;
+        setCurrentIndex(0);
+
+        // When repeat is off we have reached the end of playback so stop
+        if (playbackMode() == QMediaPlaylist::Sequential)
+        {
+            qDebug() << "Repeat is off, so stopping playback";
+            m_hubPlayerSession->stop();
+        }
+    }
+}
+
 void AalMediaPlaylistControl::onCurrentIndexChanged()
 {
-    int index = aalMediaPlaylistProvider()->indexOfTrack(m_currentId);
-
+    const int index = aalMediaPlaylistProvider()->indexOfTrack(m_currentId);
     if (index != m_currentIndex) {
-        qDebug() << "Index changed to " << index;
+        qDebug() << "Index changed to" << index;
         m_currentIndex = index;
         Q_EMIT currentIndexChanged(m_currentIndex);
     }
@@ -362,6 +383,9 @@
 
     connect(aalMediaPlaylistProvider(), &AalMediaPlaylistProvider::mediaRemoved,
             this, &AalMediaPlaylistControl::onMediaRemoved);
+
+    connect(aalMediaPlaylistProvider(), &AalMediaPlaylistProvider::removeTracks,
+            this, &AalMediaPlaylistControl::onRemoveTracks);
 }
 
 void AalMediaPlaylistControl::disconnect_signals()

=== modified file 'src/aal/aalmediaplaylistcontrol.h'
--- src/aal/aalmediaplaylistcontrol.h	2015-12-24 15:40:01 +0000
+++ src/aal/aalmediaplaylistcontrol.h	2016-01-12 14:48:24 +0000
@@ -64,6 +64,7 @@
     void onTrackChanged(const core::ubuntu::media::Track::Id& id);
     void onStartMoveTrack(int from, int to);
     void onMediaRemoved(int start, int end);
+    void onRemoveTracks(int start, int end);
     void onCurrentIndexChanged();
 
 private:

=== modified file 'src/aal/aalmediaplaylistprovider.cpp'
--- src/aal/aalmediaplaylistprovider.cpp	2015-12-22 17:57:01 +0000
+++ src/aal/aalmediaplaylistprovider.cpp	2016-01-12 14:48:24 +0000
@@ -22,6 +22,9 @@
 
 #include <QDebug>
 
+// Uncomment for more verbose debugging to stdout/err
+//#define VERBOSE_DEBUG
+
 namespace media = core::ubuntu::media;
 
 Q_DECLARE_METATYPE(core::ubuntu::media::Track::Id)
@@ -145,7 +148,9 @@
 
     media::TrackList::ContainerURI uris;
     for (const auto mediaContent : contentList) {
+#ifdef VERBOSE_DEBUG
         qDebug() << "Adding track " << AalUtility::unescape(mediaContent).toString();
+#endif
         uris.push_back(AalUtility::unescape_str(mediaContent));
     }
 
@@ -322,14 +327,25 @@
 
 bool AalMediaPlaylistProvider::removeMedia(int start, int end)
 {
-    // It's important that we remove tracks from end to start as removing tracks can
-    // change the relative index value in track_index_lut relative to the Track::Id
-    for (int i=end; i>=start; i--)
-    {
-        if (!removeMedia(i))
+    // If we are removing everything then just use clear()
+    if (start == 0 and (end + 1) == mediaCount())
+    {
+        return clear();
+    }
+    else
+    {
+        // Signal AalMediaPlaylistControl
+        Q_EMIT removeTracks(start, end);
+
+        // It's important that we remove tracks from end to start as removing tracks can
+        // change the relative index value in track_index_lut relative to the Track::Id
+        for (int i=end; i>=start; i--)
         {
-            qWarning() << "Failed to remove the full range of tracks requested";
-            return false;
+            if (!removeMedia(i))
+            {
+                qWarning() << "Failed to remove the full range of tracks requested";
+                return false;
+            }
         }
     }
 

=== modified file 'src/aal/aalmediaplaylistprovider.h'
--- src/aal/aalmediaplaylistprovider.h	2015-11-13 15:48:06 +0000
+++ src/aal/aalmediaplaylistprovider.h	2016-01-12 14:48:24 +0000
@@ -64,6 +64,9 @@
 Q_SIGNALS:
     void startMoveTrack(int from, int to);
     void currentIndexChanged();
+    // Emitted when removing a range of tracks less than mediaCount()
+    // so that AalMediaPlaylistControl can take appropriate action
+    void removeTracks(int start, int end);
 
 private:
     void setPlayerSession(const std::shared_ptr<core::ubuntu::media::Player>& playerSession);

=== modified file 'src/aal/aalutility.cpp'
--- src/aal/aalutility.cpp	2015-06-09 20:53:02 +0000
+++ src/aal/aalutility.cpp	2016-01-12 14:48:24 +0000
@@ -18,17 +18,24 @@
 
 #include <QDebug>
 
+// Uncomment for more verbose debugging to stdout/err
+//#define VERBOSE_DEBUG
+
 QUrl AalUtility::unescape(const QMediaContent &media)
 {
     if (media.isNull())
         return QUrl();
 
     if (media.canonicalUrl().isLocalFile()) {
+#ifdef VERBOSE_DEBUG
         qDebug() << "Local file URI: " << QUrl::fromPercentEncoding(media.canonicalUrl().toString().toUtf8());
+#endif
         return QUrl::fromPercentEncoding(media.canonicalUrl().toString().toUtf8());
     }
     else {
+#ifdef VERBOSE_DEBUG
         qDebug() << "Remote stream URI: " << QUrl::fromEncoded(media.canonicalUrl().toString().toUtf8());
+#endif
         return QUrl::fromEncoded(media.canonicalUrl().toString().toUtf8());
     }
 }

=== modified file 'tests/unit/service.h'
--- tests/unit/service.h	2015-09-08 19:31:18 +0000
+++ tests/unit/service.h	2016-01-12 14:48:24 +0000
@@ -50,7 +50,7 @@
     virtual void destroy_session(const std::string& uuid, const Player::Configuration&);
     virtual std::shared_ptr<Player> create_fixed_session(const std::string& name, const Player::Configuration&);
     virtual std::shared_ptr<Player> resume_session(Player::PlayerKey);
-    virtual void set_current_player(Player::PlayerKey key);
+    virtual void set_current_player(Player::PlayerKey);
     virtual void pause_other_sessions(Player::PlayerKey);
 };
 }