wok-next view jack2/stuff/patches/jack1compat.diff @ rev 20402
Up seed (3.8.1) use webkitgtk instead of libwebkit; add cogl for clutter; up clutter (1.26.2) using mesa17 instead of mesa; up gnome-games using mesa17 instead of mix 'mesa & mesa17'
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Tue Dec 05 17:49:11 2017 +0200 (2017-12-05) |
parents | |
children |
line source
1 diff --git a/common/jack/types.h b/common/jack/types.h
2 index 094d407..2dccf34 100644
3 --- a/common/jack/types.h
4 +++ b/common/jack/types.h
5 @@ -403,10 +403,8 @@ typedef void (*JackPortConnectCallback)(jack_port_id_t a, jack_port_id_t b, int
6 * @param port the port that has been renamed
7 * @param new_name the new name
8 * @param arg pointer to a client supplied structure
9 - *
10 - * @return zero on success, non-zero on error
11 */
12 -typedef int (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg);
13 +typedef void (*JackPortRenameCallback)(jack_port_id_t port, const char* old_name, const char* new_name, void *arg);
15 /**
16 * Prototype for the client supplied function that is called
17 diff --git a/tests/test.cpp b/tests/test.cpp
18 index 750d152..8a8a811 100644
19 --- a/tests/test.cpp
20 +++ b/tests/test.cpp
21 @@ -186,11 +186,10 @@ void Jack_Client_Registration_Callback(const char* name, int val, void *arg)
22 client_register--;
23 }
25 -int Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg)
26 +void Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg)
27 {
28 Log("Rename callback has been successfully called with old_name '%s' and new_name '%s'. (msg from callback)\n", old_name, new_name);
29 port_rename_clbk = 1;
30 - return 0;
31 }
33 int Jack_Update_Buffer_Size(jack_nframes_t nframes, void *arg)