From 89cbe457be2d43170975f309cb72d9838893ba8b Mon Sep 17 00:00:00 2001
From: moret <moret@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Mon, 28 Jul 2008 15:10:30 +0000
Subject: [PATCH] Correct NetDriver async mode

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2748 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/JackNetDriver.cpp    |   2 +-
 common/JackNetManager.cpp   |   8 ++-
 windows/jack_lsp.cbp        |  28 ++++++++--
 windows/jack_netadapter.cbp | 102 ++++++++++++++++++++++++++++++++----
 windows/jackdmp.workspace   |   7 +--
 5 files changed, 123 insertions(+), 24 deletions(-)

diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp
index e98442ce..beef243b 100644
--- a/common/JackNetDriver.cpp
+++ b/common/JackNetDriver.cpp
@@ -303,7 +303,7 @@ namespace Jack
         strcpy ( fTxHeader.fPacketType, "header" );
         fTxHeader.fDataStream = 'r';
         fTxHeader.fID = fParams.fID;
-        fTxHeader.fCycle = 1;
+        fTxHeader.fCycle = 0;
         fTxHeader.fSubCycle = 0;
         fTxHeader.fMidiDataSize = 0;
         fTxHeader.fBitdepth = fParams.fBitdepth;
diff --git a/common/JackNetManager.cpp b/common/JackNetManager.cpp
index 5ac7c2e6..21488e38 100644
--- a/common/JackNetManager.cpp
+++ b/common/JackNetManager.cpp
@@ -370,7 +370,7 @@ namespace Jack
             {
                 //fatal connection issue, exit
                 jack_error ( "'%s' : %s, network connection with '%s' broken, exiting.",
-                             fParams.fName, StrError ( NET_ERROR_CODE ), fParams.fSlaveNetName );   
+                             fParams.fName, StrError ( NET_ERROR_CODE ), fParams.fSlaveNetName );
                 //ask to the manager to properly remove the master
                 Exit();
             }
@@ -533,10 +533,8 @@ namespace Jack
 #ifdef JACK_MONITOR
         fMeasure[fMeasureId++] = ( ( ( float ) ( jack_get_time() - begin_time ) ) / ( float ) fPeriodUsecs ) * 100.f;
         fMonitor->Write ( fMeasure );
-        if ( fParams.fSlaveSyncMode && ( fTxHeader.fCycle - fRxHeader.fCycle ) )
-            jack_log ( "Monitor::SyncModeCycleOffset %d", fTxHeader.fCycle - fRxHeader.fCycle );
-        else if ( !fParams.fSlaveSyncMode && ( ( fTxHeader.fCycle - fRxHeader.fCycle ) != 1 ) )
-            jack_log ( "Monitor::ASyncModeCycleOffset %d", fTxHeader.fCycle - fRxHeader.fCycle );
+        if ( fTxHeader.fCycle - fRxHeader.fCycle )
+            jack_log ( "NetMonitor::%s %d", ( fParams.fSlaveSyncMode ) ? "SyncCycleOffset" : "AsyncCycleOffset", fTxHeader.fCycle - fRxHeader.fCycle );
 #endif
         return 0;
     }
diff --git a/windows/jack_lsp.cbp b/windows/jack_lsp.cbp
index 518098c0..ce7500b9 100644
--- a/windows/jack_lsp.cbp
+++ b/windows/jack_lsp.cbp
@@ -62,12 +62,32 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Monitor">
-				<Option output="jack_lsp" prefix_auto="1" extension_auto="1" />
-				<Option type="0" />
+				<Option output="Release\bin\jack_lsp" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release\" />
+				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
-					<Add option="-DJACK_MONITOR" />
+					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add directory="..\example-clients" />
+					<Add directory="..\common" />
+					<Add directory="..\common\jack" />
 				</Compiler>
+				<Linker>
+					<Add library="kernel32" />
+					<Add library="user32" />
+					<Add library="gdi32" />
+					<Add library="winspool" />
+					<Add library="comdlg32" />
+					<Add library="shell32" />
+					<Add library="ole32" />
+					<Add library="oleaut32" />
+					<Add library="uuid" />
+					<Add library="odbc32" />
+					<Add library="odbccp32" />
+					<Add library="libjackmp" />
+					<Add directory="Release\bin" />
+				</Linker>
 			</Target>
 		</Build>
 		<Compiler>
@@ -89,8 +109,6 @@
 		</Linker>
 		<Unit filename="..\example-clients\lsp.c">
 			<Option compilerVar="CC" />
-			<Option target="Win32 Release" />
-			<Option target="Win32 Debug" />
 		</Unit>
 		<Extensions>
 			<code_completion />
diff --git a/windows/jack_netadapter.cbp b/windows/jack_netadapter.cbp
index 58d50e6f..b78e1c92 100644
--- a/windows/jack_netadapter.cbp
+++ b/windows/jack_netadapter.cbp
@@ -7,41 +7,123 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Debug">
-				<Option output="Debug\bin\jack_netadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug\bin\jackmp\netadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-Wall" />
-					<Add option="-DBUILD_DLL" />
 					<Add option="-g" />
