Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
VLMC
Commits
35ea20f4
Commit
35ea20f4
authored
Dec 29, 2009
by
Vincent Carrubba
Browse files
Adding SimpleObjectsReferencer in vlmc.pro, and solving some build errors
parent
befba725
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/EffectsEngine/EffectNode.cpp
View file @
35ea20f4
...
...
@@ -1544,28 +1544,28 @@ bool EffectNode::referenceInternalStaticVideoInputAsConnected( InSlo
return
(
m_connectedInternalsStaticVideosInputs
.
addObjectReference
(
in
,
in
->
getId
()
)
);
}
bool
EffectNode
::
dereferenceStaticVideoInput
To
Connected
Map
(
quint32
inId
)
bool
EffectNode
::
dereferenceStaticVideoInput
As
Connected
(
quint32
inId
)
{
QWriteLocker
wl
(
&
m_rwl
);
return
(
m_connectedStaticVideosInputs
.
delObjectReference
(
inId
)
);
}
bool
EffectNode
::
dereferenceInternalStaticVideoOutput
To
Connected
Map
(
quint32
outId
)
bool
EffectNode
::
dereferenceInternalStaticVideoOutput
As
Connected
(
quint32
outId
)
{
QWriteLocker
wl
(
&
m_rwl
);
return
(
m_connectedInternalsStaticVideosOutputs
.
delObjectReference
(
outId
)
);
}
bool
EffectNode
::
dereferenceStaticVideoOutput
To
Connected
Map
(
quint32
outId
)
bool
EffectNode
::
dereferenceStaticVideoOutput
As
Connected
(
quint32
outId
)
{
QWriteLocker
wl
(
&
m_rwl
);
return
(
m_connectedStaticVideosOutputs
.
delObjectReference
(
outId
)
);
}
bool
EffectNode
::
dereferenceInternalStaticVideoInput
To
Connected
Map
(
quint32
inId
)
bool
EffectNode
::
dereferenceInternalStaticVideoInput
As
Connected
(
quint32
inId
)
{
QWriteLocker
wl
(
&
m_rwl
);
...
...
@@ -1607,7 +1607,7 @@ quint32 EffectNode::getNBConnectedStaticsVideosInputs(
return
(
m_connectedStaticVideosInputs
.
getNBObjectsReferences
()
);
}
quint32
EffectNode
::
getNBConnectedInternalsStaticsVideos
In
puts
(
void
)
const
quint32
EffectNode
::
getNBConnectedInternalsStaticsVideos
Out
puts
(
void
)
const
{
QReadLocker
rl
(
&
m_rwl
);
...
...
src/EffectsEngine/EffectNode.h
View file @
35ea20f4
...
...
@@ -413,7 +413,7 @@ class EffectNode : public IEffectNode
QList
<
InSlot
<
LightVideoFrame
>*>
getConnectedInternalsStaticsVideosInputsList
(
void
)
const
;
quint32
getNBConnectedStaticsVideosInputs
(
void
)
const
;
quint32
getNBConnectedInternalsStaticsVideos
In
puts
(
void
)
const
;
quint32
getNBConnectedInternalsStaticsVideos
Out
puts
(
void
)
const
;
quint32
getNBConnectedStaticsVideosOutputs
(
void
)
const
;
quint32
getNBConnectedInternalsStaticsVideosInputs
(
void
)
const
;
...
...
src/EffectsEngine/SemanticObjectManager.hpp
View file @
35ea20f4
...
...
@@ -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_
src/EffectsEngine/SimpleObjectsReferencer.hpp
View file @
35ea20f4
...
...
@@ -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
()
)
{
...
...
vlmc.pro
View file @
35ea20f4
...
...
@@ -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
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment