Unity System Compositor

Merge lp:~cemil-azizoglu/unity-system-compositor/address-deprecations into lp:unity-system-compositor

  1. address-deprecations
  2. Merge into trunk
Proposed by Cemil Azizoglu
Status: Merged
Approved by: Cemil Azizoglu
Approved revision: 306
Merged at revision: 305
Proposed branch: lp:~cemil-azizoglu/unity-system-compositor/address-deprecations
Merge into: lp:unity-system-compositor
Diff against target: 119 lines (+35/-28)
3 files modified
spinner/eglapp.cpp (+33/-28)
tests/unit-tests/test_mir_input_configuration.cpp (+1/-0)
tests/unit-tests/test_session_switcher.cpp (+1/-0)
To merge this branch: bzr merge lp:~cemil-azizoglu/unity-system-compositor/address-deprecations
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+315170@code.launchpad.net

Commit message

Address deprecations in mir.

Description of the change

Address deprecations in mir.

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:305
https://mir-jenkins.ubuntu.com/job/usc-ci/46/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/66/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3721
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3711
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3711
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3711
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/70/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/70/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/70/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/70/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/70/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/46/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM, small nits in diff comments

review: Approve
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

> FAILED: Continuous integration, rev:305
> https://mir-jenkins.ubuntu.com/job/usc-ci/46/
> Executed test runs:
> FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/66/console
> SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3721
> SUCCESS: https://mir-
> jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3711
> SUCCESS: https://mir-
> jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3711
> SUCCESS: https://mir-
> jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3711
> FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-
> usc/arch=amd64,release=xenial+overlay/70/console
> FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-
> usc/arch=amd64,release=zesty/70/console
> FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-
> usc/arch=armhf,release=vivid+overlay/70/console
> FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-
> usc/arch=i386,release=xenial+overlay/70/console
> FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-
> usc/arch=i386,release=zesty/70/console
>
> Click here to trigger a rebuild:
> https://mir-jenkins.ubuntu.com/job/usc-ci/46/rebuild

Looks like the mir changes have not hit the staging yet (r3959 vs needed r3963)

20:11:33 Get:45 http://ppa.launchpad.net/mir-team/staging/ubuntu xenial/main amd64 libmirserver43 amd64 0.26.0+r3959~daily1~ubuntu16.04.1 [442 kB]

lp:~cemil-azizoglu/unity-system-compositor/address-deprecations updated
306. By Cemil Azizoglu

