Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2016-03-09 00:34:35 +00:00
commit 15c5bb02e7
9 files changed
+61 -34

No files matched your search

+3
View File
@@ -71,7 +71,10 @@ Bool PlaYUVerAppModuleIf::apply( Bool isPlaying, Bool disableThreads )
{
#ifdef PLAYUVER_THREADED_MODULES
if( !disableThreads )
{
wait();
start();
}
else
#endif
{
+1 -1
View File
@@ -40,7 +40,7 @@ class QAction;
namespace plaYUVer
{
//#define PLAYUVER_THREADED_MODULES
#define PLAYUVER_THREADED_MODULES
class VideoSubWindow;
+1 -1
View File
@@ -44,7 +44,7 @@ public:
{
m_acLogMessages.push_front( msg );
if( m_acLogMessages.size() > 5 )
m_acLogMessages.removeLast();
m_acLogMessages.remove( m_acLogMessages.size() - 1 );
update();
}
protected:
+1
View File
@@ -576,6 +576,7 @@ Void VideoSubWindow::disableModule( PlaYUVerAppModuleIf* pcModule )
pcModule = m_pcCurrentDisplayModule;
m_pcCurrentDisplayModule = 0;
ModulesHandle::destroyModuleIf( pcModule );
setWindowName( QFileInfo( m_cFilename ).fileName() );
bRefresh |= true;
}
}