From edbf64a7b4e3638d596e20f717e2686859a5957b Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Fri, 18 Sep 2009 13:11:56 +0000
Subject: [PATCH] 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
---
 ChangeLog                |  4 ++++
 common/JackNetDriver.cpp | 11 +++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61e1fe13..ea3578c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp
index 4b98f85f..6ce8e22f 100644
--- a/common/JackNetDriver.cpp
+++ b/common/JackNetDriver.cpp
@@ -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 ) );