Browse Source

Correct deprecated jack_set_sample_rate_callback to return 0 instead of -1.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1492 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.64
sletz 18 years ago
parent
commit
49923115a9
3 changed files with 11 additions and 6 deletions
  1. +4
    -0
      ChangeLog
  2. +4
    -4
      common/JackAPI.cpp
  3. +3
    -2
      common/JackEngine.cpp

+ 4
- 0
ChangeLog View File

@@ -2,6 +2,10 @@
Jackdmp changes log
---------------------------

2007-06-10 Stephane Letz <letz@grame.fr>

* Correct deprecated jack_set_sample_rate_callback to return 0 instead of -1.

2007-06-09 Stephane Letz <letz@grame.fr>

* Checking in the server to avoid calling the clients if no callback are registered.


+ 4
- 4
common/JackAPI.cpp View File

@@ -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));
}


+ 3
- 2
common/JackEngine.cpp View File

@@ -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);
}
}
}


Loading…
Cancel
Save