Merge lp://staging/~morphis/aethercast/adapt-for-mir0.22 into lp://staging/aethercast
Proposed by
Simon Fels
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~morphis/aethercast/adapt-for-mir0.22 |
| Merge into: | lp://staging/aethercast |
| Diff against target: |
2275 lines (+1016/-119) 53 files modified
data/org.aethercast.xml (+1/-0) debian/aethercast.dirs (+1/-0) docs/device-api.txt (+2/-1) docs/manager-api.txt (+12/-0) src/CMakeLists.txt (+4/-2) src/client/application.cpp (+25/-1) src/client/application.h (+2/-0) src/gdbus/CMakeLists.txt (+10/-0) src/mcs/android/h264encoder.cpp (+17/-18) src/mcs/android/h264encoder.h (+0/-1) src/mcs/basesourcemediamanager.cpp (+8/-0) src/mcs/basesourcemediamanager.h (+14/-0) src/mcs/config.h.in (+3/-0) src/mcs/dbuserrors.cpp (+64/-0) src/mcs/dbuserrors.h (+44/-0) src/mcs/forwardingmiracastcontroller.cpp (+8/-0) src/mcs/forwardingmiracastcontroller.h (+3/-0) src/mcs/mir/screencast.cpp (+32/-16) src/mcs/mir/screencast.h (+0/-1) src/mcs/mir/sourcemediamanager.cpp (+7/-1) src/mcs/mir/sourcemediamanager.h (+5/-1) src/mcs/miracastcontroller.h (+3/-0) src/mcs/miracastcontrollerskeleton.cpp (+85/-9) src/mcs/miracastcontrollerskeleton.h (+7/-0) src/mcs/miracastservice.cpp (+129/-26) src/mcs/miracastservice.h (+15/-2) src/mcs/miracastsourceclient.cpp (+24/-1) src/mcs/miracastsourceclient.h (+13/-2) src/mcs/network/stream.cpp (+18/-0) src/mcs/network/udpstream.cpp (+2/-2) src/mcs/networkdeviceskeleton.cpp (+14/-11) src/mcs/networkmanager.h (+2/-0) src/mcs/networkmanagerfactory.cpp (+5/-0) src/mcs/networkmanagerfactory.h (+1/-0) src/mcs/streaming/rtpsender.cpp (+16/-7) src/mcs/streaming/rtpsender.h (+2/-0) src/mcs/streaming/transportsender.cpp (+30/-0) src/mcs/streaming/transportsender.h (+11/-0) src/mcs/types.cpp (+3/-1) src/mcs/types.h (+2/-1) src/mcs/utils.cpp (+11/-0) src/mcs/utils.h (+2/-0) src/mcs/video/bufferqueue.cpp (+8/-2) src/w11tng/networkmanager.cpp (+32/-1) src/w11tng/networkmanager.h (+7/-1) src/w11tng/rfkillmanager.cpp (+155/-0) src/w11tng/rfkillmanager.h (+82/-0) tests/mcs/android/h264encoder_tests.cpp (+0/-6) tests/mcs/forwardingmiracastcontroller_tests.cpp (+7/-0) tests/mcs/mir/mockmir.cpp (+42/-4) tests/mcs/mir/mockmir.h (+13/-1) tests/mcs/mir/screencast_tests.cpp (+6/-0) tests/mcs/miracastcontrollerskeleton_tests.cpp (+7/-0) |
| To merge this branch: | bzr merge lp://staging/~morphis/aethercast/adapt-for-mir0.22 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-04-28.
Commit message
Adapt for new screencast API in Mir 0.22
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
