Commit bf2425bc authored by Jussi Lindgren's avatar Jussi Lindgren

Drivers: Fixed introduced Windows issues in gMobilab driver

parent f691e1d4
......@@ -10,12 +10,10 @@
#if defined TARGET_HAS_ThirdPartyGMobiLabPlusAPI
#ifndef GMOBILABPLUS_API
#ifdef TARGET_OS_Windows
#include <Windows.h>
#endif
#include <gMOBIlabplus.h>
#endif
// #ifdef TARGET_OS_Windows
// #include <Windows.h>
// #endif
#include <gtk/gtk.h>
......
......@@ -382,12 +382,12 @@ boolean CDriverGTecGMobiLabPlus::loop(void)
for(i=0 ; i<m_ui32SampleCountPerSentBlock ; i++)
{
#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";
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";
return false;
......
......@@ -80,12 +80,10 @@ namespace OpenViBEAcquisitionServer
HINSTANCE m_pLibrary;
#elif defined(TARGET_OS_Linux)
void* m_pLibrary;
#endif
private:
void allowAnalogInputs(OpenViBE::uint32 ui32ChannelIndex);
#endif
};
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment