Merge lp://staging/~stolowski/unity-scope-mediascanner/keywords into lp://staging/unity-scope-mediascanner
Proposed by
Paweł Stołowski
Status: | Merged |
---|---|
Approved by: | James Henstridge |
Approved revision: | 261 |
Merged at revision: | 236 |
Proposed branch: | lp://staging/~stolowski/unity-scope-mediascanner/keywords |
Merge into: | lp://staging/unity-scope-mediascanner |
Diff against target: |
1905 lines (+471/-865) 34 files modified
CMakeLists.txt (+1/-1) debian/control (+1/-1) src/musicaggregator/CMakeLists.txt (+2/-6) src/musicaggregator/musicaggregator-settings.ini.in (+0/-24) src/musicaggregator/musicaggregator.ini.in (+2/-1) src/musicaggregator/musicaggregatorquery.cpp (+141/-111) src/musicaggregator/musicaggregatorquery.h (+2/-12) src/musicaggregator/musicaggregatorscope.cpp (+18/-46) src/musicaggregator/musicaggregatorscope.h (+1/-9) src/musicaggregator/onlinemusicresultforwarder.cpp (+0/-37) src/musicaggregator/onlinemusicresultforwarder.h (+0/-40) src/mymusic/mediascanner-music.ini.in (+1/-0) src/mymusic/music-scope.cpp (+2/-1) src/myvideos/mediascanner-video.ini.in (+1/-0) src/myvideos/video-scope.cpp (+11/-14) src/utils/CMakeLists.txt (+1/-2) src/utils/bufferedresultforwarder.cpp (+7/-25) src/utils/bufferedresultforwarder.h (+5/-11) src/utils/notify-strategy.cpp (+0/-40) src/utils/notify-strategy.h (+0/-49) src/utils/resultforwarder.cpp (+0/-87) src/utils/resultforwarder.h (+0/-68) src/utils/utils.cpp (+59/-0) src/utils/utils.h (+35/-0) src/videoaggregator/CMakeLists.txt (+1/-4) src/videoaggregator/videoaggregator-settings.ini.in (+0/-9) src/videoaggregator/videoaggregator.ini.in (+2/-1) src/videoaggregator/videoaggregatorquery.cpp (+72/-60) src/videoaggregator/videoaggregatorquery.h (+3/-5) src/videoaggregator/videoaggregatorscope.cpp (+13/-23) src/videoaggregator/videoaggregatorscope.h (+3/-3) tests/CMakeLists.txt (+1/-8) tests/test-music-aggregator.cpp (+86/-26) tests/test-result-forwarder.cpp (+0/-141) |
To merge this branch: | bzr merge lp://staging/~stolowski/unity-scope-mediascanner/keywords |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Henstridge | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Unity Team | Pending | ||
Review via email: mp+255499@code.staging.launchpad.net |
Commit message
Support for keywords. Use BufferedResultF
Description of the change
Support for keywords. Use BufferedResultF
To post a comment you must log in.
PASSED: Continuous integration, rev:260 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- ci/164/ jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- vivid-amd64- ci/7 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- vivid-armhf- ci/7 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- vivid-i386- ci/7
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scope-mediascan ner-ci/ 164/rebuild
http://