Browse Source

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
tags/v1.9.4
sletz 15 years ago
parent
commit
edbf64a7b4
2 changed files with 11 additions and 4 deletions
  1. +4
    -0
      ChangeLog
  2. +7
    -4
      common/JackNetDriver.cpp

+ 4
- 0
ChangeLog View File

@@ -24,6 +24,10 @@ Paul Davis
--------------------------- ---------------------------
Jackdmp changes log 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> 2009-09-15 Stephane Letz <letz@grame.fr>


+ 7
- 4
common/JackNetDriver.cpp View File

@@ -419,7 +419,7 @@ namespace Jack
break; break;


case JackTransportRolling : case JackTransportRolling :
fEngineControl->fTransport.SetCommand ( TransportCommandStart );
//fEngineControl->fTransport.SetCommand ( TransportCommandStart );
fEngineControl->fTransport.SetState ( JackTransportRolling ); fEngineControl->fTransport.SetState ( JackTransportRolling );
jack_info ( "Master is rolling." ); jack_info ( "Master is rolling." );
break; break;
@@ -429,6 +429,7 @@ namespace Jack


void JackNetDriver::EncodeTransportData() void JackNetDriver::EncodeTransportData()
{ {
/* Desactiva
//is there a timebase master change ? //is there a timebase master change ?
int refnum; int refnum;
bool conditional; bool conditional;
@@ -451,12 +452,14 @@ namespace Jack
} }
else else
fReturnTransportData.fTimebaseMaster = NO_CHANGE; fReturnTransportData.fTimebaseMaster = NO_CHANGE;

*/
//update transport state and position //update transport state and position
fReturnTransportData.fState = fEngineControl->fTransport.Query ( &fReturnTransportData.fPosition ); fReturnTransportData.fState = fEngineControl->fTransport.Query ( &fReturnTransportData.fPosition );
//is it a new state (that the master need to know...) ? //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 ) ); ( fReturnTransportData.fState != fSendTransportData.fState ) );
if ( fReturnTransportData.fNewState ) if ( fReturnTransportData.fNewState )
jack_info ( "Sending '%s'.", GetTransportState ( fReturnTransportData.fState ) ); jack_info ( "Sending '%s'.", GetTransportState ( fReturnTransportData.fState ) );


Loading…
Cancel
Save