← Back to branch summary

~ricmm/media-hub/multiple-sessions

~ricmm/media-hub/multiple-sessions

Viewing all changes in revision 28.

Committer: Ricardo Mendoza
Date: 2014-04-09 23:41:36 UTC
mfrom: (27.1.7 async-bus)
Revision ID: ricardo.mendoza@canonical.com-20140409234136-bb1y5dq443rhnrar

Merge lp:~phablet-team/media-hub/powerd-interface

files added:
src/core/media/powerd_service.h

tests/unit-tests/libmedia-mock.cpp

files modified:
CMakeLists.txt

debian/control

include/core/media/player.h

src/core/media/CMakeLists.txt

src/core/media/engine.h

src/core/media/gstreamer/engine.cpp

src/core/media/gstreamer/engine.h

src/core/media/gstreamer/playbin.h

src/core/media/mpris/player.h

src/core/media/player_implementation.cpp

src/core/media/player_implementation.h

src/core/media/player_skeleton.cpp

src/core/media/player_skeleton.h

src/core/media/player_stub.cpp

src/core/media/player_stub.h

src/core/media/server/server.cpp

src/core/media/track_list_implementation.cpp

src/core/media/track_list_implementation.h

src/core/media/track_list_skeleton.cpp

src/core/media/track_list_skeleton.h

tests/acceptance-tests/service.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/test-gstreamer-engine.cpp

Show diffs side-by-side

added added

removed removed

include/core/media/player.h

src/core/media/CMakeLists.txt

src/core/media/engine.h

src/core/media/gstreamer/engine.cpp

src/core/media/gstreamer/engine.h

src/core/media/gstreamer/playbin.h

src/core/media/mpris/player.h

src/core/media/player_implementation.cpp

src/core/media/player_implementation.h

src/core/media/player_skeleton.cpp

src/core/media/player_skeleton.h

src/core/media/player_stub.cpp

src/core/media/player_stub.h

src/core/media/powerd_service.h

src/core/media/server/server.cpp

src/core/media/track_list_implementation.cpp

src/core/media/track_list_implementation.h

src/core/media/track_list_skeleton.cpp

src/core/media/track_list_skeleton.h

tests/acceptance-tests/service.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/libmedia-mock.cpp

tests/unit-tests/test-gstreamer-engine.cpp

Older »