Merge lp:~phablet-team/media-hub/fix-1542947 into lp:media-hub
Proposed by
Jim Hodapp
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Alfonso Sanchez-Beato | ||||
Approved revision: | 180 | ||||
Merged at revision: | 176 | ||||
Proposed branch: | lp:~phablet-team/media-hub/fix-1542947 | ||||
Merge into: | lp:media-hub | ||||
Diff against target: |
284 lines (+131/-14) 6 files modified
src/core/media/hashed_keyed_player_store.cpp (+11/-5) src/core/media/hashed_keyed_player_store.h (+4/-1) src/core/media/service_implementation.cpp (+5/-2) src/core/media/service_skeleton.cpp (+8/-6) tests/unit-tests/CMakeLists.txt (+36/-0) tests/unit-tests/test-player-store.cpp (+67/-0) |
||||
To merge this branch: | bzr merge lp:~phablet-team/media-hub/fix-1542947 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alfonso Sanchez-Beato | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email: mp+287943@code.launchpad.net |
Commit message
Fix deadlock issue when adding/removing Player instances from the HashedKeyedPlay
Description of the change
Fix deadlock issue when adding/removing Player instances from the HashedKeyedPlay
To post a comment you must log in.
Some comments below.