Remove consts

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:306
https://mir-jenkins.ubuntu.com/job/usc-ci/47/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/67/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3723
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3713
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3713
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3713
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/71/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/71/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/71/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/71/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/71/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/47/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Now the build should be fine.

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:306
https://mir-jenkins.ubuntu.com/job/usc-ci/48/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/68
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3729
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3719
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3719
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3719
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/72
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/72/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/72
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/72/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/72
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/72/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/72
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/72/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/72
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/72/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/usc-ci/48/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'spinner/eglapp.cpp'
2--- spinner/eglapp.cpp 2017-01-17 21:10:21 +0000
3+++ spinner/eglapp.cpp 2017-01-19 21:21:23 +0000
4@@ -32,24 +32,26 @@
5 MirConnection* const connection, ActiveOutputHandler const& handler)
6 {
7 /* eglapps are interested in the screen size, so
8- use mir_connection_create_display_config */
9- MirDisplayConfiguration* display_config =
10- mir_connection_create_display_config(connection);
11-
12- for (MirDisplayOutput* output = display_config->outputs;
13- output != display_config->outputs + display_config->num_outputs;
14- ++output)
15+ use mir_connection_create_display_configuration */
16+ MirDisplayConfig* display_config =
17+ mir_connection_create_display_configuration(connection);
18+
19+ auto num_outputs = mir_display_config_get_num_outputs(display_config);
20+
21+ for (auto i = 0; i < num_outputs; ++i)
22 {
23- if (output->used &&
24- output->connected &&
25- output->num_modes &&
26- output->current_mode < output->num_modes)
27+ auto output = mir_display_config_get_output(display_config, i);
28+ auto num_modes = mir_output_get_num_modes(output);
29+ if (mir_output_is_enabled(output) &&
30+ mir_output_get_connection_state(output) == mir_output_connection_state_connected &&
31+ num_modes &&
32+ mir_output_get_current_mode(output))
33 {
34 handler(output);
35 }
36 }
37
38- mir_display_config_destroy(display_config);
39+ mir_display_config_release(display_config);
40 }
41
42 MirPixelFormat select_pixel_format(MirConnection* connection)
43@@ -219,13 +221,13 @@
44 // If an output has been specified just do that
45 if (surfaceparm.output_id != mir_display_output_id_invalid)
46 {
47- for_each_active_output(connection, [&](MirDisplayOutput const* output)
48+ for_each_active_output(connection, [&](MirOutput const* output)
49 {
50- if (output->output_id == surfaceparm.output_id)
51+ if ((size_t)mir_output_get_id(output) == surfaceparm.output_id)
52 {
53- auto const& mode = output->modes[output->current_mode];
54- surfaceparm.width = mode.horizontal_resolution;
55- surfaceparm.height = mode.vertical_resolution;
56+ auto mode = mir_output_get_current_mode(output);
57+ surfaceparm.width = mir_output_mode_get_width(mode);
58+ surfaceparm.height = mir_output_mode_get_height(mode);
59 }
60 });
61 result.push_back(std::make_shared<MirEglSurface>(mir_egl_app, surfaceparm, swapinterval));
62@@ -233,19 +235,22 @@
63 }
64
65 // but normally, we're fullscreen on every active output
66- for_each_active_output(connection, [&](MirDisplayOutput const* output)
67+ for_each_active_output(connection, [&](MirOutput const* output)
68 {
69- auto const& mode = output->modes[output->current_mode];
70-
71- printf("Active output [%u] at (%d, %d) is %dx%d\n",
72- output->output_id,
73- output->position_x, output->position_y,
74- mode.horizontal_resolution, mode.vertical_resolution);
75-
76- surfaceparm.width = mode.horizontal_resolution;
77- surfaceparm.height = mode.vertical_resolution;
78- surfaceparm.output_id = output->output_id;
79+ auto mode = mir_output_get_current_mode(output);
80+
81+ surfaceparm.width = mir_output_mode_get_width(mode);
82+ surfaceparm.height = mir_output_mode_get_height(mode);
83+ surfaceparm.output_id = mir_output_get_id(output);
84+
85 result.push_back(std::make_shared<MirEglSurface>(mir_egl_app, surfaceparm, swapinterval));
86+
87+ printf("Active output [%d] at (%d, %d) is %dx%d\n",
88+ surfaceparm.output_id,
89+ mir_output_get_position_x(output),
90+ mir_output_get_position_y(output),
91+ surfaceparm.width,
92+ surfaceparm.height);
93 });
94
95 if (result.empty())
96
97=== modified file 'tests/unit-tests/test_mir_input_configuration.cpp'
98--- tests/unit-tests/test_mir_input_configuration.cpp 2017-01-17 21:10:21 +0000
99+++ tests/unit-tests/test_mir_input_configuration.cpp 2017-01-19 21:21:23 +0000
100@@ -62,6 +62,7 @@
101 MOCK_METHOD1(add_observer,void(std::shared_ptr<mi::InputDeviceObserver> const&));
102 MOCK_METHOD1(remove_observer,void(std::weak_ptr<mi::InputDeviceObserver> const&));
103 MOCK_METHOD1(for_each_input_device, void(std::function<void(mi::Device const&)> const&));
104+ MOCK_METHOD1(for_each_mutable_input_device, void(std::function<void(mi::Device&)> const&));
105 };
106
107 struct MirInputConfiguration : ::testing::Test
108
109=== modified file 'tests/unit-tests/test_session_switcher.cpp'
110--- tests/unit-tests/test_session_switcher.cpp 2016-11-09 18:13:05 +0000
111+++ tests/unit-tests/test_session_switcher.cpp 2017-01-19 21:21:23 +0000
112@@ -117,6 +117,7 @@
113 }
114 std::string name() const override { return name_; }
115 void send_display_config(mir::graphics::DisplayConfiguration const&) override {}
116+ void send_input_config(MirInputConfig const&) override {}
117
118 private:
119 std::string const name_;

Subscribers

People subscribed via source and target branches