~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to include/platform/mir/graphics/display_configuration.h

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-01-08 02:04:38 UTC
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: package-import@ubuntu.com-20140108020438-e1npu0pm7qdv5wc4
Tags: upstream-0.1.3+14.04.20140108
ImportĀ upstreamĀ versionĀ 0.1.3+14.04.20140108

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
#include "mir/int_wrapper.h"
23
23
#include "mir/geometry/size.h"
24
24
#include "mir/geometry/point.h"
25
 
#include "mir/geometry/pixel_format.h"
26
25
#include "mir_toolkit/common.h"
27
26
 
28
27
#include <functional>
89
88
    /** The type of the output. */
90
89
    DisplayConfigurationOutputType type;
91
90
    /** The pixel formats supported by the output */
92
 
    std::vector<geometry::PixelFormat> pixel_formats;
 
91
    std::vector<MirPixelFormat> pixel_formats;
93
92
    /** The modes supported by the output. */
94
93
    std::vector<DisplayConfigurationMode> modes;
95
94
    /** The index in the 'modes' vector of the preferred output mode. */