Commit f798af61 authored by sletz's avatar sletz
Browse files

Fix issues in JackNetDriver::DecodeTransportData and JackNetDriver::Initialize.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3644 0c269be4-1314-0410-8aa9-9f06e86f4224
parent d4f271aa
......@@ -27,7 +27,8 @@ Paul Davis
2009-09-15 Stephane Letz <letz@grame.fr>
* Correct CPU timing in JackNetDriver, now take cycle begin time after Read.
* Correct CPU timing in JackNetDriver, now take cycle begin time after Read.
* Fix issues in JackNetDriver::DecodeTransportData and JackNetDriver::Initialize.
2009-08-28 Stephane Letz <letz@grame.fr>
......
......@@ -53,7 +53,7 @@ namespace Jack
fMidiPlaybackPortList = NULL;
#ifdef JACK_MONITOR
fNetTimeMon = NULL;
fRcvSyncUst = 0;
fRcvSyncUst = 0;
#endif
}
......@@ -209,7 +209,7 @@ namespace Jack
JackDriver::NotifySampleRate ( fParams.fSampleRate );
//transport engine parametering
fEngineControl->fTransport.SetNetworkSync ( true );
fEngineControl->fTransport.SetNetworkSync ( fParams.fTransportSync );
return true;
}
......@@ -419,6 +419,7 @@ namespace Jack
break;
case JackTransportRolling :
fEngineControl->fTransport.SetCommand ( TransportCommandStart );
fEngineControl->fTransport.SetState ( JackTransportRolling );
jack_info ( "Master is rolling." );
break;
......@@ -498,7 +499,7 @@ namespace Jack
if ( DataRecv() == SOCKET_ERROR )
return SOCKET_ERROR;
//take the time at the beginning of the cycle
//take the time at the beginning of the cycle
JackDriver::CycleTakeBeginTime();
#ifdef JACK_MONITOR
......
......@@ -305,6 +305,7 @@ namespace Jack
else
jack_info ( "'%s' isn't the timebase master anymore.", fParams.fName );
break;
case TIMEBASEMASTER :
timebase = jack_set_timebase_callback ( fJackClient, 0, SetTimebaseCallback, this );
if ( timebase < 0 )
......@@ -312,6 +313,7 @@ namespace Jack
else
jack_info ( "'%s' is the new timebase master.", fParams.fName );
break;
case CONDITIONAL_TIMEBASEMASTER :
timebase = jack_set_timebase_callback ( fJackClient, 1, SetTimebaseCallback, this );
if ( timebase != EBUSY )
......@@ -334,15 +336,18 @@ namespace Jack
jack_transport_stop ( fJackClient );
jack_info ( "'%s' stops transport.", fParams.fName );
break;
case JackTransportStarting :
if ( jack_transport_reposition ( fJackClient, &fReturnTransportData.fPosition ) == EINVAL )
jack_error ( "Can't set new position." );
jack_transport_start ( fJackClient );
jack_info ( "'%s' starts transport frame = %d", fParams.fName, fReturnTransportData.fPosition.frame);
break;
case JackTransportNetStarting :
jack_info ( "'%s' is ready to roll..", fParams.fName );
break;
case JackTransportRolling :
jack_info ( "'%s' is rolling.", fParams.fName );
break;
......
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