~thomir-deactivatedaccount/mir/enable-tests

Viewing changes to src/platform/graphics/default_display_configuration_policy.cpp

Committer: Tarmac
Author(s): Łukasz 'sil2100' Zemczak
Date: 2013-09-11 18:55:00 UTC
mfrom: (1061.1.1 mir)
Revision ID: tarmac-20130911185500-gzkp5frrwmmnh4yc

Revert revision 1054 ABI-change (the libmirclient3 one), which seems to cause a lot of problems.

Approved by kevin gunn, PS Jenkins bot, Kevin DuBois.

files added:
include/test/mir_test_doubles/null_display_config.h

files renamed:
debian/libmirclient3.install => debian/libmirclient2.install

files modified:
debian/control

doc/debug_for_xmir.md

examples/demo_client_display_config.c

examples/server_configuration.cpp

include/platform/mir/graphics/display_configuration.h

include/shared/mir_toolkit/client_types.h

include/shared/mir_toolkit/common.h

include/test/mir_test_doubles/null_display_configuration.h

include/test/mir_test_doubles/stub_display_configuration.h

src/client/CMakeLists.txt

src/client/mir_connection.cpp

src/platform/graphics/default_display_configuration_policy.cpp

src/server/frontend/protobuf_buffer_packer.cpp

src/server/frontend/session_mediator.cpp

src/server/graphics/android/android_display.cpp

src/server/graphics/gbm/gbm_display.cpp

src/server/graphics/gbm/kms_output.h

src/server/graphics/gbm/real_kms_display_configuration.cpp

src/server/graphics/gbm/real_kms_display_configuration.h

src/server/graphics/gbm/real_kms_output.cpp

src/server/graphics/gbm/real_kms_output.h

src/server/graphics/nested/nested_display_configuration.cpp

src/server/graphics/nested/nested_display_configuration.h

src/shared/protobuf/mir_protobuf.proto

tests/mir_test/display_config_matchers.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/android/test_android_fb.cpp

tests/unit-tests/graphics/gbm/test_gbm_cursor.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp

tests/unit-tests/graphics/gbm/test_overlapping_output_grouping.cpp

tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display_configuration.cpp

Show diffs side-by-side

added added

removed removed

src/platform/graphics/default_display_configuration_policy.cpp

void mg::DefaultDisplayConfigurationPolicy::apply_to(DisplayConfiguration& conf)

{

static MirPowerMode const default_power_state = mir_power_mode_on;

conf.for_each_output(

[&conf](DisplayConfigurationOutput const& conf_output)

{

preferred_mode_index = 0;

conf.configure_output(conf_output.id, true, geom::Point(),

preferred_mode_index, default_power_state);

preferred_mode_index);

}

else

{

conf.configure_output(conf_output.id, false, conf_output.top_left,

conf_output.current_mode_index, default_power_state);

conf_output.current_mode_index);

}

});

}

Older »