Commit edbf64a7 authored by sletz's avatar sletz
Browse files

Simplify transport in NetJack2: master only can control transport.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3645 0c269be4-1314-0410-8aa9-9f06e86f4224
parent f798af61
......@@ -24,6 +24,10 @@ Paul Davis
---------------------------
Jackdmp changes log
---------------------------
2009-09-18 Stephane Letz <letz@grame.fr>
* Simplify transport in NetJack2: master only can control transport.
2009-09-15 Stephane Letz <letz@grame.fr>
......
......@@ -419,7 +419,7 @@ namespace Jack
break;
case JackTransportRolling :
fEngineControl->fTransport.SetCommand ( TransportCommandStart );
//fEngineControl->fTransport.SetCommand ( TransportCommandStart );
fEngineControl->fTransport.SetState ( JackTransportRolling );
jack_info ( "Master is rolling." );
break;
......@@ -429,6 +429,7 @@ namespace Jack
void JackNetDriver::EncodeTransportData()
{
/* Desactiva
//is there a timebase master change ?
int refnum;
bool conditional;
......@@ -451,12 +452,14 @@ namespace Jack
}
else
fReturnTransportData.fTimebaseMaster = NO_CHANGE;
*/
//update transport state and position
fReturnTransportData.fState = fEngineControl->fTransport.Query ( &fReturnTransportData.fPosition );
//is it a new state (that the master need to know...) ?
fReturnTransportData.fNewState = ( ( fReturnTransportData.fState != fLastTransportState ) &&
fReturnTransportData.fNewState = (( fReturnTransportData.fState == JackTransportNetStarting) &&
( fReturnTransportData.fState != fLastTransportState ) &&
( fReturnTransportData.fState != fSendTransportData.fState ) );
if ( fReturnTransportData.fNewState )
jack_info ( "Sending '%s'.", GetTransportState ( fReturnTransportData.fState ) );
......
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