Merge devel into master

This commit is contained in:
jfmcarreira committed 2014-06-15 13:07:15 +01:00
1 parent 7a5a965a29
commit b02072c585
13 files changed
+310 -87

No files matched your search

+2
View File
@@ -58,6 +58,7 @@ public:
static Void destroyModuleIf( PlaYUVerModuleIf* pcCurrModuleIf );
static Bool applyModuleIf( PlaYUVerModuleIf* pcCurrModuleIf, Bool isPlaying = false );
static Void swapModulesWindowsIf( PlaYUVerModuleIf *pcCurrModuleIf );
static Bool showModuleIf( PlaYUVerModuleIf *pcCurrModuleIf, PlaYUVerFrame* processedFrame );
private:
QWidget *m_pcParent;
@@ -89,6 +90,7 @@ private:
Void appendModule( PlaYUVerModuleIf* pcCurrModuleIf );
SubWindowHandle* enableModuleIf( PlaYUVerModuleIf* pcCurrModuleIf );
Void customEvent( QEvent *event );
private Q_SLOTS:
void selectModule( int index );