Mir

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

  1. add-virtual-as-display-type
  2. Merge into development-branch
Proposed by Alberto Aguirre
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
Cemil Azizoglu (community) Approve
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.
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

lgtm

review: Approve
Revision history for this message
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)
Revision history for this message
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
=== modified file 'include/client/mir_toolkit/client_types.h'
--- include/client/mir_toolkit/client_types.h 2016-04-04 06:58:49 +0000
+++ include/client/mir_toolkit/client_types.h 2016-04-22 20:25:19 +0000
@@ -281,7 +281,8 @@
281 mir_display_output_type_hdmia,281 mir_display_output_type_hdmia,
282 mir_display_output_type_hdmib,282 mir_display_output_type_hdmib,
283 mir_display_output_type_tv,283 mir_display_output_type_tv,
284 mir_display_output_type_edp284 mir_display_output_type_edp,
285 mir_display_output_type_virtual
285} MirDisplayOutputType;286} MirDisplayOutputType;
286287
287typedef enum MirOutputType288typedef enum MirOutputType
@@ -300,7 +301,8 @@
300 mir_output_type_hdmia,301 mir_output_type_hdmia,
301 mir_output_type_hdmib,302 mir_output_type_hdmib,
302 mir_output_type_tv,303 mir_output_type_tv,
303 mir_output_type_edp304 mir_output_type_edp,
305 mir_output_type_virtual
304} MirOutputType;306} MirOutputType;
305307
306typedef enum MirOutputConnectionState308typedef enum MirOutputConnectionState
307309
=== modified file 'include/platform/mir/graphics/display_configuration.h'
--- include/platform/mir/graphics/display_configuration.h 2016-01-29 08:18:22 +0000
+++ include/platform/mir/graphics/display_configuration.h 2016-04-22 20:25:19 +0000
@@ -66,7 +66,8 @@
66 hdmia,66 hdmia,
67 hdmib,67 hdmib,
68 tv,68 tv,
69 edp69 edp,
70 virt,
70};71};
7172
72/**73/**
7374
=== modified file 'src/platforms/android/server/display_configuration.cpp'
--- src/platforms/android/server/display_configuration.cpp 2016-02-01 22:53:06 +0000
+++ src/platforms/android/server/display_configuration.cpp 2016-04-22 20:25:19 +0000
@@ -42,7 +42,7 @@
42 size_t const preferred_format_index{0};42 size_t const preferred_format_index{0};
43 size_t const preferred_mode_index{0};43 size_t const preferred_mode_index{0};
44 bool const connected{false};44 bool const connected{false};
45 auto const type = mg::DisplayConfigurationOutputType::lvds;45 auto const type = mg::DisplayConfigurationOutputType::virt;
46 auto const form_factor = mir_form_factor_monitor;46 auto const form_factor = mir_form_factor_monitor;
47 float const scale{1.0f};47 float const scale{1.0f};
48 std::vector<mg::DisplayConfigurationMode> external_modes;48 std::vector<mg::DisplayConfigurationMode> external_modes;
4949
=== modified file 'src/utils/out.c'
--- src/utils/out.c 2016-01-29 08:18:22 +0000
+++ src/utils/out.c 2016-04-22 20:25:19 +0000
@@ -40,6 +40,7 @@
40 "HDMI-B",40 "HDMI-B",
41 "TV",41 "TV",
42 "eDP",42 "eDP",
43 "Virtual"
43 };44 };
44 return ((unsigned)t < sizeof(name)/sizeof(name[0])) ? name[t] : name[0];45 return ((unsigned)t < sizeof(name)/sizeof(name[0])) ? name[t] : name[0];
45}46}
4647
=== modified file 'tests/integration-tests/test_server_client_types.cpp'
--- tests/integration-tests/test_server_client_types.cpp 2013-09-04 19:01:36 +0000
+++ tests/integration-tests/test_server_client_types.cpp 2016-04-22 20:25:19 +0000
@@ -43,4 +43,6 @@
43 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(hdmib);43 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(hdmib);
44 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(tv);44 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(tv);
45 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(edp);45 EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(edp);
46 EXPECT_EQ(static_cast<mg::DisplayConfigurationOutputType>(mir_display_output_type_virtual),
47 mg::DisplayConfigurationOutputType::virt);
46}48}

Subscribers

People subscribed via source and target branches