← Back to branch summary

~justinmcp/media-hub/proxy-player

~justinmcp/media-hub/proxy-player

Viewing all changes in revision 172.

Committer: Justin McPherson
Date: 2016-08-03 01:03:58 UTC
mfrom: (150.2.53 media-hub)
Revision ID: justin.mcpherson@canonical.com-20160803010358-6iheu4qq32hpbmlz

Merge from trunk.

files modified:
CMakeLists.txt

debian/VERSION.vivid

debian/changelog

include/core/media/player.h

include/core/media/service.h

include/core/media/track.h

src/core/media/engine.h

src/core/media/gstreamer/engine.cpp

src/core/media/gstreamer/engine.h

src/core/media/gstreamer/playbin.cpp

src/core/media/gstreamer/playbin.h

src/core/media/mpris/player.h

src/core/media/player_implementation.cpp

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/service_implementation.cpp

src/core/media/service_implementation.h

src/core/media/service_skeleton.cpp

src/core/media/service_skeleton.h

src/core/media/service_stub.cpp

src/core/media/service_stub.h

Show diffs side-by-side

added added

removed removed

debian/VERSION.vivid

debian/changelog

include/core/media/player.h

include/core/media/service.h

include/core/media/track.h

src/core/media/engine.h

src/core/media/gstreamer/engine.cpp

src/core/media/gstreamer/engine.h

src/core/media/gstreamer/playbin.cpp

src/core/media/gstreamer/playbin.h

src/core/media/mpris/player.h

src/core/media/player_implementation.cpp

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/service_implementation.cpp

src/core/media/service_implementation.h

src/core/media/service_skeleton.cpp

src/core/media/service_skeleton.h

src/core/media/service_stub.cpp

src/core/media/service_stub.h

Older »