Commit 32a54b02 authored by Laurent Claustre's avatar Laurent Claustre

Merge branch 'new_soft_buffer'

parents a3e9e176 5d68dc47
......@@ -139,6 +139,8 @@ namespace lima
void getPixelSize(double& sizex, double& sizey);
void getSdkFrameDim(FrameDim &frame_dim);
void getStatus(Camera::Status& status);
// --- Acquisition interface
......@@ -252,11 +254,12 @@ namespace lima
class _AcqThread;
class _BufferCtrlObj;
friend class _AcqThread;
// -- Members
// LIMA / Acquisition (thread) related :
SoftBufferCtrlObj m_buffer_ctrl_obj;
_BufferCtrlObj* m_buffer_ctrl_obj;
// Pure thread and signals :
_AcqThread* m_acq_thread; // The thread retieving frame buffers from the SDK
Cond m_cond; // Waiting condition for inter thread signaling
This diff is collapsed.
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