diff --git a/ChangeLog b/ChangeLog index 5224de7e..0db9dcdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ Jackdmp changes log --------------------------- +2007-06-10 Stephane Letz + + * Correct deprecated jack_set_sample_rate_callback to return 0 instead of -1. + 2007-06-09 Stephane Letz * Checking in the server to avoid calling the clients if no callback are registered. diff --git a/common/JackAPI.cpp b/common/JackAPI.cpp index 44a007b6..2a37c158 100644 --- a/common/JackAPI.cpp +++ b/common/JackAPI.cpp @@ -656,8 +656,8 @@ EXPORT int jack_set_sample_rate_callback(jack_client_t* ext_client, JackSampleRa jack_error("jack_set_sample_rate_callback called with a NULL client"); return -1; } else { - JackLog("jack_set_sample_rate_callback: deprecated\n"); - return -1; + jack_error("jack_set_sample_rate_callback: deprecated"); + return 0; } } @@ -1345,14 +1345,14 @@ EXPORT void jack_transport_stop(jack_client_t* ext_client) EXPORT void jack_get_transport_info(jack_client_t* ext_client, jack_transport_info_t* tinfo) { - JackLog("jack_get_transport_info : deprecated"); + jack_error("jack_get_transport_info: deprecated"); if (tinfo) memset(tinfo, 0, sizeof(jack_transport_info_t)); } EXPORT void jack_set_transport_info(jack_client_t* ext_client, jack_transport_info_t* tinfo) { - JackLog("jack_set_transport_info : deprecated"); + jack_error("jack_set_transport_info: deprecated"); if (tinfo) memset(tinfo, 0, sizeof(jack_transport_info_t)); } diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp index 87f6bea0..68e50bc6 100644 --- a/common/JackEngine.cpp +++ b/common/JackEngine.cpp @@ -260,8 +260,9 @@ void JackEngine::NotifyClients(int event, int sync, int value) { for (int i = 0; i < CLIENT_NUM; i++) { JackClientInterface* client = fClientTable[i]; - if (client && client->GetClientControl()->fCallback[event] && (client->ClientNotify(i, client->GetClientControl()->fName, event, sync, value) < 0)) { - jack_error("NotifyClient fails name = %s event = %ld = val = %ld", client->GetClientControl()->fName, event, value); + if (client && client->GetClientControl()->fCallback[event]) { + if (client->ClientNotify(i, client->GetClientControl()->fName, event, sync, value) < 0) + jack_error("NotifyClient fails name = %s event = %ld = val = %ld", client->GetClientControl()->fName, event, value); } } }