1
=== modified file 'src/client/buffer_stream.cpp'
2
--- src/client/buffer_stream.cpp	2016-11-17 08:45:49 +0000
3
+++ src/client/buffer_stream.cpp	2016-11-18 15:45:19 +0000
4
@@ -53,6 +53,11 @@
5
53
53
6
54
namespace
54
namespace
7
55
{
55
{
8
56
static void ignore_response(mp::Void* response)
9
57
{
10
58
    delete response;
11
59
}
12
60
13
56
class Requests : public mcl::ServerBufferRequests
61
class Requests : public mcl::ServerBufferRequests
14
57
{
62
{
15
58
public:
63
public:
16
@@ -72,9 +77,10 @@
17
72
        buf_params->set_pixel_format(format);
77
        buf_params->set_pixel_format(format);
18
73
        buf_params->set_buffer_usage(usage);
78
        buf_params->set_buffer_usage(usage);
19
74
79
23
75
        auto protobuf_void = std::make_shared<mp::Void>();
80
        auto response = new mp::Void;
24
76
        server.allocate_buffers(&request, protobuf_void.get(),
81
25
77
            google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));
82
        server.allocate_buffers(&request, response,
26
83
            google::protobuf::NewCallback(ignore_response, response));
27
78
    }
84
    }
28
79
85
29
80
    void free_buffer(int buffer_id) override
86
    void free_buffer(int buffer_id) override
30
@@ -83,9 +89,10 @@
31
83
        request.mutable_id()->set_value(stream_id);
89
        request.mutable_id()->set_value(stream_id);
32
84
        request.add_buffers()->set_buffer_id(buffer_id);
90
        request.add_buffers()->set_buffer_id(buffer_id);
33
85
91
37
86
        auto protobuf_void = std::make_shared<mp::Void>();
92
        auto response = new mp::Void;
38
87
        server.release_buffers(&request, protobuf_void.get(),
93
39
88
            google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));
94
        server.release_buffers(&request, response,
40
95
            google::protobuf::NewCallback(ignore_response, response));
41
89
    }
96
    }
42
90
97
43
91
    void submit_buffer(mcl::MirBuffer& buffer) override
98
    void submit_buffer(mcl::MirBuffer& buffer) override
44
@@ -94,13 +101,10 @@
45
94
        request.mutable_id()->set_value(stream_id);
101
        request.mutable_id()->set_value(stream_id);
46
95
        request.mutable_buffer()->set_buffer_id(buffer.rpc_id());
102
        request.mutable_buffer()->set_buffer_id(buffer.rpc_id());
47
96
103
52
97
        auto protobuf_void = std::make_shared<mp::Void>();
104
        auto response = new mp::Void;
49
98
        server.submit_buffer(&request, protobuf_void.get(),
50
99
            google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));
51
100
    }
53
101
105
56
102
    static void ignore_response(std::shared_ptr<mp::Void>)
106
        server.submit_buffer(&request, response,
57
103
    {
107
            google::protobuf::NewCallback(ignore_response, response));
58
104
    }
108
    }
59
105
109
60
106
private:
110
private:
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-11-18
Alexandros Frantzis (community)			Needs Fixing on 2016-11-18
Andreas Pokorny (community)			Approve on 2016-11-18
Daniel van Vugt		2016-11-16	Needs Information on 2016-11-18
Review via email: mp+311082@code.launchpad.net
1	=== modified file 'src/client/buffer_stream.cpp'
2	--- src/client/buffer_stream.cpp 2016-11-17 08:45:49 +0000
3	+++ src/client/buffer_stream.cpp 2016-11-18 15:45:19 +0000
4	@@ -53,6 +53,11 @@
5	53		53
6	54	namespace	54	namespace
7	55	{	55	{
8			56	static void ignore_response(mp::Void* response)
9			57	{
10			58	delete response;
11			59	}
12			60
13	56	class Requests : public mcl::ServerBufferRequests	61	class Requests : public mcl::ServerBufferRequests
14	57	{	62	{
15	58	public:	63	public:
16	@@ -72,9 +77,10 @@
17	72	buf_params->set_pixel_format(format);	77	buf_params->set_pixel_format(format);
18	73	buf_params->set_buffer_usage(usage);	78	buf_params->set_buffer_usage(usage);
19	74		79
23	75	auto protobuf_void = std::make_shared<mp::Void>();	80	auto response = new mp::Void;
24	76	server.allocate_buffers(&request, protobuf_void.get(),	81
25	77	google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));	82	server.allocate_buffers(&request, response,
26			83	google::protobuf::NewCallback(ignore_response, response));
27	78	}	84	}
28	79		85
29	80	void free_buffer(int buffer_id) override	86	void free_buffer(int buffer_id) override
30	@@ -83,9 +89,10 @@
31	83	request.mutable_id()->set_value(stream_id);	89	request.mutable_id()->set_value(stream_id);
32	84	request.add_buffers()->set_buffer_id(buffer_id);	90	request.add_buffers()->set_buffer_id(buffer_id);
33	85		91
37	86	auto protobuf_void = std::make_shared<mp::Void>();	92	auto response = new mp::Void;
38	87	server.release_buffers(&request, protobuf_void.get(),	93
39	88	google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));	94	server.release_buffers(&request, response,
40			95	google::protobuf::NewCallback(ignore_response, response));
41	89	}	96	}
42	90		97
43	91	void submit_buffer(mcl::MirBuffer& buffer) override	98	void submit_buffer(mcl::MirBuffer& buffer) override
44	@@ -94,13 +101,10 @@
45	94	request.mutable_id()->set_value(stream_id);	101	request.mutable_id()->set_value(stream_id);
46	95	request.mutable_buffer()->set_buffer_id(buffer.rpc_id());	102	request.mutable_buffer()->set_buffer_id(buffer.rpc_id());
47	96		103
52	97	auto protobuf_void = std::make_shared<mp::Void>();	104	auto response = new mp::Void;
49	98	server.submit_buffer(&request, protobuf_void.get(),
50	99	google::protobuf::NewCallback(Requests::ignore_response, protobuf_void));
51	100	}
53	101		105
56	102	static void ignore_response(std::shared_ptr<mp::Void>)	106	server.submit_buffer(&request, response,
57	103	{	107	google::protobuf::NewCallback(ignore_response, response));
58	104	}	108	}
59	105		109
60	106	private:	110	private: