Merge branch 'develPlots' into devel

This commit is contained in:
jfmcarreira committed 2015-03-24 17:51:35 +00:00
commit 48bf385f4c
14 files changed
+554 -89

No files matched your search

+3 -1
View File
@@ -257,7 +257,7 @@ Void ModulesHandle::enableModuleIf( PlaYUVerAppModuleIf *pcCurrModuleIf )
{
QStringList selectedWindows = dialogWindowsSelection.getSelectedWindows();
VideoSubWindow *videoSubWindow;
QList<SubWindowHandle*> subWindowList = m_pcMainWindowManager->findSubWindow();
QList<SubWindowHandle*> subWindowList = m_pcMainWindowManager->findSubWindow( SubWindowHandle::VIDEO_SUBWINDOW );
for( Int j = 0; j < selectedWindows.size(); j++ )
{
for( Int i = 0; i < subWindowList.size(); i++ )
@@ -430,6 +430,7 @@ Void ModulesHandle::destroyAllModulesIf()
Bool ModulesHandle::applyModuleIf( PlaYUVerAppModuleIf *pcCurrModuleIf, Bool isPlaying, Bool disableThreads )
{
Bool bRet = false;
QApplication::setOverrideCursor( Qt::WaitCursor );
if( !isPlaying || ( isPlaying && pcCurrModuleIf->m_pcModule->m_bApplyWhilePlaying ) )
{
#ifdef PLAYUVER_THREADED_MODULES
@@ -448,6 +449,7 @@ Bool ModulesHandle::applyModuleIf( PlaYUVerAppModuleIf *pcCurrModuleIf, Bool isP
{
bRet = true;
}
QApplication::restoreOverrideCursor();
return bRet;
}