← Back to branch summary

~hikiko/mir/mir.unity8-desktop-session

« back to all changes in this revision

Viewing changes to src/server/display_server.cpp

  • Committer: Stephen M. Webb
  • Date: 2014-02-25 20:15:07 UTC
  • mfrom: (61.1.1 trusty-proposed)
  • Revision ID: stephen.webb@canonical.com-20140225201507-cicfzmdznvr059b2
merged from Ubuntu

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/display_server.cpp
27
27
#include "mir/compositor/compositor.h"
28
28
#include "mir/frontend/connector.h"
29
29
#include "mir/graphics/display.h"
 
30
#include "mir/graphics/display_configuration.h"
30
31
#include "mir/input/input_manager.h"
31
32
 
32
33
#include <stdexcept>
134
135
 
135
136
            if (configure_display_on_resume)
136
137
            {
137
 
                auto conf = display->configuration();
 
138
                std::shared_ptr<graphics::DisplayConfiguration> conf =
 
139
                    display->configuration();
138
140
                display_changer->configure_for_hardware_change(
139
141
                    conf, DisplayChanger::RetainSystemState);
140
142
                configure_display_on_resume = false;
162
164
    {
163
165
        if (!paused)
164
166
        {
165
 
            auto conf = display->configuration();
 
167
            std::shared_ptr<graphics::DisplayConfiguration> conf =
 
168
                display->configuration();
166
169
            display_changer->configure_for_hardware_change(
167
170
                conf, DisplayChanger::PauseResumeSystem);
168
171
        }