Commit 6c68a0b7 authored by Laurent Claustre's avatar Laurent Claustre

Merge branch 'core-1.5' of github.com:esrf-bliss/Lima into core-1.5

parents 20cac304 aaf1498c
......@@ -133,6 +133,7 @@ mod_version_data = {
'simulator': 'camera/simulator/VERSION',
'roperscientific': 'camera/roperscientific/VERSION',
'rayonixhs': 'camera/rayonixhs/VERSION',
'v4l2': 'camera/v4l2/VERSION',
'taco/camera/frelon': 'applications/taco/VERSION',
'tango/common': 'applications/tango/VERSION',
'tango/camera/maxipix': 'applications/tango/camera/Maxipix_VERSION',
......@@ -148,6 +149,7 @@ mod_version_data = {
'tango/camera/ueye': 'applications/tango/camera/Ueye_VERSION',
'tango/camera/simulator': 'applications/tango/camera/Simulator_VERSION',
'tango/camera/roperscientific': 'applications/tango/camera/RoperScientific_VERSION',
'tango/camera/v4l2': 'applications/tango/camera/V4l2_VERSION',
}
windows_plugins = ['pco', 'perkinelmer']
......
Subproject commit 492e9742b7b3d0c2fb5b48fcbfc179a9459fee1d
Subproject commit a079e4612d5edede9106b886718cfc61341b9aba
Subproject commit 531170d68f5bbe652d024cad90ee0af241f49494
Subproject commit 044ea27f15c73853db9a0ec4b81871347678fa10
......@@ -1101,9 +1101,11 @@ void CtControl::unregisterImageStatusCallback(ImageStatusCallback& cb)
if((*i)->cb() == &cb)
{
found = true;
delete *i;
ImageStatusThread* status_thread = *i;
m_img_status_thread_list.erase(i);
cb.setImageStatusCallbackGen(NULL);
aLock.unlock();
delete status_thread;
break;
}
}
......
......@@ -517,9 +517,10 @@ void CtVideo::_setLive(bool liveFlag)
DEB_TRACE() << "Done with the startAcq.";
}
else {
//aLock.unlock();
aLock.unlock();
DEB_TRACE() << "Stopping the acquisition at the controller level";
m_ct.stopAcq();
aLock.lock();
}
}
m_pars.live = liveFlag;
......@@ -898,11 +899,11 @@ void CtVideo::_apply_params(AutoMutex &aLock,bool aForceLiveFlag)
acquisition->setAcqExpoTime(m_pars.exposure);
if(m_pars.live)
{
m_ct.stopAcq();
aLock.unlock();
m_ct.stopAcq();
m_ct.prepareAcq();
aLock.lock();
m_ct.startAcq();
aLock.lock();
m_pars.live = true;
}
}
......
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