From d3df789445804085fcf456ba62a5048c516fb249 Mon Sep 17 00:00:00 2001 From: sletz Date: Tue, 11 Mar 2008 11:42:46 +0000 Subject: [PATCH] Fix engine real-time notification (was broken since ??). git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1939 0c269be4-1314-0410-8aa9-9f06e86f4224 --- ChangeLog | 4 ++++ common/JackChannel.h | 2 +- common/JackEngine.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b693efa..c90799a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,10 @@ Nedko Arnaudov Jackdmp changes log --------------------------- +2008-03-11 Stephane Letz + + * Fix engine real-time notification (was broken since ??). + 2008-03-10 Stephane Letz * Nedko Arnaudov log patch. diff --git a/common/JackChannel.h b/common/JackChannel.h index 6c5f9950..83d44e7f 100644 --- a/common/JackChannel.h +++ b/common/JackChannel.h @@ -201,7 +201,7 @@ class JackServerNotifyChannelInterface virtual void Close() {} - virtual void ClientNotify(int refnum, int notify, int value1, int value2) + virtual void ClientNotify(int refnum, int notify, int value) {} }; diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp index e1d00ce5..ccbd73f3 100644 --- a/common/JackEngine.cpp +++ b/common/JackEngine.cpp @@ -134,7 +134,7 @@ void JackEngine::ProcessNext(jack_time_t callback_usecs) { fLastSwitchUsecs = callback_usecs; if (fGraphManager->RunNextGraph()) // True if the graph actually switched to a new state - fChannel->ClientNotify(ALL_CLIENTS, kGraphOrderCallback, 0, 0); + fChannel->ClientNotify(ALL_CLIENTS, kGraphOrderCallback, 0); fSignal->SignalAll(); // Signal for threads waiting for next cycle } @@ -191,12 +191,12 @@ void JackEngine::CheckXRun(jack_time_t callback_usecs) // REVOIR les conditions if (status != NotTriggered && status != Finished) { jack_error("JackEngine::XRun: client = %s was not run: state = %ld", client->GetClientControl()->fName, status); - fChannel->ClientNotify(ALL_CLIENTS, kXRunCallback, 0, 0); // Notify all clients + fChannel->ClientNotify(ALL_CLIENTS, kXRunCallback, 0); // Notify all clients } if (status == Finished && (long)(finished_date - callback_usecs) > 0) { jack_error("JackEngine::XRun: client %s finished after current callback", client->GetClientControl()->fName); - fChannel->ClientNotify(ALL_CLIENTS, kXRunCallback, 0, 0); // Notify all clients + fChannel->ClientNotify(ALL_CLIENTS, kXRunCallback, 0); // Notify all clients } } } @@ -272,7 +272,7 @@ void JackEngine::NotifyXRun(jack_time_t callback_usecs) { // Use the audio thread => request thread communication channel fEngineControl->ResetFrameTime(callback_usecs); - fChannel->ClientNotify(ALL_CLIENTS, kXRunCallback, 0, 0); + fChannel->ClientNotify(ALL_CLIENTS, kXRunCallback, 0); } void JackEngine::NotifyXRun(int refnum)