Mentions légales du service

Skip to content
Snippets Groups Projects
Commit bf2425bc authored by Jussi Lindgren's avatar Jussi Lindgren
Browse files

Drivers: Fixed introduced Windows issues in gMobilab driver

parent f691e1d4
No related branches found
No related tags found
No related merge requests found
...@@ -10,12 +10,10 @@ ...@@ -10,12 +10,10 @@
#if defined TARGET_HAS_ThirdPartyGMobiLabPlusAPI #if defined TARGET_HAS_ThirdPartyGMobiLabPlusAPI
#ifndef GMOBILABPLUS_API // #ifdef TARGET_OS_Windows
#ifdef TARGET_OS_Windows // #include <Windows.h>
#include <Windows.h> // #endif
#endif
#include <gMOBIlabplus.h>
#endif
#include <gtk/gtk.h> #include <gtk/gtk.h>
......
...@@ -382,12 +382,12 @@ boolean CDriverGTecGMobiLabPlus::loop(void) ...@@ -382,12 +382,12 @@ boolean CDriverGTecGMobiLabPlus::loop(void)
for(i=0 ; i<m_ui32SampleCountPerSentBlock ; i++) for(i=0 ; i<m_ui32SampleCountPerSentBlock ; i++)
{ {
#if defined(TARGET_OS_Windows) #if defined(TARGET_OS_Windows)
if (!m_pGtec->m_fGetData(m_pGtec->m_oDevice, &m_pGtec->m_oBuffer, &m_oOverlap))// receive samples from hardware (one per channel) if (!m_pGtec->m_fGetData(m_pGtec->m_oDevice, &m_pGtec->m_oBuffer, &m_pGtec->m_oOverlap))// receive samples from hardware (one per channel)
{ {
m_rDriverContext.getLogManager() << LogLevel_Error << "GT_GetData failed\n"; m_rDriverContext.getLogManager() << LogLevel_Error << "GT_GetData failed\n";
return false; return false;
} }
if (WaitForSingleObject(m_oOverlap.hEvent, 1000) == WAIT_TIMEOUT) if (WaitForSingleObject(m_pGtec->m_oOverlap.hEvent, 1000) == WAIT_TIMEOUT)
{ {
m_rDriverContext.getLogManager() << LogLevel_Warning << "Timeout in reading from the device\n"; m_rDriverContext.getLogManager() << LogLevel_Warning << "Timeout in reading from the device\n";
return false; return false;
......
...@@ -80,12 +80,10 @@ namespace OpenViBEAcquisitionServer ...@@ -80,12 +80,10 @@ namespace OpenViBEAcquisitionServer
HINSTANCE m_pLibrary; HINSTANCE m_pLibrary;
#elif defined(TARGET_OS_Linux) #elif defined(TARGET_OS_Linux)
void* m_pLibrary; void* m_pLibrary;
#endif
private: private:
void allowAnalogInputs(OpenViBE::uint32 ui32ChannelIndex); void allowAnalogInputs(OpenViBE::uint32 ui32ChannelIndex);
#endif
}; };
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment