jack1compat.diff 1.4 KB

12345678910111213141516171819202122232425262728293031323334
  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);
  14. /**
  15. * Prototype for the client supplied function that is called
  16. diff --git a/tests/test.cpp b/tests/test.cpp
  17. index 750d152..8a8a811 100644
  18. --- a/tests/test.cpp
  19. +++ b/tests/test.cpp
  20. @@ -186,11 +186,10 @@ void Jack_Client_Registration_Callback(const char* name, int val, void *arg)
  21. client_register--;
  22. }
  23. -int Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg)
  24. +void Jack_Port_Rename_Callback(jack_port_id_t port, const char* old_name, const char* new_name, void *arg)
  25. {
  26. Log("Rename callback has been successfully called with old_name '%s' and new_name '%s'. (msg from callback)\n", old_name, new_name);
  27. port_rename_clbk = 1;
  28. - return 0;
  29. }
  30. int Jack_Update_Buffer_Size(jack_nframes_t nframes, void *arg)