+					<Add option="-DBUILD_DLL" />
+					<Add directory="..\common" />
+					<Add directory="..\common\jack" />
 				</Compiler>
 				<Linker>
 					<Add library="user32" />
+					<Add library="kernel32" />
+					<Add library="gdi32" />
+					<Add library="winspool" />
+					<Add library="comdlg32" />
+					<Add library="advapi32" />
+					<Add library="shell32" />
+					<Add library="ole32" />
+					<Add library="oleaut32" />
+					<Add library="uuid" />
+					<Add library="odbc32" />
+					<Add library="odbccp32" />
+					<Add library="libjackservermp" />
+					<Add library="libsamplerate-0" />
+					<Add directory="Debug\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Release">
-				<Option output="Release\bin\jack_netadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Release\bin\jackmp\netadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release\" />
 				<Option type="3" />
 				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
 				<Compiler>
+					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
+					<Add directory="..\common" />
+					<Add directory="..\common\jack" />
+				</Compiler>
+				<Linker>
+					<Add library="user32" />
+					<Add library="kernel32" />
+					<Add library="gdi32" />
+					<Add library="winspool" />
+					<Add library="comdlg32" />
+					<Add library="advapi32" />
+					<Add library="shell32" />
+					<Add library="ole32" />
+					<Add library="oleaut32" />
+					<Add library="uuid" />
+					<Add library="odbc32" />
+					<Add library="odbccp32" />
+					<Add library="libjackservermp" />
+					<Add library="libsamplerate-0" />
+					<Add directory="Release\bin" />
+				</Linker>
+			</Target>
+			<Target title="Win32 Monitor">
+				<Option output="Release\bin\jackmp\netadapter" prefix_auto="1" extension_auto="1" />
+				<Option object_output="Release\" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Compiler>
 					<Add option="-O2" />
+					<Add option="-Wall" />
+					<Add option="-DBUILD_DLL" />
+					<Add directory="..\common" />
+					<Add directory="..\common\jack" />
 				</Compiler>
 				<Linker>
-					<Add option="-s" />
+					<Add library="kernel32" />
 					<Add library="user32" />
+					<Add library="gdi32" />
+					<Add library="winspool" />
+					<Add library="comdlg32" />
+					<Add library="advapi32" />
+					<Add library="shell32" />
+					<Add library="ole32" />
+					<Add library="oleaut32" />
+					<Add library="uuid" />
+					<Add library="odbc32" />
+					<Add library="odbccp32" />
+					<Add library="libjackservermp" />
+					<Add library="libsamplerate-0" />
+					<Add directory="Release\bin" />
 				</Linker>
 			</Target>
 		</Build>
-		<Unit filename="main.cpp" />
-		<Unit filename="main.h" />
+		<Compiler>
+			<Add option="-Wall" />
+			<Add directory="..\common" />
+			<Add directory="..\common\jack" />
+		</Compiler>
+		<Linker>
+			<Add library="kernel32" />
+			<Add library="user32" />
+			<Add library="gdi32" />
+			<Add library="winspool" />
+			<Add library="comdlg32" />
+			<Add library="advapi32" />
+			<Add library="shell32" />
+			<Add library="ole32" />
+			<Add library="oleaut32" />
+			<Add library="uuid" />
+			<Add library="odbc32" />
+			<Add library="odbccp32" />
+			<Add library="libjackservermp" />
+			<Add library="libsamplerate-0" />
+			<Add directory="Release\bin" />
+		</Linker>
+		<Unit filename="..\common\JackAudioAdapter.cpp" />
+		<Unit filename="..\common\JackAudioAdapterInterface.cpp" />
+		<Unit filename="..\common\JackLibSampleRateResampler.cpp" />
+		<Unit filename="..\common\JackNetAdapter.cpp" />
+		<Unit filename="..\common\JackResampler.cpp" />
 		<Extensions>
 			<AutoVersioning>
 				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
diff --git a/windows/jackdmp.workspace b/windows/jackdmp.workspace
index dff7beec..9b4ebdaf 100644
--- a/windows/jackdmp.workspace
+++ b/windows/jackdmp.workspace
@@ -7,15 +7,16 @@
 			<Depends filename="libjackservermp.cbp" />
 		</Project>
 		<Project filename="jack_dummy.cbp" />
-		<Project filename="jack_audioadapter.cbp">
+		<Project filename="jack_portaudio.cbp">
 			<Depends filename="libjackservermp.cbp" />
 		</Project>
-		<Project filename="jack_portaudio.cbp">
+		<Project filename="jack_audioadapter.cbp">
 			<Depends filename="libjackservermp.cbp" />
 		</Project>
 		<Project filename="jack_netdriver.cbp">
 			<Depends filename="libjackservermp.cbp" />
 		</Project>
+		<Project filename="jack_netadapter.cbp" active="1" />
 		<Project filename="jack_netmanager.cbp">
 			<Depends filename="libjackservermp.cbp" />
 		</Project>
@@ -32,7 +33,7 @@
 			<Depends filename="libjackmp.cbp" />
 		</Project>
 		<Project filename="jack_connect.cbp" />
-		<Project filename="jack_disconnect.cbp" active="1">
+		<Project filename="jack_disconnect.cbp">
 			<Depends filename="libjackmp.cbp" />
 		</Project>
 	</Workspace>