lp:~justinmcp/media-hub/1239432

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:media-hub at revision 95

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

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

Diff: 723 lines (+579/-6)

11 files modified

CMakeLists.txt (+2/-2)
debian/control (+2/-0)
src/core/media/CMakeLists.txt (+4/-1)
src/core/media/call-monitor/CMakeLists.txt (+23/-0)
src/core/media/call-monitor/call_monitor.cpp (+206/-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/service_implementation.cpp (+26/-3)
src/core/media/service_implementation.h (+1/-0)
tests/unit-tests/CMakeLists.txt (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1239432: Music fails to pause on incoming/outgoing calls

High

Fix Released

Link a bug report

Related blueprints

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

Removed not needed #include

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

Merge from trunk.

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

Safety

74. By Justin McPherson <justin@phablet-dev> on 2014-10-31

Cleanup

73. By Justin McPherson <justin@phablet-dev> on 2014-10-31

#1239432 Music fails to pause on incoming/outgoing calls

72. By PS Jenkins bot on 2014-10-10

Releasing 2.0.0+14.10.20141010-0ubuntu1

71. By Alberto Aguirre on 2014-10-10

Fix potential access to dead objects. Fixes: 1364483, 1376352
Approved by: Thomas Voß

70. By PS Jenkins bot on 2014-09-26

Releasing 2.0.0+14.10.20140926-0ubuntu1

69. By Alberto Aguirre on 2014-09-26

Fix self deadlock when clients disconnect from media::Player

When receiving a media::PlayerImplementation on_client_disconnected signal, avoid calling
remove_player_for_key within the same context as the player object may be deleted (which owns
the signal object whose destructor waits until all slots are dispatched). Fixes: 1371454
Approved by: Jim Hodapp, Thomas Voß

68. By Alberto Aguirre on 2014-09-26

Prevent dead object access by asynchronous calls to clear_wakelock in media::PlayerImplementation::Private

On an player engine state change - detached threads are launched to clear system/display wakelocks in the future.
Before those threads get a chance to execute, media::PlayerImplementation can be destroyed. By holding a weak_ptr to
 media::PlayerImplementation::Private in the launched threads, access to dead Private objects is prevented. Fixes: 1373722
Approved by: Jim Hodapp, PS Jenkins bot