Now installs WinPcap + Added link to audio recordings in Program Files

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@54 09dcff7a-b715-0410-9601-b79a96267cd0

2 files changed, 31 insertions, 18 deletions

diff --git a/distribution/orkaudio-win32-binary/config.xml b/distribution/orkaudio-win32-binary/config.xml
index b71675c..87357f9 100644
--- a/distribution/orkaudio-win32-binary/config.xml
+++ b/distribution/orkaudio-win32-binary/config.xml
@@ -1,4 +1,6 @@
 <config>
+	<AudioOutputPath>./AudioRecordings</AudioOutputPath>
+
 	<!-- Uncomment the plugin you want to use -->
 	<CapturePlugin>VoIP.dll</CapturePlugin>
 	<!--<CapturePlugin>Generator.dll</CapturePlugin>-->
@@ -21,13 +23,14 @@
 	<AudioSegmentDuration>10</AudioSegmentDuration>
 	
 	<VoIpPlugin>
-		<!-- Microsoft Windows style network device: -->
-		<!--<Device>\Device\NPF_{2FEDB9F0-F584-48A8-B164-117965F80986}</Device>-->
-		<!-- Unix style network device: -->
-		<!--<Device>eth0</Device>-->
+		<!-- Microsoft Windows style network device. Use this if you want to force capture from a given device. -->
+		<!-- All available devices are listed in orkaudio.log when the service is starting -->
+		<!--<Device>\Device\NPF_{E0E496FA-DABF-47C1-97C2-DD914DFD3354}</Device>-->
 		<!-- LanMasks can be ignored if you have standard LAN addresses (192.168.x.x or 10.x.x.x) -->
+		<!-- LanMasks might be used to determine the direction of a call (incoming or outgoing into or from the LAN) -->
 		<!--<LanMasks>10.4.3.4, 1.2.3.4</LanMasks>-->
-		<!-- The following is a csv list of your PBX, PSTN gateway or such "gateway" devices -->
+		<!-- The following is a csv list of your PBX, PSTN gateway, conferencing server or such "gateway" devices -->
+		<!-- It is needed to properly detect call direction -->
 		<!--<MediaGateways>10.0.0.102</MediaGateways>-->
 	</VoIpPlugin>
 	<GeneratorPlugin>
diff --git a/distribution/orkaudio-win32-binary/orkaudio.nsi b/distribution/orkaudio-win32-binary/orkaudio.nsi
index d2aeaa3..96be741 100644
--- a/distribution/orkaudio-win32-binary/orkaudio.nsi
+++ b/distribution/orkaudio-win32-binary/orkaudio.nsi
@@ -28,7 +28,6 @@ UninstPage uninstConfirm
 UninstPage instfiles
 
 ;--------------------------------
-
 ; The stuff to install
 Section "Orkaudio (required)"
 
@@ -36,35 +35,38 @@ Section "Orkaudio (required)"
   
   ; Stop orkaudio service if earlier version is running
   nsSCM::Stop orkaudio
+    ; wait for the service to stop
+  sleep 4000
   
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
   
   ; Files
+
+file "OrkAudio.exe"
+file "config.xml"
+file "logging.properties"
+file "OrkBase.dll"
+file "orkaudio.log"
+file "tapelist.log"
+file "WinPcap_3_1.exe"
+file "LICENSE.txt"
+file "README.txt"
+file "VERSION.txt"
 file "ACE-AUTHORS"
 file "ACE-COPYING"
 file "ACE-README"
 file "ACE-THANKS"
 file "ACE-VERSION"
 file "ACE.dll"
-file "LICENSE.txt"
-file "OrkAudio.exe"
-file "OrkBase.dll"
-file "README.txt"
-file "VERSION.txt"
 file "boost-LICENSE_1_0.txt"
 file "boost-README"
-file "config.xml"
 file "log4cxx-AUTHORS"
 file "log4cxx-COPYING"
 file "log4cxx-ChangeLog"
 file "log4cxx-README"
 file "log4cxx-license.apl"
 file "log4cxx.dll"
-file "logging.properties"
-file "messages.log"
-file "orkaudio.log"
-file "orkaudio.nsi"
 file "portaudio-LICENSE.txt"
 file "portaudio-README.txt"
 file "xerces-c-LICENSE"
@@ -78,6 +80,8 @@ file "audiocaptureplugins\Generator.dll"
 file "audiocaptureplugins\SoundDevice.dll"
 file "audiocaptureplugins\VoIp.dll"  
   
+  SetOutPath $INSTDIR\AudioRecordings
+  
   nsSCM::Install orkaudio orkaudio 16 2 "$INSTDIR\orkaudio.exe" "" "" "" ""
   Pop $0
   StrCmp $0 "success" serviceOk  
@@ -100,12 +104,18 @@ SectionEnd
 Section "Start Menu Shortcuts"
 
   CreateDirectory "$SMPROGRAMS\Orkaudio"
+  CreateShortCut "$SMPROGRAMS\Orkaudio\Orkaudio Recordings.lnk" "$INSTDIR\AudioRecordings" "" "$INSTDIR\AudioRecordings" 0
+  CreateShortCut "$SMPROGRAMS\Orkaudio\Orkaudio Recordings List.lnk" "$INSTDIR\tapelist.log" "" "$INSTDIR\tapelist.log" 0  
+  CreateShortCut "$SMPROGRAMS\Orkaudio\Orkaudio Logfile.lnk" "$INSTDIR\orkaudio.log" "" "$INSTDIR\orkaudio.log" 0  
+  CreateShortCut "$SMPROGRAMS\Orkaudio\Orkaudio Install Directory.lnk" "$INSTDIR\" "" "$INSTDIR\" 0
   CreateShortCut "$SMPROGRAMS\Orkaudio\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\Orkaudio\Orkaudio.lnk" "$INSTDIR\" "" "$INSTDIR\" 0
-  ;CreateShortCut "$SMPROGRAMS\Orkaudio\Orkaudio (MakeNSISW).lnk" "$INSTDIR\orkaudio.nsi" "" "$INSTDIR\orkaudio.nsi" 0
   
 SectionEnd
 
+Section "Install WinPcap 3.1"
+	ExecWait "WinPcap_3_1.exe"
+SectionEnd
+
 Section "Run orkaudio NT service"
   nsSCM::Start orkaudio
   Pop $0