qtubuntu-media

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

  1. fix-1510221
  2. Merge into stable
Proposed by Jim Hodapp
Status: Superseded
Proposed branch: lp://staging/~phablet-team/qtubuntu-media/fix-1510221
Merge into: lp://staging/qtubuntu-media/stable
Diff against target: 682 lines (+354/-39)
9 files modified
src/aal/aalmediaplayercontrol.cpp (+11/-10)
src/aal/aalmediaplayerservice.cpp (+5/-6)
src/aal/aalmediaplaylistcontrol.cpp (+2/-0)
src/aal/aalmediaplaylistprovider.cpp (+180/-19)
src/aal/aalmediaplaylistprovider.h (+13/-0)
src/aal/private/qmediaplaylistprovider_p.h (+1/-0)
tests/integration/integration.pro (+1/-1)
tests/integration/tst_mediaplaylist.cpp (+134/-2)
tests/integration/tst_mediaplaylist.h (+7/-1)
To merge this branch: bzr merge lp://staging/~phablet-team/qtubuntu-media/fix-1510221
Reviewer Review Type Date Requested Status
Simon Fels Approve
Review via email: mp+276001@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-11-03.

Commit message

* Implements insertTrack()
* Add moveTrack implementation. Also refactored removeTrack to remove the locally cached Track::Id before the on_track_removed signal arrives.

Description of the change

* Implements insertTrack()
* Add moveTrack implementation. Also refactored removeTrack to remove the locally cached Track::Id before the on_track_removed signal arrives.

To post a comment you must log in.
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve
lp://staging/~phablet-team/qtubuntu-media/fix-1510221 updated
91. By Jim Hodapp

Added moveTrack implementation. Also refactored removeTrack to remove the locally cached Track::Id before the on_track_removed signal arrives.

92. By Jim Hodapp

Merged with upstream

93. By Jim Hodapp

Added a moveTrack test to make sure that a track that is moved while playing continues to play.

94. By Jim Hodapp

Make sure to signal that all tracks have been removed when clearing the playlist.

95. By Jim Hodapp

Restore the old way of clearing the playlist.

96. By Jim Hodapp

moveTrack is working

97. By Jim Hodapp

Disable integration tests so the package can build

98. By Jim Hodapp

Addressed review comments.

99. By Jim Hodapp

Bump version for new TrackList related API changes.

100. By Jim Hodapp

Merged with prereq branch.

101. By Jim Hodapp

Merged with prereq and fixed merge conflicts.

102. By Jim Hodapp

Fix member variable initialization order.

103. By Jim Hodapp

Merged with upstream.

104. By Jim Hodapp

Added tst_MediaPlaylist::removeCurrentNonPlayingTrackAndVerify() to integration tests

105. By Jim Hodapp

Merged with upstream

106. By Jim Hodapp

Get rid of passing an explicit toggle_player_state boolean flag

107. By Jim Hodapp

Verify that the removal of the playing track (not the last one in the list) in the tracklist does not cause playback to stop.

108. By Jim Hodapp

Fix up the playReusePlayTrackList() test

109. By Jim Hodapp

Added new test removeLastCurrentPlayingTrackAndVerify

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: