openvibe:

* moved the includes into include/openvibe

everything:
* modified the code to use the openvibe/ prefix once again


git-svn-id: svn://scm.gforge.inria.fr/svn/openvibe@3760 c330d7e9-fc0c-0410-a5b3-fd85c6f5aa8f

trunk2/CMakeLists.txt

@@ -91,7 +91,7 @@ INCLUDE("GNUInstallDirs")
 SET(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_BINDIR}/../doc/html")
 	
 # Add directories that OpenViBE will use to look for its components runtime, unless overridden by environment variables in the launch scripts.
-# These defines should only be used in "ov_directories.h".
+# These defines should only be used in "openvibe/ov_directories.h".
 ADD_DEFINITIONS(-DOV_CMAKE_PATH_ROOT="${CMAKE_INSTALL_PREFIX}")
 ADD_DEFINITIONS(-DOV_CMAKE_PATH_BIN="${CMAKE_INSTALL_FULL_BINDIR}")	
 ADD_DEFINITIONS(-DOV_CMAKE_PATH_DATA="${CMAKE_INSTALL_FULL_DATADIR}/openvibe")

trunk2/applications/demos/ssvep-demo/src/Shooter/ovassvepCShooterApplication.h

@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 
 #include "../ovassvepCApplication.h"

trunk2/applications/demos/ssvep-demo/src/Shooter/ovassvepCStarShip.h

@@ -3,7 +3,7 @@
 
 #include <Ogre.h>
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 
 namespace OpenViBESSVEP

trunk2/applications/demos/ssvep-demo/src/Trainer/ovassvepCTrainerFlickeringObject.h

 #ifndef __OpenViBEApplication_CTrainerFlickeringObject_H__
 #define __OpenViBEApplication_CTrainerFlickeringObject_H__
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 #include <Ogre.h>
 

trunk2/applications/demos/ssvep-demo/src/ovassvepCApplication.h

@@ -3,7 +3,7 @@
 
 #include "ovassvep_defines.h"
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 
 #include <Ogre.h>

trunk2/applications/demos/ssvep-demo/src/ovassvepCSSVEPFlickeringObject.h

 #ifndef __OpenViBEApplication_CSSVEPFlickeringObject_H__
 #define __OpenViBEApplication_CSSVEPFlickeringObject_H__
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 #include <Ogre.h>
 

trunk2/applications/demos/ssvep-demo/src/ovassvepCVRPNServer.h

 #ifndef __OpenViBEApplication_CVRPNServer_H__
 #define __OpenViBEApplication_CVRPNServer_H__
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 
 #include <map>

trunk2/applications/demos/ssvep-demo/src/ovassvepICommand.h

 #ifndef __OpenViBEApplication_ICommand_H__
 #define __OpenViBEApplication_ICommand_H__
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 
 namespace OpenViBESSVEP

trunk2/applications/demos/ssvep-demo/src/ovassvep_main.cpp

 #include "ovassvep_defines.h"
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 
 #include "ovassvepCApplication.h"

trunk2/applications/demos/vr-demo/src/HandballBCI/ovavrdCHandballBCI.cpp

@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include <ov_directories.h>
+#include <openvibe/ov_directories.h>
 
 template <typename T> const T _abs_(const T& t) { return t<0?-t:t; }
 template <typename T> const T _min_(const T& t1, const T& t2) { return t1<t2?t1:t2; }

trunk2/applications/demos/vr-demo/src/TieFighterBCI/ovavrdCTieFighterBCI.cpp

 #include "ovavrdCTieFighterBCI.h"
 
-#include <ov_directories.h>
+#include <openvibe/ov_directories.h>
 
 #include <iostream>
 #include <fstream>

trunk2/applications/demos/vr-demo/src/ovavrdCOgreVRApplication.cpp

@@ -9,7 +9,7 @@
 #include <vrpn_Button.h>
 #include <vrpn_Analog.h>
 
-#include <ov_directories.h>
+#include <openvibe/ov_directories.h>
 
 #if defined sleep
 #undef sleep
@@ -102,15 +102,15 @@ bool COgreVRApplication::setup()
 	#error "failing text"
 #endif
 
