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

Proposed by Jim Hodapp
Status: Merged
Approved by: Jim Hodapp
Approved revision: 93
Merged at revision: 93
Proposed branch: lp://staging/~phablet-team/qtubuntu-media/fix-removemedia
Merge into: lp://staging/qtubuntu-media/stable
Diff against target: 97 lines (+25/-5)
3 files modified
src/aal/aalmediaplaylistcontrol.cpp (+20/-1)
src/aal/aalmediaplaylistcontrol.h (+1/-0)
src/aal/aalmediaplaylistprovider.cpp (+4/-4)
To merge this branch: bzr merge lp://staging/~phablet-team/qtubuntu-media/fix-removemedia
Reviewer Review Type Date Requested Status
Andrew Hayzen (community) Needs Fixing
Simon Fels Approve
Review via email: mp+281237@code.staging.launchpad.net

Commit message

Fix removeMedia(start, end) so that it always removes the correct track(s) and reflects the proper current track

Description of the change

Fix removeMedia(start, end) so that it always removes the correct track(s) and reflects the proper current track

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

LGTM

review: Approve
94. By Jim Hodapp

Make sure a second selected track index gets selected instead of track 0 always

95. By Jim Hodapp

Make sure m_currentIndex is actually reset when clearing the tracklist

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

When trying out the silo I found that the queue would break or still not work correctly. So I modified what you have added to the onMediaRemoved to match what I was doing in music (set currentIndex to 0 not to -1) and it seem to have resolved the issues :-) My diff is here [0]

One inline comment:
1) Changing this to m_currentIndex = 0; works better for me :-)

0 - http://pastebin.ubuntu.com/14284307/

review: Needs Fixing
96. By Jim Hodapp

Reset m_currentIndex to 0 instead of -1 when all tracks are removed

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: