← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mir/vivid

« back to all changes in this revision

Viewing changes to examples/server_configuration.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-02-04 14:49:07 UTC
  • mto: This revision was merged to the branch mainline in revision 61.
  • Revision ID: package-import@ubuntu.com-20140204144907-o3ruhix0ey26lchl
Tags: upstream-0.1.4+14.04.20140204
Import upstream version 0.1.4+14.04.20140204

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/server_configuration.cpp
60
60
                if (conf_output.connected && conf_output.modes.size() > 0 &&
61
61
                    available_outputs_for_card[conf_output.card_id] > 0)
62
62
                {
63
 
                    conf.configure_output(conf_output.id, true, geom::Point{max_x, 0},
64
 
                                          preferred_mode_index, mir_power_mode_on);
 
63
                    conf.configure_output(conf_output.id, true,
 
64
                                          geom::Point{max_x, 0},
 
65
                                          preferred_mode_index,
 
66
                                          conf_output.current_format,
 
67
                                          mir_power_mode_on,
 
68
                                          mir_orientation_normal);
65
69
                    max_x += conf_output.modes[preferred_mode_index].size.width.as_int();
66
70
                    --available_outputs_for_card[conf_output.card_id];
67
71
                }
68
72
                else
69
73
                {
70
 
                    conf.configure_output(conf_output.id, false, conf_output.top_left,
71
 
                                          conf_output.current_mode_index, mir_power_mode_on);
 
74
                    conf.configure_output(conf_output.id, false,
 
75
                                          conf_output.top_left,
 
76
                                          conf_output.current_mode_index,
 
77
                                          conf_output.current_format,
 
78
                                          mir_power_mode_on,
 
79
                                          mir_orientation_normal);
72
80
                }
73
81
            });
74
82
    }
87
95
            {
88
96
                if (!done && conf_output.connected && conf_output.modes.size() > 0)
89
97
                {
90
 
                    conf.configure_output(conf_output.id, true, geom::Point{0, 0},
91
 
                                          preferred_mode_index, mir_power_mode_on);
 
98
                    conf.configure_output(conf_output.id, true,
 
99
                                          geom::Point{0, 0},
 
100
                                          preferred_mode_index,
 
101
                                          conf_output.current_format,
 
102
                                          mir_power_mode_on,
 
103
                                          mir_orientation_normal);
92
104
                    done = true;
93
105
                }
94
106
                else
95
107
                {
96
 
                    conf.configure_output(conf_output.id, false, conf_output.top_left,
97
 
                                          conf_output.current_mode_index, mir_power_mode_on);
 
108
                    conf.configure_output(conf_output.id, false,
 
109
                                          conf_output.top_left,
 
110
                                          conf_output.current_mode_index,
 
111
                                          conf_output.current_format,
 
112
                                          mir_power_mode_on,
 
113
                                          mir_orientation_normal);
98
114
                }
99
115
            });
100
116
    }
135
151
    namespace po = boost::program_options;
136
152
 
137
153
    add_options()
138
 
        (display_config_opt, po::value<std::string>(),
139
 
            "Display configuration [{clone,sidebyside,single}:default=clone]");
 
154
        (display_config_opt, po::value<std::string>()->default_value(clone_opt_val),
 
155
            "Display configuration [{clone,sidebyside,single}]");
140
156
}
141
157
 
142
158
std::shared_ptr<mg::DisplayConfigurationPolicy>
145
161
    return display_configuration_policy(
146
162
        [this]() -> std::shared_ptr<mg::DisplayConfigurationPolicy>
147
163
        {
148
 
            auto display_config = the_options()->get(display_config_opt, clone_opt_val);
 
164
            auto display_config = the_options()->get<std::string>(display_config_opt);
149
165
 
150
166
            if (display_config == sidebyside_opt_val)
151
167
                return std::make_shared<SideBySideDisplayConfigurationPolicy>();