lp:~jhodapp/media-hub/fix-1365497

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:media-hub at revision 108

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-01-20

Ubuntu Phablet Team: Pending requested 2015-01-19

Diff: 511 lines (+213/-13)

12 files modified

include/core/media/player.h (+15/-2)
src/core/media/codec.h (+40/-0)
src/core/media/engine.h (+1/-0)
src/core/media/gstreamer/engine.cpp (+97/-0)
src/core/media/gstreamer/engine.h (+1/-0)
src/core/media/mpris/player.h (+3/-0)
src/core/media/player_implementation.cpp (+5/-0)
src/core/media/player_implementation.h (+1/-1)
src/core/media/player_skeleton.cpp (+22/-3)
src/core/media/player_skeleton.h (+3/-1)
src/core/media/player_stub.cpp (+23/-5)
src/core/media/player_stub.h (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

107. By Jim Hodapp on 2015-01-19

Merged with upstream

106. By Jim Hodapp on 2015-01-19

Code cleanup

105. By Jim Hodapp on 2015-01-19

Error handling is working from the GStreamer pipeline level.

104. By Jim Hodapp on 2015-01-13

Initial code to bubble GStreamer playback errors up to the application. Everything is in place with this commit except for the engine.cpp translation between a GError and a core::ubuntu::media::Player::Error

103. By CI Train Bot <${CITRAIN_USER}@canonical.com> on 2015-01-08

Releasing 2.0.0+15.04.20150108-0ubuntu1

102. By Jim Hodapp on 2015-01-08

Pause playback when recording begins. Fixes: #1398047

101. By Ricardo Salveti on 2015-01-08

call_monitor.cpp: waiting for bridge to be up, and also protecting the on_change call
 Fixes: #1408137

100. By PS Jenkins bot on 2014-11-26

Releasing 2.0.0+15.04.20141126.2-0ubuntu1

99. By Jim Hodapp on 2014-11-26

Resubmitting with prerequisite branch Fixes: #1331041
Approved by: Jim Hodapp

98. By PS Jenkins bot on 2014-11-20

Releasing 2.0.0+15.04.20141120.1-0ubuntu1