← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to src/client/client_buffer_depository.h

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/client_buffer_depository.h
64
64
                         geometry::Size, MirPixelFormat);
65
65
    std::shared_ptr<ClientBuffer> current_buffer();
66
66
    uint32_t current_buffer_id() const;
67
 
 
 
67
    void set_max_buffers(unsigned int max_buffers);
68
68
private:
69
69
    std::shared_ptr<ClientBufferFactory> const factory;
70
70
    std::list<std::pair<int, std::shared_ptr<ClientBuffer>>> buffers;
71
 
    unsigned int const max_buffers;
 
71
    unsigned int max_buffers;
72
72
};
73
73
}
74
74
}