← Back to branch summary

~mhr3/unity-mir/authenticate-via-apparmor

« back to all changes in this revision

Viewing changes to src/unity-mir/displayconfigurationpolicy.cpp

configure_output has been dropped in mir devel, update to the new API. Depends on drop dbusscreen. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/unity-mir/displayconfigurationpolicy.cpp
37
37
 
38
38
    base_policy->apply_to(conf);
39
39
    conf.for_each_output(
40
 
        [&](mg::DisplayConfigurationOutput const& conf_output)
 
40
        [&](mg::UserDisplayConfigurationOutput& conf_output)
41
41
        {
42
42
            if (!conf_output.connected || !conf_output.used) return;
43
43
 
52
52
            // keep the default settings if nothing was found
53
53
            if (format == conf_output.pixel_formats.end())
54
54
                return;
55
 
 
56
 
            conf.configure_output(conf_output.id, true, conf_output.top_left,
57
 
                                  conf_output.current_mode_index,
58
 
                                  *format,
59
 
                                  conf_output.power_mode,
60
 
                                  conf_output.orientation
61
 
                                 );
 
55
            
 
56
            conf_output.current_format = *format;
62
57
        });
63
58
}