Merge lp://staging/~phablet-team/media-hub/media-hub-desktop into lp://staging/media-hub
Proposed by
Jim Hodapp
Status: | Merged |
---|---|
Approved by: | Konrad Zapałowicz |
Approved revision: | 210 |
Merged at revision: | 204 |
Proposed branch: | lp://staging/~phablet-team/media-hub/media-hub-desktop |
Merge into: | lp://staging/media-hub |
Diff against target: |
1013 lines (+504/-61) 27 files modified
CMakeLists.txt (+8/-2) debian/changelog (+6/-0) include/core/media/player.h (+16/-0) src/core/media/CMakeLists.txt (+42/-37) src/core/media/backend.cpp (+43/-0) src/core/media/client_death_observer.cpp (+18/-1) src/core/media/codec.h (+43/-0) src/core/media/engine.h (+1/-1) src/core/media/gstreamer/engine.cpp (+3/-3) src/core/media/gstreamer/engine.h (+2/-2) src/core/media/mpris/player.h (+6/-1) src/core/media/player_implementation.cpp (+1/-0) src/core/media/player_skeleton.cpp (+10/-0) src/core/media/player_skeleton.h (+2/-0) src/core/media/player_stub.cpp (+11/-1) src/core/media/player_stub.h (+1/-0) src/core/media/recorder_observer.cpp (+18/-1) src/core/media/server/server.cpp (+15/-2) src/core/media/stub_client_death_observer.cpp (+66/-0) src/core/media/stub_client_death_observer.h (+64/-0) src/core/media/stub_recorder_observer.cpp (+40/-0) src/core/media/stub_recorder_observer.h (+50/-0) src/core/media/video/hybris_gl_sink.h (+1/-1) src/core/media/video/platform_default_sink.cpp (+18/-2) src/core/media/video/platform_default_sink.h (+2/-1) tests/acceptance-tests/service.cpp (+8/-0) tests/unit-tests/test-gstreamer-engine.cpp (+9/-6) |
To merge this branch: | bzr merge lp://staging/~phablet-team/media-hub/media-hub-desktop |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alfonso Sanchez-Beato | Approve | ||
Konrad Zapałowicz (community) | Approve | ||
Review via email:
|
Commit message
Make media-hub work on the desktop. Everything except for video playback works with this commit.
Description of the change
Make media-hub work on the desktop. Everything except for video playback works with this commit.
To post a comment you must log in.
We need to decide how to detect the platform, see comment below.