Mir

Merge lp:~albaguirre/mir/add-virtual-as-display-type into lp:mir

Proposed by Alberto Aguirre on 2016-04-22
Status: Merged
Merged at revision: 3475
Proposed branch: lp:~albaguirre/mir/add-virtual-as-display-type
Merge into: lp:mir
Diff against target: 73 lines (+10/-4)
5 files modified
include/client/mir_toolkit/client_types.h (+4/-2)
include/platform/mir/graphics/display_configuration.h (+2/-1)
src/platforms/android/server/display_configuration.cpp (+1/-1)
src/utils/out.c (+1/-0)
tests/integration-tests/test_server_client_types.cpp (+2/-0)
To merge this branch: bzr merge lp:~albaguirre/mir/add-virtual-as-display-type
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Needs Fixing on 2016-04-22
Cemil Azizoglu (community) 2016-04-22 Approve on 2016-04-22
Review via email: mp+292685@code.launchpad.net

Commit message

Add an explicit "Virtual" display type. Fixes LP: #1573782

To post a comment you must log in.
Cemil Azizoglu (cemil-azizoglu) wrote :

lgtm

review: Approve
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3474
https://mir-jenkins.ubuntu.com/job/mir-ci/893/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/928/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/967
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/958
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/958
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/938
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/938/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/938
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/938/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/938
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/938/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/938
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/938/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/938/console

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

review: Needs Fixing (continuous-integration)
Alberto Aguirre (albaguirre) wrote :

"[ FAILED ] ServerSignal.terminate_handler_is_called_for_SIGTERM
21:12:02 11: [ FAILED ] ServerSignal.terminate_handler_is_called_for_SIGINT
21:12:02 11: [ FAILED ] NestedServer.when_monitor_plugged_in_client_is_notified_of_new_display_configuration"

Seems unrelated.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/client/mir_toolkit/client_types.h'
2--- include/client/mir_toolkit/client_types.h 2016-04-04 06:58:49 +0000
3+++ include/client/mir_toolkit/client_types.h 2016-04-22 20:25:19 +0000
4@@ -281,7 +281,8 @@
5 mir_display_output_type_hdmia,
6 mir_display_output_type_hdmib,
7 mir_display_output_type_tv,
8- mir_display_output_type_edp
9+ mir_display_output_type_edp,
10+ mir_display_output_type_virtual
11 } MirDisplayOutputType;
12
13 typedef enum MirOutputType
14@@ -300,7 +301,8 @@
15 mir_output_type_hdmia,
16 mir_output_type_hdmib,
17 mir_output_type_tv,
18- mir_output_type_edp
19+ mir_output_type_edp,
20+ mir_output_type_virtual
21 } MirOutputType;
22
23 typedef enum MirOutputConnectionState
24
25=== modified file 'include/platform/mir/graphics/display_configuration.h'
26--- include/platform/mir/graphics/display_configuration.h 2016-01-29 08:18:22 +0000
27+++ include/platform/mir/graphics/display_configuration.h 2016-04-22 20:25:19 +0000
28@@ -66,7 +66,8 @@
29 hdmia,
30 hdmib,
31 tv,
32- edp
33+ edp,
34+ virt,
35 };
36
37 /**
38
39=== modified file 'src/platforms/android/server/display_configuration.cpp'
40--- src/platforms/android/server/display_configuration.cpp 2016-02-01 22:53:06 +0000
41+++ src/platforms/android/server/display_configuration.cpp 2016-04-22 20:25:19 +0000
42@@ -42,7 +42,7 @@
43 size_t const preferred_format_index{0};
44 size_t const preferred_mode_index{0};
45 bool const connected{false};
46- auto const type = mg::DisplayConfigurationOutputType::lvds;
47+ auto const type = mg::DisplayConfigurationOutputType::virt;
48 auto const form_factor = mir_form_factor_monitor;
49 float const scale{1.0f};
50 std::vector<mg::DisplayConfigurationMode> external_modes;
51
52=== modified file 'src/utils/out.c'
53--- src/utils/out.c 2016-01-29 08:18:22 +0000
54+++ src/utils/out.c 2016-04-22 20:25:19 +0000
55@@ -40,6 +40,7 @@
56 "HDMI-B",
57 "TV",
58 "eDP",
59+ "Virtual"
60 };
61 return ((unsigned)t < sizeof(name)/sizeof(name[0])) ? name[t] : name[0];
62 }
63
64=== modified file 'tests/integration-tests/test_server_client_types.cpp'
65--- tests/integration-tests/test_server_client_types.cpp 2013-09-04 19:01:36 +0000
66+++ tests/integration-tests/test_server_client_types.cpp 2016-04-22 20:25:19 +0000
67@@ -43,4 +43,6 @@
68 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(hdmib);
69 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(tv);
70 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(edp);
71+ EXPECT_EQ(static_cast<mg::DisplayConfigurationOutputType>(mir_display_output_type_virtual),
72+ mg::DisplayConfigurationOutputType::virt);
73 }

Subscribers

People subscribed via source and target branches