~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to src/client/mir_screencast_api.cpp

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
48
48
            mir_connection_create_display_config(connection),
49
49
            &mir_display_config_destroy);
50
50
 
51
 
        auto const client_platform = connection->get_client_platform();
52
 
 
53
51
        mir::geometry::Rectangle const region{
54
52
            {parameters->region.left, parameters->region.top},
55
53
            {parameters->region.width, parameters->region.height}
62
60
                size,
63
61
                parameters->pixel_format,
64
62
                connection->display_server(),
65
 
                client_platform,
66
 
                client_platform->create_buffer_factory(),
 
63
                connection->get_client_buffer_stream_factory(),
67
64
                null_callback, nullptr}};
68
65
 
69
66
        screencast_uptr->creation_wait_handle()->wait_for_all();