-	// Create LogManager to stop Ogre flooding the console and creating random files
-	OpenViBE::CString l_sOgreLog = OpenViBE::Directories::getLogDir() + "/openvibe-vr-demo-ogre.log";
-	std::cout << "+ Ogre log will be in " << l_sOgreLog << "\n";
-	Ogre::LogManager* l_poLogManagerSingleton = new Ogre::LogManager();
-	FS::Files::createParentPath(l_sOgreLog);
+	// Create LogManager to stop Ogre flooding the console and creating random files
+	OpenViBE::CString l_sOgreLog = OpenViBE::Directories::getLogDir() + "/openvibe-vr-demo-ogre.log";
+	std::cout << "+ Ogre log will be in " << l_sOgreLog << "\n";
+	Ogre::LogManager* l_poLogManagerSingleton = new Ogre::LogManager();
+	FS::Files::createParentPath(l_sOgreLog);
 	l_poLogManagerSingleton->createLog(l_sOgreLog.toASCIIString(), true, false, false );
 
 	// Root creation
-	OpenViBE::CString l_sOgreCfg = OpenViBE::Directories::getUserDataDir() + "/openvibe-vr-demo-ogre.cfg";
+	OpenViBE::CString l_sOgreCfg = OpenViBE::Directories::getUserDataDir() + "/openvibe-vr-demo-ogre.cfg";
 	std::cout << "+ Ogre cfg will be in " << l_sOgreCfg << "\n";
 	m_poRoot = new Ogre::Root(pluginsPath, l_sOgreCfg.toASCIIString(), l_sOgreLog.toASCIIString() );
 	// Resource handling
@@ -243,33 +243,33 @@ bool COgreVRApplication::initOIS()
 	return true;
 }
 
