Added AllowAutomaticRecording config parameter (only significant in non-lookback mode).

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

3 files changed, 6 insertions, 4 deletions

diff --git a/orkbasecxx/Config.cpp b/orkbasecxx/Config.cpp
index 712a71e..d0bc296 100644
--- a/orkbasecxx/Config.cpp
+++ b/orkbasecxx/Config.cpp
@@ -41,9 +41,6 @@ Config::Config()
 	m_trackerTcpPort = TRACKER_TCP_PORT_DEFAULT;
 	m_trackerServicename = TRACKER_SERVICENAME_DEFAULT;
 	m_audioOutputPath = AUDIO_OUTPUT_PATH_DEFAULT;
-	//m_audioFilePermissions = strtol(AUDIO_FILE_PERMISSIONS_DEFAULT, NULL, 8);
-	//m_audioFileOwner = AUDIO_FILE_OWNER_DEFAULT;
-	//m_audioFileGroup = AUDIO_FILE_GROUP_DEFAULT;
 
 	m_audioFilePermissions = 0;
 
@@ -68,6 +65,7 @@ Config::Config()
 	m_commandLineServerPort = COMMAND_LINE_SERVER_PORT_DEFAULT;
 	m_httpServerPort = HTTP_SERVER_PORT_DEFAULT;
 	m_lookBackRecording = LOOKBACK_RECORDING_DEFAULT;
+	m_allowAutomaticRecording = ALLOW_AUTOMATIC_RECORDING_DEFAULT;
 }
 
 void Config::Define(Serializer* s)
@@ -136,6 +134,7 @@ void Config::Define(Serializer* s)
 	s->IntValue(COMMAND_LINE_SERVER_PORT_PARAM, m_commandLineServerPort);
 	s->IntValue(HTTP_SERVER_PORT_PARAM, m_httpServerPort);
 	s->BoolValue(LOOKBACK_RECORDING_PARAM, m_lookBackRecording);
+	s->BoolValue(ALLOW_AUTOMATIC_RECORDING_PARAM, m_allowAutomaticRecording);	// only valid in non-lookback mode
 }
 
 void Config::Validate()
diff --git a/orkbasecxx/Config.h b/orkbasecxx/Config.h
index ed9deb9..fa1119e 100644
--- a/orkbasecxx/Config.h
+++ b/orkbasecxx/Config.h
@@ -98,6 +98,8 @@
 #define HTTP_SERVER_PORT_DEFAULT 59140
 #define LOOKBACK_RECORDING_PARAM "LookBackRecording"
 #define LOOKBACK_RECORDING_DEFAULT true
+#define ALLOW_AUTOMATIC_RECORDING_PARAM "AllowAutomaticRecording"
+#define ALLOW_AUTOMATIC_RECORDING_DEFAULT true
 
 class DLL_IMPORT_EXPORT_ORKBASE Config : public Object
 {
@@ -154,6 +156,7 @@ public:
 	int m_commandLineServerPort;
 	int m_httpServerPort;
 	bool m_lookBackRecording;
+	bool m_allowAutomaticRecording;
 
 private:
 	log4cxx::LoggerPtr m_log;
diff --git a/orkbasecxx/Reporting.cpp b/orkbasecxx/Reporting.cpp
index 91ca42a..bf0f674 100644
--- a/orkbasecxx/Reporting.cpp
+++ b/orkbasecxx/Reporting.cpp
@@ -178,7 +178,7 @@ void Reporting::ThreadHandler(void *args)
 							else 
 							{
 								// Tape is wanted
-								if(CONFIG.m_lookBackRecording == false && ptapeMsg->m_stage.Equals("start"))
+								if(CONFIG.m_lookBackRecording == false && CONFIG.m_allowAutomaticRecording && ptapeMsg->m_stage.Equals("start"))
 								{
 									CapturePluginProxy::Singleton()->StartCapture(ptapeMsg->m_localParty);
 									CapturePluginProxy::Singleton()->StartCapture(ptapeMsg->m_remoteParty);