Media Hub

Merge lp://staging/~phablet-team/media-hub/tracklist-cli into lp://staging/media-hub

  1. tracklist-cli
  2. Merge into trunk
Proposed by Jim Hodapp
Status: Merged
Approved by: Ricardo Mendoza
Approved revision: 139
Merged at revision: 132
Proposed branch: lp://staging/~phablet-team/media-hub/tracklist-cli
Merge into: lp://staging/media-hub
Diff against target: 2379 lines (+1155/-173)
32 files modified
include/core/media/player.h (+39/-2)
include/core/media/track_list.h (+37/-4)
src/core/media/codec.h (+2/-0)
src/core/media/engine.h (+2/-1)
src/core/media/gstreamer/engine.cpp (+5/-3)
src/core/media/gstreamer/engine.h (+1/-1)
src/core/media/gstreamer/meta_data_extractor.h (+1/-1)
src/core/media/gstreamer/playbin.cpp (+6/-2)
src/core/media/gstreamer/playbin.h (+3/-1)
src/core/media/mpris/player.h (+8/-3)
src/core/media/mpris/track_list.h (+101/-9)
src/core/media/player_configuration.h (+2/-0)
src/core/media/player_implementation.cpp (+81/-13)
src/core/media/player_implementation.h (+1/-1)
src/core/media/player_skeleton.cpp (+5/-4)
src/core/media/player_skeleton.h (+4/-2)
src/core/media/player_stub.cpp (+14/-8)
src/core/media/player_stub.h (+3/-2)
src/core/media/service_implementation.cpp (+15/-12)
src/core/media/service_skeleton.cpp (+8/-2)
src/core/media/service_stub.cpp (+3/-0)
src/core/media/track_list_implementation.cpp (+83/-12)
src/core/media/track_list_implementation.h (+10/-4)
src/core/media/track_list_skeleton.cpp (+191/-58)
src/core/media/track_list_skeleton.h (+23/-6)
src/core/media/track_list_stub.cpp (+34/-11)
src/core/media/track_list_stub.h (+11/-5)
tests/CMakeLists.txt (+1/-0)
tests/test-track-list/CMakeLists.txt (+17/-0)
tests/test-track-list/test_track_list.cpp (+346/-0)
tests/test-track-list/test_track_list.h (+86/-0)
tests/unit-tests/test-gstreamer-engine.cpp (+12/-6)
To merge this branch: bzr merge lp://staging/~phablet-team/media-hub/tracklist-cli
Reviewer Review Type Date Requested Status
Thomas Voß (community) Needs Information
PS Jenkins bot continuous-integration Approve
Review via email: mp+255900@code.staging.launchpad.net

Commit message

* Implements the backend portion of TrackLists required to allow clients to be able to hand off a playlist to media-hub and keep playing music in order, shuffled and/or looped without the app being in the foreground

Description of the change

* Implements the backend portion of TrackLists required to allow clients to be able to hand off a playlist to media-hub and keep playing music in order, shuffled and/or looped without the app being in the foreground

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:135
http://jenkins.qa.ubuntu.com/job/media-hub-ci/324/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/164
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/164

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/324/rebuild

review: Approve (continuous-integration)
lp://staging/~phablet-team/media-hub/tracklist-cli updated
136. By Jim Hodapp

Initialize the TrackList property returned by Tracks().

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:136
http://jenkins.qa.ubuntu.com/job/media-hub-ci/326/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/166
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/166

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/326/rebuild

review: Approve (continuous-integration)
lp://staging/~phablet-team/media-hub/tracklist-cli updated
137. By Jim Hodapp

Include codec includes for vector and string.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/media-hub-ci/328/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/168
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/168

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/328/rebuild

review: Approve (continuous-integration)
lp://staging/~phablet-team/media-hub/tracklist-cli updated
138. By Jim Hodapp

Return the dbus Property instances instead of the local ones.

139. By Jim Hodapp

Clean up no longer necessary cout statements and one unused function add_set_state_to_main_context() in playbin.cpp

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/media-hub-ci/330/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/170
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/170

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/330/rebuild

review: Approve (continuous-integration)
Revision history for this message
Thomas Voß (thomas-voss) wrote :

I noticed the top-approve, still wanted to leave my comments.

review: Needs Information
lp://staging/~phablet-team/media-hub/tracklist-cli updated
140. By Jim Hodapp

Make sure the skeleton uses the dbus version of the properties instead of a copy.

141. By Jim Hodapp

Fix up the tracklist dbus object name/path

142. By Jim Hodapp

Fix video playback not working because of conflicting play(), stop(), play() during setup when using open_uri().

143. By Jim Hodapp

Don't call open_uri twice and also make sure that the TrackList handle_add_track_with_uri_at() checks apparmor access permissions.

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: