Merge lp://staging/~lorn-potter/media-hub/buffering-signal into lp://staging/media-hub
Proposed by
Lorn Potter
| Status: | Merged |
|---|---|
| Approved by: | Jim Hodapp |
| Approved revision: | 192 |
| Merged at revision: | 200 |
| Proposed branch: | lp://staging/~lorn-potter/media-hub/buffering-signal |
| Merge into: | lp://staging/media-hub |
| Diff against target: |
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) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~lorn-potter/media-hub/buffering-signal |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jim Hodapp (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Add media buffering signal handling
Description of the change
Add media buffering signal handling
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Several comment inline below.