← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/test/mir_test_doubles/stub_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:
include/test/mir_test_doubles/stub_display_configuration.h
21
21
 
22
22
#include "mir/graphics/display_configuration.h"
23
23
#include "mir/geometry/rectangle.h"
24
 
#include "mir/geometry/pixel_format.h"
 
24
#include "mir_toolkit/common.h"
25
25
 
26
26
#include <vector>
27
27
 
43
43
    StubDisplayConfig(unsigned int num_displays)
44
44
        : StubDisplayConfig(num_displays,
45
45
                            {
46
 
                                geometry::PixelFormat::bgr_888,
47
 
                                geometry::PixelFormat::abgr_8888,
48
 
                                geometry::PixelFormat::xbgr_8888
 
46
                                mir_pixel_format_bgr_888,
 
47
                                mir_pixel_format_abgr_8888,
 
48
                                mir_pixel_format_xbgr_8888
49
49
                            })
50
50
    {
51
51
    }
52
52
 
53
53
    StubDisplayConfig(unsigned int num_displays,
54
 
                      std::vector<geometry::PixelFormat> const& pfs)
 
54
                      std::vector<MirPixelFormat> const& pfs)
55
55
    {
56
56
        /* construct a non-trivial dummy display config to send */
57
57
        int mode_index = 0;
67
67
                modes.push_back(mode);
68
68
            }
69
69
 
70
 
            size_t mode_index = modes.size() - 1; 
 
70
            size_t mode_index = modes.size() - 1;
71
71
            geometry::Size physical_size{};
72
72
            geometry::Point top_left{};
73
73
            graphics::DisplayConfigurationOutput output{
105
105
                graphics::DisplayConfigurationOutputId{id},
106
106
                graphics::DisplayConfigurationCardId{0},
107
107
                graphics::DisplayConfigurationOutputType::vga,
108
 
                std::vector<geometry::PixelFormat>{geometry::PixelFormat::abgr_8888},
 
108
                std::vector<MirPixelFormat>{mir_pixel_format_abgr_8888},
109
109
                {{rect.size, 60.0}},
110
110
                0, geometry::Size{}, true, true, rect.top_left, 0, 0, mir_power_mode_on
111
111
            };