Merge lp://staging/~jpakkane/unity-scope-mediascanner/videoaggregator into lp://staging/unity-scope-mediascanner

Proposed by Jussi Pakkanen
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 70
Merged at revision: 58
Proposed branch: lp://staging/~jpakkane/unity-scope-mediascanner/videoaggregator
Merge into: lp://staging/unity-scope-mediascanner
Prerequisite: lp://staging/~jamesh/unity-scope-mediascanner/scopes-api-0.3
Diff against target: 379 lines (+266/-6)
12 files modified
data/CMakeLists.txt (+9/-0)
data/videoaggregator.ini.in (+11/-0)
debian/unity-scope-mediascanner2.install (+1/-0)
oldscope/CMakeLists.txt (+1/-1)
src/CMakeLists.txt (+10/-0)
src/musicaggregatorquery.cpp (+5/-2)
src/musicaggregatorscope.cpp (+8/-2)
src/videoaggregatorquery.cpp (+51/-0)
src/videoaggregatorquery.h (+44/-0)
src/videoaggregatorscope.cpp (+78/-0)
src/videoaggregatorscope.h (+47/-0)
tests/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp://staging/~jpakkane/unity-scope-mediascanner/videoaggregator
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Michal Hruby (community) Needs Fixing
Review via email: mp+205726@code.staging.launchpad.net

Commit message

Video aggregator scope.

Description of the change

Video aggregator scope.

Missing the correct name so don't merge quite yet.

To post a comment you must log in.
67. By Jussi Pakkanen

Typo fix.

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

216 + online_scope = registry->get_metadata(ONLINESCOPE).proxy();

This could throw, not a good thing to do inside the start() method.

Revision history for this message
Michal Hruby (mhr3) :
review: Needs Fixing
68. By Jussi Pakkanen

Guard against failing remote scope instantiations.

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

Packaging fix.

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

68 +#videoaggregatorquery.cpp

Uncomment.

review: Needs Fixing
70. By Jussi Pakkanen

Typo fix.

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

Looks good. +1

review: Approve

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: