lp:~lorn-potter/media-hub/buffering-signal

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:media-hub at revision 200

Jim Hodapp (community): Approve (code) on 2016-06-10

Diff: 394 lines (+89/-5) (has conflicts)

15 files modified

CMakeLists.txt (+1/-1)
debian/changelog (+9/-0)
include/core/media/player.h (+2/-0)
include/core/media/track.h (+0/-1)
src/core/media/engine.h (+1/-0)
src/core/media/gstreamer/engine.cpp (+18/-0)
src/core/media/gstreamer/engine.h (+1/-0)
src/core/media/gstreamer/playbin.cpp (+4/-0)
src/core/media/gstreamer/playbin.h (+1/-0)
src/core/media/mpris/player.h (+3/-0)
src/core/media/player_implementation.cpp (+5/-0)
src/core/media/player_skeleton.cpp (+22/-2)
src/core/media/player_skeleton.h (+2/-0)
src/core/media/player_stub.cpp (+19/-1)
src/core/media/player_stub.h (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

202. By Lorn Potter on 2016-07-07

bump version to 4.4.0

201. By Lorn Potter on 2016-07-06

bump version to 4.3.0

200. By Lorn Potter on 2016-07-03

revert last version dep change for media-hub

199. By Lorn Potter on 2016-06-28

fix build

198. By Lorn Potter on 2016-06-26

bump version

197. By Lorn Potter on 2016-06-24

merge from master branch

196. By Lorn Potter on 2016-06-16

fix change log

195. By Lorn Potter on 2016-06-16

try to fix conflict

194. By Lorn Potter on 2016-06-16

add yakkety instead

193. By Lorn Potter on 2016-06-15

bump version