← Back to branch summary

~ci-train-bot/mir/mir-ubuntu-yakkety-2783

« back to all changes in this revision

Viewing changes to src/client/mir_connection.h

Publish new apis

- Renamed mir_surface_spec_add_render_surface() to mir_window_spec_add_render_surface()
- Deleted forgotten mir_surface_spec_set_cursor_name from symbols.map
- Renamed mir_surface_spec_set_cursor_render_surface() to mir_window_spec_set_cursor_render_surface()
- Fixed build failure I noticed in gbm_buffer.h (and included extension headers in c99 test)
- Fixed licensing on headers (GPL->LGPL)
- Included new APIs in mir_client_library.h
- Deprecated the RS API/types
- Left RS API in the original symbols.map stanza.
- Created a new stanza for the rest.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/mir_connection.h
31
31
#include "mir/frontend/surface_id.h"
32
32
#include "mir/client_context.h"
33
33
#include "mir_toolkit/mir_client_library.h"
34
 
#include "mir_toolkit/client_types_nbs.h"
35
34
#include "mir_surface.h"
36
35
#include "display_configuration.h"
37
36
#include "error_handler.h"
151
150
    std::shared_ptr<MirBufferStream> make_consumer_stream(
152
151
       mir::protobuf::BufferStream const& protobuf_bs);
153
152
 
 
153
#pragma GCC diagnostic push
 
154
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
154
155
    MirWaitHandle* create_client_buffer_stream(
155
156
        int width, int height,
156
157
        MirPixelFormat format,
224
225
        mir::geometry::Size logical_size,
225
226
        MirRenderSurfaceCallback callback,
226
227
        void* context) -> MirRenderSurface*;
 
228
#pragma GCC diagnostic pop
227
229
    void release_render_surface_with_content(
228
230
        void* render_surface);
229
231
 
250
252
 
251
253
    struct StreamCreationRequest
252
254
    {
 
255
#pragma GCC diagnostic push
 
256
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
253
257
        StreamCreationRequest(
254
258
            MirRenderSurface* rs,
255
259
            MirBufferStreamCallback mbs_cb,
264
268
        {
265
269
        }
266
270
        MirRenderSurface* rs;
 
271
#pragma GCC diagnostic pop
267
272
        MirBufferStreamCallback mbs_callback;
268
273
        void* context;
269
274
        mir::protobuf::BufferStreamParameters const parameters;
276
281
 
277
282
    struct RenderSurfaceCreationRequest
278
283
    {
 
284
#pragma GCC diagnostic push
 
285
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
279
286
        RenderSurfaceCreationRequest(
280
287
            MirRenderSurfaceCallback cb,
281
288
            void* context,
290
297
        }
291
298
 
292
299
        MirRenderSurfaceCallback callback;
 
300
#pragma GCC diagnostic pop
293
301
        void* context;
294
302
        std::shared_ptr<mir::protobuf::BufferStream> response;
295
303
        std::shared_ptr<MirWaitHandle> const wh;