Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit 00f0ecc2 authored by Jozef Legeny's avatar Jozef Legeny

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
parent e3aeb892
......@@ -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")
......
......@@ -3,7 +3,7 @@
#include <iostream>
#include <ov_all.h>
#include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.h>
#include "../ovassvepCApplication.h"
......
......@@ -3,7 +3,7 @@
#include <Ogre.h>
#include <ov_all.h>
#include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.h>
namespace OpenViBESSVEP
......
#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>
......
......@@ -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>
......
#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>
......
#ifndef __OpenViBEApplication_CVRPNServer_H__
#define __OpenViBEApplication_CVRPNServer_H__
#include <ov_all.h>
#include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.h>
#include <map>
......
#ifndef __OpenViBEApplication_ICommand_H__
#define __OpenViBEApplication_ICommand_H__
#include <ov_all.h>
#include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.h>
namespace OpenViBESSVEP
......
#include "ovassvep_defines.h"
#include <ov_all.h>
#include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.h>
#include "ovassvepCApplication.h"
......
......@@ -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; }
......
#include "ovavrdCTieFighterBCI.h"
#include <ov_directories.h>
#include <openvibe/ov_directories.h>
#include <iostream>
#include <fstream>
......
......@@ -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;
}
......
#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>
......
#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>
......
......@@ -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>
......
......@@ -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__
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -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>
......
......@@ -2,7 +2,7 @@
#include "../ovasCConfigurationBuilder.h"
#include <toolkit/ovtk_all.h>
#include <ovITimeArithmetics.h>
#include <openvibe/ovITimeArithmetics.h>
#include <system/Time.h>
......
......@@ -16,7 +16,7 @@
#include <windows.h>
#include <cstring>
#include <ovITimeArithmetics.h>
#include <openvibe/ovITimeArithmetics.h>
#define boolean OpenViBE::boolean
using namespace OpenViBEAcquisitionServer;
......
......@@ -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>
......
......@@ -8,7 +8,7 @@
#include <thinkgear.h>
#include <ovITimeArithmetics.h>
#include <openvibe/ovITimeArithmetics.h>
using namespace OpenViBEAcquisitionServer;
using namespace OpenViBE;
......
......@@ -5,7 +5,7 @@
#include "ovasIDriver.h"
#include "../ovasCHeader.h"
#include <ov_all.h>
#include <openvibe/ov_all.h>
namespace OpenViBEAcquisitionServer
{
......
......@@ -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>
......
......@@ -2,7 +2,7 @@
#include "ovasIAcquisitionServerPlugin.h"
#include <toolkit/ovtk_all.h>
#include <ovITimeArithmetics.h>
#include <openvibe/ovITimeArithmetics.h>
#include <ovp_global_defines.h>
......
#include "ovasCAcquisitionServerGUI.h"
#include <ov_all.h>
#include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.h>
#include <gtk/gtk.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>
......
......@@ -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/)
......
......@@ -5,7 +5,7 @@
#include "../ovp_defines.h"
#include <ov_all.h>
#include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.h>
......
......@@ -5,7 +5,7 @@
#include "../ovp_defines.h"
#include <ov_all.h>
#include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.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>
......
......@@ -5,7 +5,7 @@
#include "../ovp_defines.h"
#include <ov_all.h>
#include <openvibe/ov_all.h>
#include <toolkit/ovtk_all.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>
......
......@@ -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>
......
#include <vector>
#include <ov_all.h>
#include <openvibe/ov_all.h>
#include "ovp_defines.h"
// @BEGIN inserm-gpl
......