Commit 35ea20f4 authored by Vincent Carrubba's avatar Vincent Carrubba
Browse files

Adding SimpleObjectsReferencer in vlmc.pro, and solving some build errors

parent befba725
......@@ -1544,28 +1544,28 @@ bool EffectNode::referenceInternalStaticVideoInputAsConnected( InSlo
return ( m_connectedInternalsStaticVideosInputs.addObjectReference( in, in->getId() ) );
}
bool EffectNode::dereferenceStaticVideoInputToConnectedMap( quint32 inId )
bool EffectNode::dereferenceStaticVideoInputAsConnected( quint32 inId )
{
QWriteLocker wl( &m_rwl );
return ( m_connectedStaticVideosInputs.delObjectReference( inId ) );
}
bool EffectNode::dereferenceInternalStaticVideoOutputToConnectedMap( quint32 outId )
bool EffectNode::dereferenceInternalStaticVideoOutputAsConnected( quint32 outId )
{
QWriteLocker wl( &m_rwl );
return ( m_connectedInternalsStaticVideosOutputs.delObjectReference( outId ) );
}
bool EffectNode::dereferenceStaticVideoOutputToConnectedMap( quint32 outId )
bool EffectNode::dereferenceStaticVideoOutputAsConnected( quint32 outId )
{
QWriteLocker wl( &m_rwl );
return ( m_connectedStaticVideosOutputs.delObjectReference( outId ) );
}
bool EffectNode::dereferenceInternalStaticVideoInputToConnectedMap( quint32 inId )
bool EffectNode::dereferenceInternalStaticVideoInputAsConnected( quint32 inId )
{
QWriteLocker wl( &m_rwl );
......@@ -1607,7 +1607,7 @@ quint32 EffectNode::getNBConnectedStaticsVideosInputs(
return ( m_connectedStaticVideosInputs.getNBObjectsReferences() );
}
quint32 EffectNode::getNBConnectedInternalsStaticsVideosInputs( void ) const
quint32 EffectNode::getNBConnectedInternalsStaticsVideosOutputs( void ) const
{
QReadLocker rl( &m_rwl );
......
......@@ -413,7 +413,7 @@ class EffectNode : public IEffectNode
QList<InSlot<LightVideoFrame>*> getConnectedInternalsStaticsVideosInputsList( void ) const;
quint32 getNBConnectedStaticsVideosInputs( void ) const;
quint32 getNBConnectedInternalsStaticsVideosInputs( void ) const;
quint32 getNBConnectedInternalsStaticsVideosOutputs( void ) const;
quint32 getNBConnectedStaticsVideosOutputs( void ) const;
quint32 getNBConnectedInternalsStaticsVideosInputs( void ) const;
......
......@@ -35,7 +35,7 @@ class SemanticObjectManager
{
public:
SemanticObjectManager() : m_higherFreeId( 1 ), m_mapHoles( 0 ), m_father( NULL )
SemanticObjectManager() : m_higherFreeId( 1 ), m_mapHoles( 0 ), m_father( NULL ), m_isItInternal( false )
{
}
......@@ -59,7 +59,7 @@ public:
inline void setScope( bool isItInternal )
{
m_isItInternal = isItInternal
m_isItInternal = isItInternal;
return ;
}
......@@ -278,7 +278,8 @@ private:
QMap<quint32, QString> m_nameById;
quint32 m_higherFreeId;
quint32 m_mapHoles;
EffectNode* m_father;
EffectNode* m_father;
bool m_isItInternal;
};
#endif // SEMANTICOBJECTMANAGER_H_
......@@ -50,7 +50,7 @@ public:
bool delObjectReference( quint32 objId )
{
QMap<quint32, T*>::iterator it = m_objRefs.find( objId );
typename QMap<quint32, T*>::iterator it = m_objRefs.find( objId );
if ( it != m_objRefs.end() )
{
......
......@@ -140,6 +140,7 @@ HEADERS += src/GUI/MainWindow.h \
src/EffectsEngine/EffectPluginTypeManager.h \
src/EffectsEngine/EffectPluginTypeLoader.h \
src/EffectsEngine/SemanticObjectManager.hpp \
src/EffectsEngine/SimpleObjectsReferencer.hpp \
src/Configuration/SettingsManager.h
FORMS += src/GUI/ui/MainWindow.ui \
src/GUI/ui/PreviewWidget.ui \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment