Added license information and bug fixes

1 files changed, 33 insertions, 12 deletions

diff --git a/src/uscxml/Factory.cpp b/src/uscxml/Factory.cpp
index 6758e19..f75cdd3 100644
--- a/src/uscxml/Factory.cpp
+++ b/src/uscxml/Factory.cpp
@@ -1,4 +1,22 @@
-#include "uscxml/Common.h"
+/**
+ *  @file
+ *  @author     2012-2013 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de)
+ *  @copyright  Simplified BSD
+ *
+ *  @cond
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the FreeBSD license as published by the FreeBSD
+ *  project.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *  You should have received a copy of the FreeBSD license along with this
+ *  program. If not, see <http://www.opensource.org/licenses/bsd-license>.
+ *  @endcond
+ */
+
 #include "uscxml/config.h"
 
 #include "uscxml/Factory.h"
@@ -22,14 +40,15 @@
 # include "uscxml/plugins/invoker/system/SystemInvoker.h"
 # include "uscxml/plugins/invoker/xhtml/XHTMLInvoker.h"
 
+
 #ifdef PROTOBUF_FOUND
-# include "uscxml/plugins/ioprocessor/modality/MMIHTTPIOProcessor.h"
+//# include "uscxml/plugins/ioprocessor/modality/MMIHTTPIOProcessor.h"
 #endif
 
-# ifdef UMUNDO_FOUND
+# ifdef UMUNDO_FOUND 
 #   include "uscxml/plugins/invoker/umundo/UmundoInvoker.h"
-#   include "uscxml/plugins/invoker/vxml/VoiceXMLInvoker.h"
-# endif
+//#   include "uscxml/plugins/invoker/vxml/VoiceXMLInvoker.h"
+#endif
 
 # ifdef OPENSCENEGRAPH_FOUND
 #   include "uscxml/plugins/invoker/graphics/openscenegraph/OSGInvoker.h"
@@ -38,7 +57,7 @@
 
 # ifdef MILES_FOUND
 #   include "uscxml/plugins/invoker/miles/MilesSessionInvoker.h"
-#   include "uscxml/plugins/invoker/miles/SpatialAudio.h"
+//#   include "uscxml/plugins/invoker/miles/SpatialAudio.h"
 # endif
 
 # ifdef FFMPEG_FOUND
@@ -144,11 +163,13 @@ Factory::Factory() {
 		UmundoInvoker* invoker = new UmundoInvoker();
 		registerInvoker(invoker);
 	}
+#if 0
 	{
 		VoiceXMLInvoker* invoker = new VoiceXMLInvoker();
 		registerInvoker(invoker);
 	}
 #endif
+#endif
 
 #ifdef MILES_FOUND
 	{
@@ -156,10 +177,10 @@ Factory::Factory() {
 		MilesSessionInvoker* invoker = new MilesSessionInvoker();
 		registerInvoker(invoker);
 	}
-	{
-		SpatialAudio* invoker = new SpatialAudio();
-		registerInvoker(invoker);
-	}
+	// {
+	//  SpatialAudio* invoker = new SpatialAudio();
+	//  registerInvoker(invoker);
+	// }
 #endif
 
 #ifdef FFMPEG_FOUND
@@ -231,8 +252,8 @@ Factory::Factory() {
 
 #ifdef PROTOBUF_FOUND
 	{
-		MMIHTTPIOProcessor* ioProcessor = new MMIHTTPIOProcessor();
-		registerIOProcessor(ioProcessor);
+    // MMIHTTPIOProcessor* ioProcessor = new MMIHTTPIOProcessor();
+    // registerIOProcessor(ioProcessor);
 	}
 #endif
 #endif