Correct JackNetMaster::SetBufferSize.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4178 0c269be4-1314-0410-8aa9-9f06e86f4224

ChangeLog

@@ -34,6 +34,10 @@ Valerio Pilo
   Jackdmp changes log
 ---------------------------
 
+2011-03-11 Stephane Letz  <letz@grame.fr>
+
+	* Correct JackNetMaster::SetBufferSize.
+
 2011-03-10 Stephane Letz  <letz@grame.fr>
 
 	* Latency callback must always be activated.

common/JackNetManager.cpp

@@ -388,10 +388,13 @@ namespace Jack
         return ( fReturnTransportData.fState == JackTransportNetStarting );
     }
 
-    int JackNetMaster::SetBufferSize (jack_nframes_t nframes, void* arg)
+    int JackNetMaster::SetBufferSize(jack_nframes_t nframes, void* arg)
     {
-        jack_error("Cannot handle bufer size change, so proxy will be removed...");
-        static_cast<JackNetMaster*> ( arg )->Exit();
+        JackNetMaster* obj = static_cast<JackNetMaster*>(arg);
+        if (nframes != obj->fParams.fPeriodSize) {
+            jack_error("Cannot handle bufer size change, so proxy will be removed...");
+            obj->Exit();
+        }
         return 0;
     }
 

common/JackNetOneDriver.cpp

@@ -243,12 +243,8 @@ namespace Jack
     {
         jack_log ( "JackNetOneDriver::Init()" );
 
-        /* SL: no more needed
-        if( global_packcache != NULL ) {
-            FreePorts();
-            netjack_release( &netj );
-        }
-        */
+        FreePorts();
+        netjack_release( &netj );
 
         //display some additional infos
         jack_info ( "NetOne driver started" );
@@ -421,12 +417,7 @@ namespace Jack
         if (netj.srcaddress_valid)
         {
             unsigned int r;
-
-    #ifdef __APPLE__
             static const int flag = 0;
-    #else
-            static const int flag = 0;
-    #endif
 
             if (netj.reply_port)
             netj.syncsource_address.sin_port = htons(netj.reply_port);