lp:~phablet-team/media-hub/oxide-support

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:media-hub at revision 99

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-11-25

Jim Hodapp (community): Approve (code) on 2014-11-19

Diff: 6738 lines (+6130/-10)

27 files modified

CMakeLists.txt (+1/-0)
include/core/media/player.h (+10/-0)
include/core/media/service.h (+2/-0)
src/core/media/codec.h (+40/-0)
src/core/media/engine.h (+4/-0)
src/core/media/gstreamer/engine.cpp (+29/-0)
src/core/media/gstreamer/engine.h (+4/-0)
src/core/media/gstreamer/playbin.h (+61/-3)
src/core/media/mpris/player.h (+6/-0)
src/core/media/mpris/service.h (+26/-0)
src/core/media/player_implementation.cpp (+12/-0)
src/core/media/player_implementation.h (+1/-0)
src/core/media/player_skeleton.cpp (+33/-0)
src/core/media/player_skeleton.h (+2/-0)
src/core/media/player_stub.cpp (+19/-0)
src/core/media/player_stub.h (+3/-0)
src/core/media/service_implementation.cpp (+17/-1)
src/core/media/service_implementation.h (+2/-1)
src/core/media/service_skeleton.cpp (+143/-5)
src/core/media/service_stub.cpp (+30/-0)
src/core/media/service_stub.h (+2/-0)
tests/acceptance-tests/service.cpp (+78/-0)
tests/unit-tests/CMakeLists.txt (+8/-0)
tests/unit-tests/mongoose.c (+5253/-0)
tests/unit-tests/mongoose.h (+153/-0)
tests/unit-tests/test-gstreamer-engine.cpp (+64/-0)
tests/unit-tests/web_server.h (+127/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1331041: Add support for web user-agent and cookies

High

Fix Released

Link a bug report

Related blueprints

55. By Jim Hodapp on 2014-11-25

Merged with trunk

54. By Jim Hodapp on 2014-11-18

Merged with prerequisite branch to merging into trunk

53. By Justin McPherson <justin@phablet-dev> on 2014-11-13

Merge from trunk.

52. By Justin McPherson <justin@phablet-dev> on 2014-11-11

Merge from trunk.

51. By Justin McPherson <justin@phablet-dev> on 2014-10-23

- fix problems from merge
- mark fixed sessions as resumable

50. By Justin McPherson <justin@phablet-dev> on 2014-10-23

Merge from trunk.

49. By Justin McPherson <justin@phablet-dev> on 2014-10-23

Result of review.

48. By Justin McPherson <justin@phablet-dev> on 2014-10-21

Fix problem with test web serve.

47. By Justin McPherson <justin@phablet-dev> on 2014-10-21

Satisy CI.

46. By Justin McPherson <justin@phablet-dev> on 2014-10-21

Use local webserver for headers test.