Merge lp://staging/~stolowski/unity-scope-mediascanner/sort-by-mtime into lp://staging/unity-scope-mediascanner

Proposed by Paweł Stołowski
Status: Merged
Approved by: James Henstridge
Approved revision: 263
Merged at revision: 276
Proposed branch: lp://staging/~stolowski/unity-scope-mediascanner/sort-by-mtime
Merge into: lp://staging/unity-scope-mediascanner
Prerequisite: lp://staging/~jamesh/unity-scope-mediascanner/fallback-art
Diff against target: 81 lines (+10/-15)
2 files modified
src/mymusic/music-scope.cpp (+8/-12)
src/mymusic/music-scope.h (+2/-3)
To merge this branch: bzr merge lp://staging/~stolowski/unity-scope-mediascanner/sort-by-mtime
Reviewer Review Type Date Requested Status
James Henstridge Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+276503@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-11-03.

Commit message

Use hasMedia() to check if db is empty instead of a custom check.
Sort songs by mtime when aggregated in surfacing mode.

Description of the change

Use hasMedia() to check if db is empty instead of a custom check.
Sort songs by mtime when aggregated in surfacing mode.

To post a comment you must log in.
262. By Paweł Stołowski

Apply sort order

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
263. By Paweł Stołowski

Merge trunk

Revision history for this message
James Henstridge (jamesh) wrote :

Looks good. I've merged re-merged your audio-card branch into my fallback-art branch, so it'd be good to check that this branch is still clean.

Since you did a direct merge from trunk here, it'll be a criss-cross merge. Bazaar usually handles that okay, but it is best to check and make sure.

review: Approve
264. By Paweł Stołowski

Merged trunk

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: