Merge lp://staging/~jhodapp/media-hub/fix-1421620-rtm into lp://staging/media-hub
Proposed by
Jim Hodapp
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~jhodapp/media-hub/fix-1421620-rtm | ||||
| Merge into: | lp://staging/media-hub | ||||
| Diff against target: |
1068 lines (+827/-3) (has conflicts) 14 files modified
debian/changelog (+99/-0) debian/control (+7/-0) include/core/media/player.h (+13/-0) src/core/media/call-monitor/CMakeLists.txt (+23/-0) src/core/media/call-monitor/call_monitor.cpp (+222/-0) src/core/media/call-monitor/call_monitor.h (+41/-0) src/core/media/call-monitor/qtbridge.cpp (+186/-0) src/core/media/call-monitor/qtbridge.h (+87/-0) src/core/media/codec.h (+43/-0) src/core/media/gstreamer/playbin.h (+3/-0) src/core/media/service_implementation.cpp (+85/-3) src/core/media/service_implementation.h (+5/-0) tests/unit-tests/CMakeLists.txt (+4/-0) tests/unit-tests/test-gstreamer-engine.cpp (+9/-0) Text conflict in debian/changelog Text conflict in debian/control Text conflict in include/core/media/player.h Conflict adding file src/core/media/call-monitor. Moved existing file to src/core/media/call-monitor.moved. Text conflict in src/core/media/codec.h Text conflict in src/core/media/gstreamer/playbin.h Text conflict in src/core/media/service_implementation.cpp Text conflict in src/core/media/service_implementation.h Text conflict in tests/unit-tests/CMakeLists.txt Text conflict in tests/unit-tests/test-gstreamer-engine.cpp |
||||
| To merge this branch: | bzr merge lp://staging/~jhodapp/media-hub/fix-1421620-rtm | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
Fix the bug which caused music playback to start playing again after a phonecall hung up after being auto-paused by disconnecting a headphone jack
Description of the change
Fix the bug which caused music playback to start playing again after a phonecall hung up after being auto-paused by disconnecting a headphone jack
To post a comment you must log in.
Unmerged revisions
- 88. By Jim Hodapp
-
Fix the bug which caused music playback to start playing again after a phonecall hung up after being auto-paused by disconnecting a headphone jack.
- 87. By Ricardo Salveti
-
releasing package media-hub version 2.0.0+15.
04.20150120~ rtm-0ubuntu1
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
