Merge lp://staging/~ricmm/media-hub/session-reattach-nonfixed into lp://staging/media-hub
Proposed by
Ricardo Mendoza
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~ricmm/media-hub/session-reattach-nonfixed |
Merge into: | lp://staging/media-hub |
Diff against target: |
2764 lines (+1509/-141) 38 files modified
CMakeLists.txt (+1/-1) debian/changelog (+6/-0) include/core/media/player.h (+42/-2) include/core/media/service.h (+16/-0) include/core/media/track_list.h (+35/-2) 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 (+28/-4) src/core/media/gstreamer/playbin.h (+7/-2) src/core/media/mpris/player.h (+8/-3) src/core/media/mpris/service.h (+39/-0) src/core/media/mpris/track_list.h (+98/-8) src/core/media/player_configuration.h (+1/-1) src/core/media/player_implementation.cpp (+97/-13) src/core/media/player_implementation.h (+4/-1) src/core/media/player_skeleton.cpp (+4/-4) src/core/media/player_skeleton.h (+2/-2) src/core/media/player_stub.cpp (+23/-9) src/core/media/player_stub.h (+7/-3) src/core/media/server/server.cpp (+1/-1) src/core/media/service_implementation.cpp (+14/-12) src/core/media/service_skeleton.cpp (+220/-13) src/core/media/service_skeleton.h (+3/-0) src/core/media/service_stub.cpp (+45/-10) src/core/media/service_stub.h (+3/-0) src/core/media/track_list_implementation.cpp (+69/-5) src/core/media/track_list_implementation.h (+4/-1) src/core/media/track_list_skeleton.cpp (+158/-25) src/core/media/track_list_skeleton.h (+16/-3) src/core/media/track_list_stub.cpp (+27/-3) src/core/media/track_list_stub.h (+7/-1) tests/CMakeLists.txt (+1/-0) tests/test-track-list/CMakeLists.txt (+17/-0) tests/test-track-list/test_track_list.cpp (+397/-0) tests/test-track-list/test_track_list.h (+88/-0) tests/unit-tests/test-gstreamer-engine.cpp (+12/-6) |
To merge this branch: | bzr merge lp://staging/~ricmm/media-hub/session-reattach-nonfixed |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phablet Team | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2015-04-14.
Commit message
Implement session detach/reattach for non-fixed sessions.
To post a comment you must log in.