Commit 6d782329 authored by sletz's avatar sletz
Browse files

Deactivate transport in netjack2.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4361 0c269be4-1314-0410-8aa9-9f06e86f4224
parent b9ae7166
......@@ -435,8 +435,7 @@ namespace Jack
// - conditional request : don't change anything too, the master will know if this slave is actually the timebase master
int refnum;
bool conditional;
if (fSendTransportData.fTimebaseMaster == TIMEBASEMASTER)
{
if (fSendTransportData.fTimebaseMaster == TIMEBASEMASTER) {
fEngineControl->fTransport.GetTimebaseMaster(refnum, conditional);
if (refnum != -1)
fEngineControl->fTransport.ResetTimebase(refnum);
......@@ -444,8 +443,7 @@ namespace Jack
}
//is there a transport state change to handle ?
if (fSendTransportData.fNewState &&(fSendTransportData.fState != fEngineControl->fTransport.GetState()))
{
if (fSendTransportData.fNewState &&(fSendTransportData.fState != fEngineControl->fTransport.GetState())) {
switch (fSendTransportData.fState)
{
......@@ -471,30 +469,24 @@ namespace Jack
void JackNetDriver::EncodeTransportData()
{
/* Desactivated
//is there a timebase master change ?
int refnum;
bool conditional;
fEngineControl->fTransport.GetTimebaseMaster(refnum, conditional);
if (refnum != fLastTimebaseMaster)
{
if (refnum != fLastTimebaseMaster) {
//timebase master has released its function
if (refnum == -1)
{
if (refnum == -1) {
fReturnTransportData.fTimebaseMaster = RELEASE_TIMEBASEMASTER;
jack_info("Sending a timebase master release request.");
}
//there is a new timebase master
else
{
} else {
//there is a new timebase master
fReturnTransportData.fTimebaseMaster = (conditional) ? CONDITIONAL_TIMEBASEMASTER : TIMEBASEMASTER;
jack_info("Sending a %s timebase master request.", (conditional) ? "conditional" : "non-conditional");
}
fLastTimebaseMaster = refnum;
}
else
} else {
fReturnTransportData.fTimebaseMaster = NO_CHANGE;
*/
}
//update transport state and position
fReturnTransportData.fState = fEngineControl->fTransport.Query(&fReturnTransportData.fPosition);
......
This diff is collapsed.
......@@ -52,6 +52,8 @@ extern void show_work_times ();
#undef DEBUG_WAKEUP
char* strcasestr(const char* haystack, const char* needle);
/* Delay (in process calls) before jackd will report an xrun */
#define XRUN_REPORT_DELAY 0
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment