Merge branch 'dev_modules_api'

Conflicts:
	source/PlaYUVerFrame.h
This commit is contained in:
jfmcarreira committed 2014-03-22 16:11:12 +00:00
commit d83eca0120
16 files changed
+695 -67

No files matched your search

+12
View File
@@ -35,6 +35,7 @@
#include "TypeDef.h"
#include "InputStream.h"
#include "viewarea.h"
#include "PlaYUVerModuleIf.h"
namespace plaYUVer
{
@@ -50,6 +51,8 @@ private:
QScrollArea* m_cScrollArea;
ViewArea* m_cViewArea;
PlaYUVerModuleIf* m_pcCurrentModule;
InputStream* m_pCurrStream;
QImage* m_pCurrFrameQImage;
@@ -70,6 +73,8 @@ public:
Void stopEvent();
Void seekEvent( UInt new_frame_num );
QImage* FrameToQImage( PlaYUVerFrame* curr_frame );
Void refreshFrame();
InputStream* getInputStream()
@@ -82,6 +87,13 @@ public:
return m_cViewArea;
}
/**
* Functions to enable a module in the
* current SubWindow
*/
Void enableModule( PlaYUVerModuleIf* select_module );
Void disableModule();
/**
* Show the image at its original size
*/