Merge branch 'devel'

This commit is contained in:
jfmcarreira committed 2015-03-09 18:29:00 +00:00
commit e7bf821c2c
29 files changed
+1603 -477

No files matched your search

+17 -2
View File
@@ -32,6 +32,7 @@
#elif( QT_VERSION_PLAYUVER == 4 )
#include <QtGui>
#endif
#include "QFuture"
#include "lib/PlaYUVerStream.h"
#include "SubWindowHandle.h"
#include "ViewArea.h"
@@ -84,6 +85,16 @@ private:
Bool m_bIsPlaying;
Bool m_bIsModule;
/**
* Threads variables
* QtConcurrent
*/
QFuture<Void> m_cRefreshResult;
QFuture<Void> m_cReadResult;
Void refreshFrame( Bool bThreaded = false );
Void refreshFrameOperation();
static Bool guessFormat( QString filename, UInt& rWidth, UInt& rHeight, Int& rInputFormat, UInt& rFrameRate );
/**
@@ -105,7 +116,7 @@ public:
Bool loadFile( QString cFilename, Bool bForceDialog = false );
Bool loadFile( PlaYUVerStreamInfo* streamInfo );
Void loadAll( );
Void loadAll();
Void reloadFile();
Bool save( QString filename );
@@ -122,7 +133,6 @@ public:
Void seekAbsoluteEvent( UInt new_frame_num );
Void seekRelativeEvent( Bool bIsFoward );
Void refreshFrame();
Void setCurrFrame( PlaYUVerFrame* pcCurrFrame );
PlaYUVerStreamInfo getStreamInfo()
@@ -170,6 +180,11 @@ public:
Void disableModule( PlaYUVerAppModuleIf* pcModule = NULL );
Void associateModule( PlaYUVerAppModuleIf* pcModule );
PlaYUVerAppModuleIf* getDisplayModule()
{
return m_pcCurrentDisplayModule;
}
QList<PlaYUVerAppModuleIf*> getModuleArray()
{
return m_apcCurrentModule;