Lines 1-6
Link Here
|
1 |
--- libjack/client.c.orig 2016-09-14 17:41:53 UTC |
1 |
--- libjack/client.c.orig 2017-01-10 10:20:51 UTC |
2 |
+++ libjack/client.c |
2 |
+++ libjack/client.c |
3 |
@@ -69,6 +69,30 @@ |
3 |
@@ -68,6 +68,30 @@ |
4 |
static pthread_mutex_t client_lock; |
4 |
static pthread_mutex_t client_lock; |
5 |
static pthread_cond_t client_ready; |
5 |
static pthread_cond_t client_ready; |
6 |
|
6 |
|
Lines 31-37
Link Here
|
31 |
static int |
31 |
static int |
32 |
jack_client_close_aux(jack_client_t *client); |
32 |
jack_client_close_aux(jack_client_t *client); |
33 |
|
33 |
|
34 |
@@ -252,7 +276,7 @@ oop_client_deliver_request (void *ptr, j |
34 |
@@ -251,7 +275,7 @@ oop_client_deliver_request (void *ptr, j |
35 |
int wok, rok; |
35 |
int wok, rok; |
36 |
jack_client_t *client = (jack_client_t*)ptr; |
36 |
jack_client_t *client = (jack_client_t*)ptr; |
37 |
|
37 |
|
Lines 40-46
Link Here
|
40 |
== sizeof(*req)); |
40 |
== sizeof(*req)); |
41 |
|
41 |
|
42 |
/* if necessary, add variable length key data after a PropertyChange request |
42 |
/* if necessary, add variable length key data after a PropertyChange request |
43 |
@@ -260,7 +284,7 @@ oop_client_deliver_request (void *ptr, j |
43 |
@@ -259,7 +283,7 @@ oop_client_deliver_request (void *ptr, j |
44 |
|
44 |
|
45 |
if (req->type == PropertyChangeNotify) { |
45 |
if (req->type == PropertyChangeNotify) { |
46 |
if (req->x.property.keylen) { |
46 |
if (req->x.property.keylen) { |
Lines 49-55
Link Here
|
49 |
jack_error ("cannot send property key of length %d to server", |
49 |
jack_error ("cannot send property key of length %d to server", |
50 |
req->x.property.keylen); |
50 |
req->x.property.keylen); |
51 |
req->status = -1; |
51 |
req->status = -1; |
52 |
@@ -269,7 +293,7 @@ oop_client_deliver_request (void *ptr, j |
52 |
@@ -268,7 +292,7 @@ oop_client_deliver_request (void *ptr, j |
53 |
} |
53 |
} |
54 |
} |
54 |
} |
55 |
|
55 |
|
Lines 58-64
Link Here
|
58 |
== sizeof(*req)); |
58 |
== sizeof(*req)); |
59 |
|
59 |
|
60 |
if (wok && rok) { /* everything OK? */ |
60 |
if (wok && rok) { /* everything OK? */ |
61 |
@@ -838,14 +862,14 @@ server_event_connect (jack_client_t *cli |
61 |
@@ -837,14 +861,14 @@ server_event_connect (jack_client_t *cli |
62 |
|
62 |
|
63 |
jack_uuid_copy (&req.client_id, client->control->uuid); |
63 |
jack_uuid_copy (&req.client_id, client->control->uuid); |
64 |
|
64 |
|
Lines 76-82
Link Here
|
76 |
jack_error ("cannot read event connect result from server (%s)", |
76 |
jack_error ("cannot read event connect result from server (%s)", |
77 |
strerror (errno)); |
77 |
strerror (errno)); |
78 |
close (fd); |
78 |
close (fd); |
79 |
@@ -1110,14 +1134,14 @@ jack_request_client (ClientType type, |
79 |
@@ -1109,14 +1133,14 @@ jack_request_client (ClientType type, |
80 |
snprintf (req.object_data, sizeof(req.object_data), |
80 |
snprintf (req.object_data, sizeof(req.object_data), |
81 |
"%s", va->load_init); |
81 |
"%s", va->load_init); |
82 |
|
82 |
|
Lines 93-99
Link Here
|
93 |
|
93 |
|
94 |
if (errno == 0) { |
94 |
if (errno == 0) { |
95 |
/* server shut the socket */ |
95 |
/* server shut the socket */ |
96 |
@@ -1513,7 +1537,7 @@ jack_internal_client_close (const char * |
96 |
@@ -1512,7 +1536,7 @@ jack_internal_client_close (const char * |
97 |
return; |
97 |
return; |
98 |
} |
98 |
} |
99 |
|
99 |
|
Lines 102-108
Link Here
|
102 |
jack_error ("cannot deliver ClientUnload request to JACK " |
102 |
jack_error ("cannot deliver ClientUnload request to JACK " |
103 |
"server."); |
103 |
"server."); |
104 |
} |
104 |
} |
105 |
@@ -1649,7 +1673,7 @@ jack_session_notify (jack_client_t* clie |
105 |
@@ -1648,7 +1672,7 @@ jack_session_notify (jack_client_t* clie |
106 |
|
106 |
|
107 |
request.x.session.type = code; |
107 |
request.x.session.type = code; |
108 |
|
108 |
|
Lines 111-117
Link Here
|
111 |
!= sizeof(request)) ) { |
111 |
!= sizeof(request)) ) { |
112 |
jack_error ("cannot send request type %d to server", |
112 |
jack_error ("cannot send request type %d to server", |
113 |
request.type); |
113 |
request.type); |
114 |
@@ -1659,7 +1683,7 @@ jack_session_notify (jack_client_t* clie |
114 |
@@ -1658,7 +1682,7 @@ jack_session_notify (jack_client_t* clie |
115 |
while ( 1 ) { |
115 |
while ( 1 ) { |
116 |
jack_uuid_t uid; |
116 |
jack_uuid_t uid; |
117 |
|
117 |
|
Lines 120-126
Link Here
|
120 |
jack_error ("cannot read result for request type %d from" |
120 |
jack_error ("cannot read result for request type %d from" |
121 |
" server (%s)", request.type, strerror (errno)); |
121 |
" server (%s)", request.type, strerror (errno)); |
122 |
goto out; |
122 |
goto out; |
123 |
@@ -1681,19 +1705,19 @@ jack_session_notify (jack_client_t* clie |
123 |
@@ -1680,19 +1704,19 @@ jack_session_notify (jack_client_t* clie |
124 |
break; |
124 |
break; |
125 |
} |
125 |
} |
126 |
|
126 |
|
Lines 143-149
Link Here
|
143 |
!= sizeof(retval[num_replies - 1].flags) ) { |
143 |
!= sizeof(retval[num_replies - 1].flags) ) { |
144 |
jack_error ("cannot read result for request type %d from" |
144 |
jack_error ("cannot read result for request type %d from" |
145 |
" server (%s)", request.type, strerror (errno)); |
145 |
" server (%s)", request.type, strerror (errno)); |
146 |
@@ -1812,7 +1836,7 @@ jack_client_process_events (jack_client_ |
146 |
@@ -1811,7 +1835,7 @@ jack_client_process_events (jack_client_ |
147 |
/* server has sent us an event. process the |
147 |
/* server has sent us an event. process the |
148 |
* event and reply */ |
148 |
* event and reply */ |
149 |
|
149 |
|
Lines 152-158
Link Here
|
152 |
!= sizeof(event)) { |
152 |
!= sizeof(event)) { |
153 |
jack_error ("cannot read server event (%s)", |
153 |
jack_error ("cannot read server event (%s)", |
154 |
strerror (errno)); |
154 |
strerror (errno)); |
155 |
@@ -1822,7 +1846,7 @@ jack_client_process_events (jack_client_ |
155 |
@@ -1821,7 +1845,7 @@ jack_client_process_events (jack_client_ |
156 |
if (event.type == PropertyChange) { |
156 |
if (event.type == PropertyChange) { |
157 |
if (event.y.key_size) { |
157 |
if (event.y.key_size) { |
158 |
key = (char*)malloc (event.y.key_size); |
158 |
key = (char*)malloc (event.y.key_size); |
Lines 161-167
Link Here
|
161 |
event.y.key_size) { |
161 |
event.y.key_size) { |
162 |
jack_error ("cannot read property change key (%s)", |
162 |
jack_error ("cannot read property change key (%s)", |
163 |
strerror (errno)); |
163 |
strerror (errno)); |
164 |
@@ -1941,7 +1965,7 @@ jack_client_process_events (jack_client_ |
164 |
@@ -1940,7 +1964,7 @@ jack_client_process_events (jack_client_ |
165 |
DEBUG ("client has dealt with the event, writing " |
165 |
DEBUG ("client has dealt with the event, writing " |
166 |
"response on event fd"); |
166 |
"response on event fd"); |
167 |
|
167 |
|
Lines 170-176
Link Here
|
170 |
!= sizeof(status)) { |
170 |
!= sizeof(status)) { |
171 |
jack_error ("cannot send event response to " |
171 |
jack_error ("cannot send event response to " |
172 |
"engine (%s)", strerror (errno)); |
172 |
"engine (%s)", strerror (errno)); |
173 |
@@ -1961,7 +1985,7 @@ jack_wake_next_client (jack_client_t* cl |
173 |
@@ -1960,7 +1984,7 @@ jack_wake_next_client (jack_client_t* cl |
174 |
int pret = 0; |
174 |
int pret = 0; |
175 |
char c = 0; |
175 |
char c = 0; |
176 |
|
176 |
|
Lines 179-185
Link Here
|
179 |
!= sizeof(c)) { |
179 |
!= sizeof(c)) { |
180 |
DEBUG ("cannot write byte to fd %d", client->graph_next_fd); |
180 |
DEBUG ("cannot write byte to fd %d", client->graph_next_fd); |
181 |
jack_error ("cannot continue execution of the " |
181 |
jack_error ("cannot continue execution of the " |
182 |
@@ -1989,7 +2013,7 @@ jack_wake_next_client (jack_client_t* cl |
182 |
@@ -1988,7 +2012,7 @@ jack_wake_next_client (jack_client_t* cl |
183 |
} |
183 |
} |
184 |
|
184 |
|
185 |
if (pret > 0 && (pfds[0].revents & POLLIN)) { |
185 |
if (pret > 0 && (pfds[0].revents & POLLIN)) { |