jfmcarreira/calyp
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes to start implement stream modules

Browse Source
This commit is contained in:
jfmcarreira committed 2018-10-18 21:59:36 +01:00
1 parent 088c1955e0
commit 3489deda20
6 files changed
+172 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/CalypAppModuleIf.cpp
+25 -25
View File
@@ -74,19 +74,19 @@ bool CalypAppModuleIf::apply( bool isPlaying, bool disableThreads )
bool bRet = false;
QApplication::setOverrideCursor( Qt::WaitCursor );
if( m_pcModule->m_iModuleType == CLP_FRAME_PROCESSING_MODULE )
{
if( m_pcDisplaySubWindow )
{
m_pcDisplaySubWindow->setFillWindow( true );
}
else
{
m_pcSubWindow[0]->setFillWindow( true );
}
}
if( !( isPlaying && ( m_pcModule->m_uiModuleRequirements & CLP_MODULE_REQUIRES_SKIP_WHILE_PLAY ) ) )
{
if( m_pcModule->m_iModuleType == CLP_FRAME_PROCESSING_MODULE )
{
if( m_pcDisplaySubWindow )
{
m_pcDisplaySubWindow->setFillWindow( true );
}
else
{
m_pcSubWindow[0]->setFillWindow( true );
}
}
#ifdef CALYP_THREADED_MODULES
if( !disableThreads )
{
@@ -123,27 +123,27 @@ void CalypAppModuleIf::run()
apcFrameList.push_back( m_pcSubWindow[i]->getCurrFrame() );
}
if( m_pcModule->m_iModuleType == CLP_FRAME_PROCESSING_MODULE )
if( m_pcModule->m_iModuleAPI == CLP_MODULE_API_1 )
{
if( m_pcModule->m_iModuleAPI == CLP_MODULE_API_2 )
if( m_pcModule->m_iModuleType == CLP_FRAME_PROCESSING_MODULE )
{
m_pcProcessedFrame = m_pcModule->process( apcFrameList[0] );
}
else if( m_pcModule->m_iModuleType == CLP_FRAME_MEASUREMENT_MODULE )
{
m_dMeasurementResult = m_pcModule->measure( apcFrameList[0] );
}
}
else if( m_pcModule->m_iModuleAPI == CLP_MODULE_API_2 )
{
if( m_pcModule->m_iModuleType == CLP_FRAME_PROCESSING_MODULE )
{
m_pcProcessedFrame = m_pcModule->process( apcFrameList );
}
else
{
m_pcProcessedFrame = m_pcModule->process( m_pcSubWindow[0]->getCurrFrame() );
}
}
else if( m_pcModule->m_iModuleType == CLP_FRAME_MEASUREMENT_MODULE )
{
if( m_pcModule->m_iModuleAPI == CLP_MODULE_API_2 )
else if( m_pcModule->m_iModuleType == CLP_FRAME_MEASUREMENT_MODULE )
{
m_dMeasurementResult = m_pcModule->measure( apcFrameList );
}
else
{
m_dMeasurementResult = m_pcModule->measure( m_pcSubWindow[0]->getCurrFrame() );
}
}
else
{