-bool COgreVRApplication::initCEGUI(const char *logFilename)
-{
-	// Instantiate logger before bootstrapping the system, this way we will be able to get the log redirected
-	if (!CEGUI::Logger::getSingletonPtr()) 
-	{
-		new CEGUI::DefaultLogger();		// Singleton, instantiate only, no delete
-	}
-	std::cout << "+ CEGUI log will be in " << logFilename << "\n";
-	FS::Files::createParentPath(logFilename);
-	try {
-		CEGUI::Logger::getSingleton().setLogFilename(logFilename, false);
-	} catch (char *error) {
-		std::cout << "  CEGUI::getSingleton() exception: " << error << "\n";
-	} catch (const char *error) {
-		std::cout << "  CEGUI::getSingleTon() exception: " << error << "\n";
-	}
-
-	m_rGUIRenderer = &(CEGUI::OgreRenderer::bootstrapSystem(*m_poWindow));
-
-	CEGUI::SchemeManager::getSingleton().create((CEGUI::utf8*)"TaharezLook-ov.scheme");
-
-	m_poGUIWindowManager = CEGUI::WindowManager::getSingletonPtr();
-	m_poSheet = m_poGUIWindowManager->createWindow("DefaultGUISheet", "Sheet");
-
-	CEGUI::System::getSingleton().setGUISheet(m_poSheet);
-
-	return true;
+bool COgreVRApplication::initCEGUI(const char *logFilename)
+{
+	// Instantiate logger before bootstrapping the system, this way we will be able to get the log redirected
+	if (!CEGUI::Logger::getSingletonPtr()) 
+	{
+		new CEGUI::DefaultLogger();		// Singleton, instantiate only, no delete
+	}
+	std::cout << "+ CEGUI log will be in " << logFilename << "\n";
+	FS::Files::createParentPath(logFilename);
+	try {
+		CEGUI::Logger::getSingleton().setLogFilename(logFilename, false);
+	} catch (char *error) {
+		std::cout << "  CEGUI::getSingleton() exception: " << error << "\n";
+	} catch (const char *error) {
+		std::cout << "  CEGUI::getSingleTon() exception: " << error << "\n";
+	}
+
+	m_rGUIRenderer = &(CEGUI::OgreRenderer::bootstrapSystem(*m_poWindow));
+
+	CEGUI::SchemeManager::getSingleton().create((CEGUI::utf8*)"TaharezLook-ov.scheme");
+
+	m_poGUIWindowManager = CEGUI::WindowManager::getSingletonPtr();
+	m_poSheet = m_poGUIWindowManager->createWindow("DefaultGUISheet", "Sheet");
+
+	CEGUI::System::getSingleton().setGUISheet(m_poSheet);
+
+	return true;
 }
 
 

trunk2/applications/developer-tools/plugin-inspector/src/ovpi_base.h

 #ifndef __OpenViBEPluginInspector_base_H__
 #define __OpenViBEPluginInspector_base_H__
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 
 #include <gtk/gtk.h>

trunk2/applications/developer-tools/skeleton-generator/src/ovsgCSkeletonGenerator.h

 #ifndef __OpenViBESkeletonGenerator_CSkeletonGenerator_H__
 #define __OpenViBESkeletonGenerator_CSkeletonGenerator_H__
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 //#include <configuration/ovkCConfigurationManager.h>
 

trunk2/applications/developer-tools/vrpn-simulator/src/ova_main.cpp

@@ -4,8 +4,8 @@
 
 #include <gdk/gdk.h>
 
-#include <ov_directories.h>
-#include <ovCString.h>
+#include <openvibe/ov_directories.h>
+#include <openvibe/ovCString.h>
 
 #include <vrpn_Button.h>
 #include <vrpn_Analog.h>

trunk2/applications/platform/acquisition-server/include/ovas_base.h

@@ -3,7 +3,7 @@
 
 #include "ovas_defines.h"
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 
 #endif // __OpenViBE_AcquisitionServer_Base_H__

trunk2/applications/platform/acquisition-server/src/drivers/brainproducts-brainampseries/ovasCDriverBrainProductsBrainampSeries.cpp

@@ -23,7 +23,7 @@
 #if defined TARGET_OS_Windows
 
 #include <toolkit/ovtk_all.h>
-#include <ovITimeArithmetics.h>
+#include <openvibe/ovITimeArithmetics.h>
 
 #include <system/Memory.h>
 #include <system/Time.h>

trunk2/applications/platform/acquisition-server/src/drivers/brainproducts-vamp/ovasCDriverBrainProductsVAmp.h

@@ -5,7 +5,7 @@
 
 #include "ovasIDriver.h"
 #include "ovasCHeaderBrainProductsVAmp.h"
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 
 #include <windows.h>
 #include <FirstAmp.h>

trunk2/applications/platform/acquisition-server/src/drivers/emotiv-epoc/ovasCDriverEmotivEPOC.h

@@ -6,7 +6,7 @@
 #include "ovasIDriver.h"
 #include "../ovasCHeader.h"
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 
 #include "EmoStateDLL.h"
 #include "edk.h"

trunk2/applications/platform/acquisition-server/src/drivers/generic-raw-reader/ovasCDriverGenericRawReader.cpp

@@ -2,7 +2,7 @@
 #include "../ovasCConfigurationBuilder.h"
 
 #include <toolkit/ovtk_all.h>
-#include <ovITimeArithmetics.h>
+#include <openvibe/ovITimeArithmetics.h>
 
 #include <system/Memory.h>
 #include <system/Time.h>

trunk2/applications/platform/acquisition-server/src/drivers/generic-sawtooth/ovasCDriverGenericSawTooth.cpp

@@ -2,7 +2,7 @@
 #include "../ovasCConfigurationBuilder.h"
 
 #include <toolkit/ovtk_all.h>
-#include <ovITimeArithmetics.h>
+#include <openvibe/ovITimeArithmetics.h>
 
 #include <system/Time.h>
 

trunk2/applications/platform/acquisition-server/src/drivers/micromed-systemplusevolution/ovasCDriverMicromedSystemPlusEvolution.cpp

@@ -16,7 +16,7 @@
 #include <windows.h>
 #include <cstring>
 
-#include <ovITimeArithmetics.h>
+#include <openvibe/ovITimeArithmetics.h>
 
 #define boolean OpenViBE::boolean
 using namespace OpenViBEAcquisitionServer;

trunk2/applications/platform/acquisition-server/src/drivers/micromed-systemplusevolution/ovasCDriverMicromedSystemPlusEvolution.h

@@ -5,7 +5,7 @@
 #include "../ovasCHeader.h"
 
 #if defined TARGET_OS_Windows
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <iostream>
 #include <socket/IConnectionClient.h>
 #include <socket/IConnectionServer.h>

trunk2/applications/platform/acquisition-server/src/drivers/neurosky-mindset/ovasCDriverNeuroskyMindset.cpp

@@ -8,7 +8,7 @@
 
 #include <thinkgear.h>
 
-#include <ovITimeArithmetics.h>
+#include <openvibe/ovITimeArithmetics.h>
 
 using namespace OpenViBEAcquisitionServer;
 using namespace OpenViBE;

trunk2/applications/platform/acquisition-server/src/drivers/neurosky-mindset/ovasCDriverNeuroskyMindset.h

@@ -5,7 +5,7 @@
 
 #include "ovasIDriver.h"
 #include "../ovasCHeader.h"
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 
 namespace OpenViBEAcquisitionServer
 {

trunk2/applications/platform/acquisition-server/src/drivers/tmsi-refa32b/ovasCDriverTMSiRefa32B.cpp

@@ -4,7 +4,7 @@
 #if defined TARGET_OS_Windows
 
 #include <toolkit/ovtk_all.h>
-#include <ovITimeArithmetics.h>
+#include <openvibe/ovITimeArithmetics.h>
 
 #include <iostream>
 #include <cmath>

trunk2/applications/platform/acquisition-server/src/ovasCAcquisitionServer.cpp

@@ -2,7 +2,7 @@
 #include "ovasIAcquisitionServerPlugin.h"
 
 #include <toolkit/ovtk_all.h>
-#include <ovITimeArithmetics.h>
+#include <openvibe/ovITimeArithmetics.h>
 
 #include <ovp_global_defines.h>
 

trunk2/applications/platform/acquisition-server/src/ovas_main.cpp

 #include "ovasCAcquisitionServerGUI.h"
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 
 #include <gtk/gtk.h>

trunk2/applications/platform/designer/src/ovd_base.h

 #ifndef __OpenViBEDesigner_base_H__
 #define __OpenViBEDesigner_base_H__
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 
 #include <gtk/gtk.h>

trunk2/cmake-modules/FindOpenViBE.cmake

@@ -17,7 +17,7 @@ ENDIF(DYNAMIC_LINK_OPENVIBE)
 
 set(SRC_DIR ${OV_BASE_DIR}/openvibe)
 
-FIND_PATH(PATH_OPENVIBE include/ov_all.h PATHS ${SRC_DIR})
+FIND_PATH(PATH_OPENVIBE include/openvibe/ov_all.h PATHS ${SRC_DIR})
 IF(PATH_OPENVIBE)
 	MESSAGE(STATUS "  Found OpenViBE...")
 	INCLUDE_DIRECTORIES(${PATH_OPENVIBE}/include/)

trunk2/contrib/plugins/processing/classification/src/algorithms/ovpCApplyFisherLdaFunction.h

@@ -5,7 +5,7 @@
 
 #include "../ovp_defines.h"
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 
 #include <toolkit/ovtk_all.h>
 

trunk2/contrib/plugins/processing/classification/src/algorithms/ovpCComputeFisherLdaFunction.h

@@ -5,7 +5,7 @@
 
 #include "../ovp_defines.h"
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 
 #include <toolkit/ovtk_all.h>
 

trunk2/contrib/plugins/processing/classification/src/algorithms/ovpCFeatureExtractionLda.h

@@ -4,7 +4,7 @@
 #if defined TARGET_HAS_ThirdPartyITPP
 
 #include "../ovp_defines.h"
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 
 #include <itpp/itbase.h>

trunk2/contrib/plugins/processing/classification/src/algorithms/ovpCNaiveBayesApplyFunction.h

@@ -5,7 +5,7 @@
 
 #include "../ovp_defines.h"
 
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 
 #include <toolkit/ovtk_all.h>
 

trunk2/contrib/plugins/processing/classification/src/box-algorithms/ovpCLDABoxAlgorithm.h

@@ -2,7 +2,7 @@
 #define __OpenViBEPlugins_SignalProcessingGpl_BoxAlgorithms_Filter_CLDABoxAlgorithm_H__
 
 #include "../ovp_defines.h"
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 #include <vector>
 #include <cstdio>

trunk2/contrib/plugins/processing/classification/src/box-algorithms/ovpCNaiveBayesApplyBoxAlgorithm.h

@@ -2,7 +2,7 @@
 #define __OpenViBEPlugins_SignalProcessingGpl_BoxAlgorithms_Classif_CNaiveBayesApplyBoxAlgorithm_H__
 
 #include "../ovp_defines.h"
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include <toolkit/ovtk_all.h>
 //#include <vector>
 #include <cstdio>

trunk2/contrib/plugins/processing/classification/src/ovp_main.cpp

 
 #include <vector>
-#include <ov_all.h>
+#include <openvibe/ov_all.h>
 #include "ovp_defines.h"
 
 // @BEGIN inserm-gpl