Commit 9cd08f2f authored by MONSEIGNE Thibaut's avatar MONSEIGNE Thibaut

Fix: Codung Rules Redundant specifier

parent bef21182
......@@ -16,8 +16,8 @@ namespace OpenViBESSVEP
void processFrame() override;
void receiveKeyPressedEvent(const OIS::KeyCode oKey) override;
void receiveKeyReleasedEvent(const OIS::KeyCode oKey) override;
void receiveKeyPressedEvent(OIS::KeyCode oKey) override;
void receiveKeyReleasedEvent(OIS::KeyCode oKey) override;
private:
CVRPNServer* m_poVRPNServer;
......
......@@ -26,8 +26,8 @@ namespace OpenViBESSVEP
void processFrame() override;
protected:
virtual void receiveKeyPressedEvent(const OIS::KeyCode oKey) = 0;
virtual void receiveKeyReleasedEvent(const OIS::KeyCode oKey) = 0;
virtual void receiveKeyPressedEvent(OIS::KeyCode oKey) = 0;
virtual void receiveKeyReleasedEvent(OIS::KeyCode oKey) = 0;
private:
bool keyPressed(const OIS::KeyEvent& oEvent) override;
......
......@@ -19,8 +19,8 @@ namespace OpenViBESSVEPMindShooter
void processFrame() override;
void receiveKeyPressedEvent(const OIS::KeyCode oKey) override;
void receiveKeyReleasedEvent(const OIS::KeyCode oKey) override;
void receiveKeyPressedEvent(OIS::KeyCode oKey) override;
void receiveKeyReleasedEvent(OIS::KeyCode oKey) override;
private:
std::map<OIS::KeyCode, bool> m_vKeyPressed;
};
......
......@@ -25,29 +25,29 @@ namespace OpenViBE
bool activate(ELogLevel eStartLogLevel, ELogLevel eEndLogLevel, bool bActive) override;
bool activate(bool bActive) override;
void log(const time64 time64Value) override;
void log(time64 time64Value) override;
void log(const uint64_t ui64Value) override;
void log(const uint32_t ui32Value) override;
void log(const uint16_t ui16Value) override;
void log(const uint8_t ui8Value) override;
void log(uint64_t ui64Value) override;
void log(uint32_t ui32Value) override;
void log(uint16_t ui16Value) override;
void log(uint8_t ui8Value) override;
void log(const int64_t i64Value) override;
void log(const int32_t i32Value) override;
void log(const int16_t i16Value) override;
void log(const int8_t i8Value) override;
void log(int64_t i64Value) override;
void log(int32_t i32Value) override;
void log(int16_t i16Value) override;
void log(int8_t i8Value) override;
void log(const double f64Value) override;
void log(const float f32Value) override;
void log(double f64Value) override;
void log(float f32Value) override;
void log(const bool bValue) override;
void log(bool bValue) override;
void log(const CIdentifier& rValue) override;
void log(const CString& rValue) override;
void log(const char* pValue) override;
void log(const ELogLevel eLogLevel) override;
void log(const ELogColor eLogColor) override;
void log(ELogLevel eLogLevel) override;
void log(ELogColor eLogColor) override;
_IsDerivedFromClass_Final_(OpenViBE::Kernel::ILogListener, OVK_ClassId_Kernel_Log_LogListenerFileBuffered);
......
......@@ -17,8 +17,8 @@ namespace OpenViBESSVEPMindShooter
void processFrame() override;
void receiveKeyPressedEvent(const OIS::KeyCode oKey) override;
void receiveKeyReleasedEvent(const OIS::KeyCode oKey) override;
void receiveKeyPressedEvent(OIS::KeyCode oKey) override;
void receiveKeyReleasedEvent(OIS::KeyCode oKey) override;
void receiveMouseEvent(const OIS::MouseEvent& oEvent) override;
private:
......
......@@ -16,8 +16,8 @@ namespace OpenViBESSVEPMindShooter
void processFrame() override;
void receiveKeyPressedEvent(const OIS::KeyCode oKey) override;
void receiveKeyReleasedEvent(const OIS::KeyCode oKey) override;
void receiveKeyPressedEvent(OIS::KeyCode oKey) override;
void receiveKeyReleasedEvent(OIS::KeyCode oKey) override;
private:
CVRPNServer* m_poVRPNServer;
......
......@@ -28,8 +28,8 @@ namespace OpenViBESSVEPMindShooter
void processFrame() override;
protected:
virtual void receiveKeyPressedEvent(const OIS::KeyCode oKey) = 0;
virtual void receiveKeyReleasedEvent(const OIS::KeyCode oKey) = 0;
virtual void receiveKeyPressedEvent(OIS::KeyCode oKey) = 0;
virtual void receiveKeyReleasedEvent(OIS::KeyCode oKey) = 0;
virtual void receiveMouseEvent(const OIS::MouseEvent& oEvent) {}
private:
......
......@@ -38,7 +38,7 @@ namespace OpenViBEVRDemos
* \brief Constructor.
* \param deviceAddress The device address.
*/
CAbstractVrpnPeripheral(const std::string deviceAddress);
CAbstractVrpnPeripheral(std::string deviceAddress);
/**
* \brief Destructor.
*/
......
......@@ -17,7 +17,7 @@ public:
virtual bool callback(const OpenViBE::Plugins::IPluginObjectDesc& rPluginObjectDesc) = 0;
static std::string transform(const std::string& sInput, const bool bRemoveSlash = false);
static std::string transform(const std::string& sInput, bool bRemoveSlash = false);
protected:
......
......@@ -20,7 +20,7 @@ protected:
std::map<OpenViBE::CIdentifier, OpenViBE::CString> m_oUsedIdentifiers;
// Adds the define to m_usedIdentifiers and m_oFile
void addIdentifier(const OpenViBE::CString& objectName, const OpenViBE::CIdentifier candidate, const OpenViBE::CString& sSpaces);
void addIdentifier(const OpenViBE::CString& objectName, OpenViBE::CIdentifier candidate, const OpenViBE::CString& sSpaces);
};
#endif // __OpenViBEPluginInspector_CPluginObjectDescEnumAlgorithmGlobalDefinesGenerator_H__
......@@ -40,7 +40,7 @@ namespace
Color_SelectionAreaBorder,
};
static GdkColor colorFromIdentifier(const CIdentifier& rIdentifier)
GdkColor colorFromIdentifier(const CIdentifier& rIdentifier)
{
GdkColor l_oGdkColor;
uint64_t l_ui64Result = rIdentifier.toUInteger();
......@@ -53,7 +53,7 @@ namespace
return l_oGdkColor;
}
static void gdk_draw_rounded_rectangle(GdkDrawable* pDrawable, GdkGC* pDrawGC, gboolean bFill, gint x, gint y, gint width, gint height, gint radius = 8)
void gdk_draw_rounded_rectangle(GdkDrawable* pDrawable, GdkGC* pDrawGC, gboolean bFill, gint x, gint y, gint width, gint height, gint radius = 8)
{
if (bFill)
{
......
......@@ -128,10 +128,10 @@ namespace OpenViBESkeletonGenerator
std::vector<OpenViBE::CString> m_vOutputTriggers;
public:
bool addInputParameter(const OpenViBE::CIdentifier& rInputParameterIdentifier, const OpenViBE::CString& sInputName,
const OpenViBE::Kernel::EParameterType eParameterType, const OpenViBE::CIdentifier& rSubTypeIdentifier = OV_UndefinedIdentifier) override;
OpenViBE::Kernel::EParameterType eParameterType, const OpenViBE::CIdentifier& rSubTypeIdentifier = OV_UndefinedIdentifier) override;
bool addOutputParameter(const OpenViBE::CIdentifier& rOutputParameterIdentifier, const OpenViBE::CString& sOutputName,
const OpenViBE::Kernel::EParameterType eParameterType, const OpenViBE::CIdentifier& rSubTypeIdentifier = OV_UndefinedIdentifier) override;
OpenViBE::Kernel::EParameterType eParameterType, const OpenViBE::CIdentifier& rSubTypeIdentifier = OV_UndefinedIdentifier) override;
bool addInputTrigger(const OpenViBE::CIdentifier& rInputTriggerIdentifier, const OpenViBE::CString& rInputTriggerName) override;
......
......@@ -196,7 +196,7 @@ namespace OpenViBEAcquisitionServer
* If \c f64Impedance is -2, then the impedance is considered as "unknown / not available"
* If \c f64Impedance is any other negative value, then the impedance is considered as "unknown"
*/
virtual bool updateImpedance(const uint32_t ui32ChannelIndex, const double f64Impedance) = 0;
virtual bool updateImpedance(uint32_t ui32ChannelIndex, double f64Impedance) = 0;
};
/**
......@@ -267,7 +267,7 @@ namespace OpenViBEAcquisitionServer
*
* \sa IDriver::loop
*/
virtual void setSamples(const float* pSample, const uint32_t ui32SampleCount) = 0;
virtual void setSamples(const float* pSample, uint32_t ui32SampleCount) = 0;
/**
* \brief Gives a new stimulation set corresponding to the last sample buffer
......@@ -414,7 +414,7 @@ namespace OpenViBEAcquisitionServer
* \sa getHeader
* \sa IHeader
*/
virtual bool initialize(const uint32_t ui32SampleCountPerSentBlock, IDriverCallback& rCallback) = 0;
virtual bool initialize(uint32_t ui32SampleCountPerSentBlock, IDriverCallback& rCallback) = 0;
/**
* \brief Uninitializes the driver
* \return \e true in case of success.
......
......@@ -56,14 +56,14 @@ namespace OpenViBEAcquisitionServer
* to get details from a database, for example a description
* of the experiment, what is done, where etc...
*/
virtual bool setExperimentIdentifier(const uint32_t ui32ExperimentIdentifier) = 0;
virtual bool setExperimentIdentifier(uint32_t ui32ExperimentIdentifier) = 0;
/**
* \brief Sets the subject age
* \param ui32SubjectAge [in] : the subject age in years
* \return \e true in case of success.
* \return \e false in case of error.
*/
virtual bool setSubjectAge(const uint32_t ui32SubjectAge) = 0;
virtual bool setSubjectAge(uint32_t ui32SubjectAge) = 0;
/**
* \brief Sets the subject gender
* \param ui32SubjectGender [in] : the subject gender
......@@ -79,7 +79,7 @@ namespace OpenViBEAcquisitionServer
*
* \note This values are defined in the OpenViBE toolkit.
*/
virtual bool setSubjectGender(const uint32_t ui32SubjectGender) = 0;
virtual bool setSubjectGender(uint32_t ui32SubjectGender) = 0;
/**
* \brief Gets the experiment identifier
* \return the experiement identifier.
......@@ -120,7 +120,7 @@ namespace OpenViBEAcquisitionServer
*/
virtual bool isSubjectGenderSet() const = 0;
virtual bool setImpedanceCheckRequested(const bool bImpedanceCheckRequested) = 0;
virtual bool setImpedanceCheckRequested(bool bImpedanceCheckRequested) = 0;
virtual bool isImpedanceCheckRequested() const = 0;
/**
......@@ -134,7 +134,7 @@ namespace OpenViBEAcquisitionServer
* \return \e true in case of success.
* \return \e false in case of error.
*/
virtual bool setImpedanceLimit(const uint32_t ui32ImpedanceLimit) = 0;
virtual bool setImpedanceLimit(uint32_t ui32ImpedanceLimit) = 0;
//@}
/** \name Chanel information */
......@@ -149,7 +149,7 @@ namespace OpenViBEAcquisitionServer
* The number of channels will be used by the IDriver and the acquisition server
* to calculate the sample buffer size (that is \c nSamplesPerChannel x \c nChannel).
*/
virtual bool setChannelCount(const uint32_t ui32ChannelCount) = 0;
virtual bool setChannelCount(uint32_t ui32ChannelCount) = 0;
/**
* \brief Sets a channel' name
* \param ui32ChannelIndex [in] : the index of the channel which name should be set
......@@ -159,7 +159,7 @@ namespace OpenViBEAcquisitionServer
* \note As soon as a channel name is set, all the yet-unset channel names are
* considered to be set to empty string.
*/
virtual bool setChannelName(const uint32_t ui32ChannelIndex, const char* sChannelName) = 0;
virtual bool setChannelName(uint32_t ui32ChannelIndex, const char* sChannelName) = 0;
/**
* \brief Sets a channel' gain
* \param ui32ChannelIndex [in] : the index of the channel which gain should be set
......@@ -172,7 +172,7 @@ namespace OpenViBEAcquisitionServer
* Gains are multiplicator coefficients that are used by the OpenViBE platform to
* to transform measured values into physical dimension.
*/
virtual bool setChannelGain(const uint32_t ui32ChannelIndex, const float f32ChannelGain) = 0;
virtual bool setChannelGain(uint32_t ui32ChannelIndex, float f32ChannelGain) = 0;
/**
* \brief Sets a channel' measurement unit and its scaling factor
* \param ui32ChannelIndex [in] : the index of the channel which gain should be set
......@@ -187,7 +187,7 @@ namespace OpenViBEAcquisitionServer
*
* Default unit is 'Unspecified' and default factor is code translating 1e00.
*/
virtual bool setChannelUnits(const uint32_t ui32ChannelIndex, const uint32_t ui32ChannelUnit, const uint32_t ui32ChannelFactor) = 0;
virtual bool setChannelUnits(uint32_t ui32ChannelIndex, uint32_t ui32ChannelUnit, uint32_t ui32ChannelFactor) = 0;
/// \todo setChannelLocation
// virtual bool setChannelLocation(const uint32_t ui32ChannelIndex, const float ui32ChannelLocationX, const OpenViBEAcquisitionServer::float ui32ChannelLocationY, const OpenViBEAcquisitionServer::float ui32ChannelLocationZ)=0;
/**
......@@ -205,7 +205,7 @@ namespace OpenViBEAcquisitionServer
* \return an empty string when \c ui32ChannelIndex is out of range.
* \sa setChannelName
*/
virtual const char* getChannelName(const uint32_t ui32ChannelIndex) const = 0;
virtual const char* getChannelName(uint32_t ui32ChannelIndex) const = 0;
/**
* \brief Gets the gain of a channel
* \param ui32ChannelIndex [in] : the index of the channel which gain is wanted
......@@ -215,7 +215,7 @@ namespace OpenViBEAcquisitionServer
* \return 0 when \c ui32ChannelIndex is out of range.
* \sa setChannelGain
*/
virtual float getChannelGain(const uint32_t ui32ChannelIndex) const = 0;
virtual float getChannelGain(uint32_t ui32ChannelIndex) const = 0;
/**
* \brief Gets a channel' measurement unit and its scaling factor
* \param ui32ChannelIndex [in] : the index of the channel which gain should be set
......@@ -226,7 +226,7 @@ namespace OpenViBEAcquisitionServer
*
* See setChannelUnits().
*/
virtual bool getChannelUnits(const uint32_t ui32ChannelIndex, uint32_t& ui32ChannelUnit, uint32_t& ui32ChannelFactor) const = 0;
virtual bool getChannelUnits(uint32_t ui32ChannelIndex, uint32_t& ui32ChannelUnit, uint32_t& ui32ChannelFactor) const = 0;
/// \todo getChannelLocation
// virtual getChannelLocation(const uint32_t ui32ChannelIndex) const=0;
/**
......@@ -271,7 +271,7 @@ namespace OpenViBEAcquisitionServer
* \return \e false in case of error.
* \note the sampling rate is a global value. It can not be specified per channel.
*/
virtual bool setSamplingFrequency(const uint32_t ui32SamplingFrequency) = 0;
virtual bool setSamplingFrequency(uint32_t ui32SamplingFrequency) = 0;
/**
* \brief Gets the sampling rate of the measured signal
* \return the sampling rate of the measured signal
......
......@@ -108,7 +108,7 @@ namespace
signal.firwin(N, cutoff= 64./(0.5*100000.), window='hamming').tofile("c:/openvibe/f64_100k_128.bin")
--------------------------------------------------------------------------------------------------------------- */
static bool loadFilter(const char* sFilename, std::vector<double>& vFilter)
bool loadFilter(const char* sFilename, std::vector<double>& vFilter)
{
FILE* l_pFile = fopen(sFilename, "rb");
if (!l_pFile)
......
......@@ -29,7 +29,7 @@ namespace OpenViBEAcquisitionServer
virtual void release();
const char* getName() override;
bool initialize(const uint32_t ui32SampleCountPerSentBlock, IDriverCallback& rCallback) override;
bool initialize(uint32_t ui32SampleCountPerSentBlock, IDriverCallback& rCallback) override;
bool uninitialize() override;
bool start() override;
......
......@@ -67,12 +67,12 @@ namespace
}
static void button_channel_details_pressed_cb(GtkButton* pButton, void* pUserData)
void button_channel_details_pressed_cb(GtkButton* pButton, void* pUserData)
{
static_cast<CConfigurationBrainProductsBrainampSeries*>(pUserData)->buttonChannelDetailsPressedCB();
}
static void button_channel_selected_toggled_cb(GtkToggleButton* pButton, void* pUserData)
void button_channel_selected_toggled_cb(GtkToggleButton* pButton, void* pUserData)
{
if (gtk_toggle_button_get_active(pButton))
{
......@@ -84,7 +84,7 @@ namespace
}
}
static void combobox_device_changed_cb(GtkComboBox* pComboBox, void* pUserData)
void combobox_device_changed_cb(GtkComboBox* pComboBox, void* pUserData)
{
CConfigurationBrainProductsBrainampSeries* l_pConfiguration = static_cast<CConfigurationBrainProductsBrainampSeries*>(pUserData);
l_pConfiguration->comboBoxDeviceChangedCB();
......
......@@ -57,7 +57,7 @@ namespace OpenViBEAcquisitionServer
virtual void release();
const char* getName() override;
bool initialize(const uint32_t ui32SampleCountPerSentBlock, IDriverCallback& rCallback) override;
bool initialize(uint32_t ui32SampleCountPerSentBlock, IDriverCallback& rCallback) override;
bool start() override;
bool loop() override;
bool stop() override;
......@@ -72,7 +72,7 @@ namespace OpenViBEAcquisitionServer
protected:
bool getDeviceDetails(const uint32_t ui32Index, uint32_t* pAmplifierCount, uint32_t* pAmplifierType);
bool getDeviceDetails(uint32_t ui32Index, uint32_t* pAmplifierCount, uint32_t* pAmplifierType);
protected:
......
......@@ -35,11 +35,11 @@ namespace OpenViBEAcquisitionServer
CHeaderAdapterBrainProductsBrainampSeries(IHeader& rAdpatedHeader, EParameter* peChannelSelected);
bool setChannelCount(const uint32_t ui32ChannelCount) override;
bool setChannelName(const uint32_t ui32ChannelIndex, const char* sChannelName) override;
bool setChannelCount(uint32_t ui32ChannelCount) override;
bool setChannelName(uint32_t ui32ChannelIndex, const char* sChannelName) override;
uint32_t getChannelCount() const override;
const char* getChannelName(const uint32_t ui32ChannelIndex) const override;
const char* getChannelName(uint32_t ui32ChannelIndex) const override;
EParameter* m_peChannelSelected;
};
......
......@@ -36,7 +36,7 @@ namespace OpenViBEAcquisitionServer
virtual ~CDriverBrainProductsLiveAmp();
const char* getName() override;
bool initialize(const uint32_t ui32SampleCountPerSentBlock, IDriverCallback& rCallback) override;
bool initialize(uint32_t ui32SampleCountPerSentBlock, IDriverCallback& rCallback) override;
bool uninitialize() override;
bool start() override;
......
......@@ -13,8 +13,8 @@ namespace OpenViBEAcquisitionServer
virtual ~CConfigurationEGIAmpServer();
virtual bool setHostName(const OpenViBE::CString& sHostName);
virtual bool setCommandPort(const uint32_t ui32CommandPort);
virtual bool setStreamPort(const uint32_t ui32StreamPort);
virtual bool setCommandPort(uint32_t ui32CommandPort);
virtual bool setStreamPort(uint32_t ui32StreamPort);
virtual OpenViBE::CString getHostName() const;
virtual uint32_t getCommandPort() const;
......
......@@ -34,7 +34,7 @@ namespace OpenViBEAcquisitionServer
}
bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
uint32_t ui32SampleCountPerSentBlock,
IDriverCallback& rCallback) override;
bool uninitialize() override;
......
......@@ -22,7 +22,7 @@ namespace OpenViBEAcquisitionServer
const char* getName() override;
bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
uint32_t ui32SampleCountPerSentBlock,
IDriverCallback& rCallback) override;
bool uninitialize() override;
......
......@@ -33,7 +33,7 @@ namespace OpenViBEAcquisitionServer
virtual void release();
bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
uint32_t ui32SampleCountPerSentBlock,
IDriverCallback& rCallback) override;
bool uninitialize() override;
......
......@@ -19,7 +19,7 @@ namespace OpenViBEAcquisitionServer
const char* getName() override;
bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
uint32_t ui32SampleCountPerSentBlock,
IDriverCallback& rCallback) override;
bool uninitialize() override;
......
......@@ -26,7 +26,7 @@ namespace OpenViBEAcquisitionServer
const char* getName() override;
bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
uint32_t ui32SampleCountPerSentBlock,
IDriverCallback& rCallback) override;
bool uninitialize() override;
......
......@@ -31,7 +31,7 @@ namespace OpenViBEAcquisitionServer
const char* getName() override;
bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
uint32_t ui32SampleCountPerSentBlock,
IDriverCallback& rCallback) override;
bool uninitialize() override;
......
......@@ -21,7 +21,7 @@ namespace OpenViBEAcquisitionServer
const char* getName() override;
bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
uint32_t ui32SampleCountPerSentBlock,
IDriverCallback& rCallback) override;
bool uninitialize() override;
......
......@@ -39,7 +39,7 @@ namespace OpenViBEAcquisitionServer
*/
bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
uint32_t ui32SampleCountPerSentBlock,
IDriverCallback& rCallback) override;
bool uninitialize() override;
......
......@@ -39,17 +39,17 @@ namespace OpenViBEAcquisitionServer
bool postConfigure() override;
// Automatic Shutdown
void checkRadioAutomaticShutdown(const bool bAutoShutdownStatus);
void checkRadioAutomaticShutdown(bool bAutoShutdownStatus);
bool getAutomaticShutdownStatus();
void setRadioAutomaticShutdown(bool state);
// Shutdown on driver disconnect
void checkRadioShutdownOnDriverDisconnect(const bool bShutdownOnDriverDisconnectStatus);
void checkRadioShutdownOnDriverDisconnect(bool bShutdownOnDriverDisconnectStatus);
bool getShutdownOnDriverDisconnectStatus();
void setRadioShutdownOnDriverDisconnect(bool state);
// Device Light Enable
void checkRadioDeviceLightEnable(const bool bDeviceLightEnableStatus);
void checkRadioDeviceLightEnable(bool bDeviceLightEnableStatus);
bool getDeviceLightEnableStatus();
void setRadioDeviceLightEnable(bool state);
......
......@@ -43,7 +43,7 @@ namespace OpenViBEAcquisitionServer
const char* getName() override;
bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
uint32_t ui32SampleCountPerSentBlock,
IDriverCallback& rCallback) override;
bool uninitialize() override;
......
......@@ -38,7 +38,7 @@ namespace OpenViBEAcquisitionServer
const char* getName() override;
bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
uint32_t ui32SampleCountPerSentBlock,
IDriverCallback& rCallback) override;
bool uninitialize() override;
......
......@@ -15,7 +15,7 @@ namespace OpenViBEAcquisitionServer
bool preConfigure() override;
bool postConfigure() override;
bool setDeviceList(const std::vector<std::string> deviceList, std::string* deviceMaster, std::vector<std::string>* deviceSlaves);
bool setDeviceList(std::vector<std::string> deviceList, std::string* deviceMaster, std::vector<std::string>* deviceSlaves);
virtual void buttonRemoveSlaveDevice();
virtual void buttonAddSlaveDevice();
......
......@@ -43,7 +43,7 @@ namespace OpenViBEAcquisitionServer
const char* getName() override;
bool initialize(
const uint32_t ui32SampleCountPerSentBlock,
uint32_t ui32SampleCountPerSentBlock,
IDriverCallback& rCallback) override;
bool uninitialize() override;
......
......@@ -77,7 +77,7 @@ namespace OpenViBEAcquisitionServer
virtual IDriverContext& getDriverContext();
uint32_t getClientCount();
double getImpedance(const uint32_t ui32ChannelIndex);
double getImpedance(uint32_t ui32ChannelIndex);
bool loop();
......@@ -88,13 +88,13 @@ namespace OpenViBEAcquisitionServer
// Driver samples information callback
void setSamples(const float* pSample) override;
void setSamples(const float* pSample, const uint32_t ui32SampleCount) override;
void setSamples(const float* pSample, uint32_t ui32SampleCount) override;
void setStimulationSet(const OpenViBE::IStimulationSet& rStimulationSet) override;
// Driver context callback
virtual bool isConnected() const { return m_bInitialized; }
virtual bool isStarted() const { return m_bStarted; }
virtual bool updateImpedance(const uint32_t ui32ChannelIndex, const double f64Impedance);
virtual bool updateImpedance(uint32_t ui32ChannelIndex, double f64Impedance);
// General parameters configurable from the GUI
ENaNReplacementPolicy getNaNReplacementPolicy();
......
......@@ -13,7 +13,7 @@ namespace OpenViBEAcquisitionServer
virtual ~CConfigurationNetworkBuilder();
virtual bool setHostName(const OpenViBE::CString& sHostName);
virtual bool setHostPort(const uint32_t ui32HostPort);
virtual bool setHostPort(uint32_t ui32HostPort);
virtual OpenViBE::CString getHostName() const;
virtual uint32_t getHostPort() const;
......
......@@ -37,7 +37,7 @@ namespace OpenViBEAcquisitionServer
// Estimate the drift
//
// \param ui64NewSamples [in] : How many samples the driver returned
virtual bool estimateDrift(const uint64_t ui64NewSamples);
virtual bool estimateDrift(uint64_t ui64NewSamples);
// Request a drift correction
//
......@@ -46,7 +46,7 @@ namespace OpenViBEAcquisitionServer
// \param vPendingBuffers [in/out] : The sample buffer to be corrected
// \param oPendingStimulationSet [in/out] : The stimulation set to be realigned
// \param vPaddingBuffer[in] : The sample to repeatedly add if i64Correction > 0
virtual bool correctDrift(const int64_t i64Correction, uint64_t& ui64TotalSamples,
virtual bool correctDrift(int64_t i64Correction, uint64_t& ui64TotalSamples,
std::deque<std::vector<float>>& vPendingBuffers, OpenViBE::CStimulationSet& oPendingStimulationSet,
const std::vector<float>& vPaddingBuffer);
......@@ -83,7 +83,7 @@ namespace OpenViBEAcquisitionServer
void reset();
// Computes jitter in fractional samples
double computeJitter(const uint64_t ui64CurrentTime);
double computeJitter(uint64_t ui64CurrentTime);
const OpenViBE::Kernel::IKernelContext& m_kernelContext;
......
......@@ -25,9 +25,9 @@ namespace OpenViBEAcquisitionServer
void reset() override;
// Experiment information
bool setExperimentIdentifier(const uint32_t ui32ExperimentIdentifier) override;
bool setSubjectAge(const uint32_t ui32SubjectAge) override;
bool setSubjectGender(const uint32_t ui32SubjectGender) override;
bool setExperimentIdentifier(uint32_t ui32ExperimentIdentifier) override;
bool setSubjectAge(uint32_t ui32SubjectAge) override;
bool setSubjectGender(uint32_t ui32SubjectGender) override;
uint32_t getExperimentIdentifier() const override;
uint32_t getSubjectAge() const override;
......@@ -37,22 +37,22 @@ namespace OpenViBEAcquisitionServer
bool isSubjectAgeSet() const override;
bool isSubjectGenderSet() const override;
bool setImpedanceCheckRequested(const bool bImpedanceCheckRequested) override;
bool setImpedanceCheckRequested(bool bImpedanceCheckRequested) override;
bool isImpedanceCheckRequested() const override;
uint32_t getImpedanceLimit() const override;
bool setImpedanceLimit(const uint32_t ui32ImpedanceLimit) override;
bool setImpedanceLimit(uint32_t ui32ImpedanceLimit) override;