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
c72bafdf
Commit
c72bafdf
authored
Jan 08, 2010
by
Vincent Carrubba
Browse files
Modifying headers inclusion
parent
e933cbbb
Changes
15
Hide whitespace changes
Inline
Side-by-side
src/Actions/ActionStack.cpp
View file @
c72bafdf
...
...
@@ -22,6 +22,8 @@
#include
"ActionStack.h"
#include
<QDebug>
using
namespace
Action
;
Stack
::~
Stack
()
...
...
src/EffectsEngine/EffectNode.cpp
View file @
c72bafdf
...
...
@@ -21,7 +21,9 @@
*****************************************************************************/
#include
"EffectNode.h"
#include
"IEffectNode.h"
#include
"IEffectPlugin.h"
#include
<QObject>
#include
<QReadLocker>
...
...
src/EffectsEngine/EffectNode.h
View file @
c72bafdf
...
...
@@ -24,6 +24,7 @@
#define EFFECTNODE_H_
#include
"EffectNodeFactory.h"
#include
"IEffectNode.h"
#include
"InSlot.hpp"
#include
"OutSlot.hpp"
#include
"SemanticObjectManager.hpp"
...
...
@@ -32,7 +33,6 @@
#include
<QQueue>
#include
<QtGlobal>
class
IEffectNode
;
class
IEffectPlugin
;
class
LightVideoFrame
;
...
...
src/EffectsEngine/EffectNodeFactory.cpp
View file @
c72bafdf
...
...
@@ -23,6 +23,10 @@
#include
"EffectNodeFactory.h"
#include
"EffectNode.h"
#include
"EffectPluginTypeManager.h"
#include
"IEffectPluginCreator.h"
EffectPluginTypeManager
EffectNodeFactory
::
m_eptm
=
EffectPluginTypeManager
();
EffectNodeFactory
::
EffectNodeFactory
()
:
m_higherFreeId
(
1
),
m_mapHoles
(
0
),
m_father
(
NULL
)
...
...
src/EffectsEngine/EffectNodeFactory.h
View file @
c72bafdf
...
...
@@ -24,11 +24,14 @@
#ifndef EFFECTNODEFACTORY_H_
#define EFFECTNODEFACTORY_H_
#include
"EffectPluginTypeManager.h"
#include
"IEffectPluginCreator.h"
#include
<QMap>
#include
<QString>
#include
"IEffectPluginCreator.h"
#include
"EffectPluginTypeManager.h"
class
EffectNode
;
class
IEffectNode
;
class
EffectNodeFactory
{
...
...
@@ -93,6 +96,4 @@ private:
};
#include
"EffectNode.h"
#endif // EFFECTNODEFACTORY_H_
src/EffectsEngine/EffectPluginTypeLoader.cpp
View file @
c72bafdf
...
...
@@ -23,6 +23,10 @@
#include
"EffectPluginTypeLoader.h"
#include
<IEffectPluginCreator.h>
#include
<QDebug>
EffectPluginTypeLoader
::
EffectPluginTypeLoader
()
:
m_iepc
(
NULL
)
{
}
...
...
src/EffectsEngine/EffectPluginTypeLoader.h
View file @
c72bafdf
...
...
@@ -25,8 +25,11 @@
#define EFFECTPLUGINTYPELOADER_H_
#include
<QPluginLoader>
#include
<QDebug>
#include
"IEffectPluginCreator.h"
class
IEffectPlugin
;
class
IEffectPluginCreator
;
class
QPluginLoader
;
class
EffectPluginTypeLoader
{
...
...
@@ -35,7 +38,7 @@ public:
EffectPluginTypeLoader
();
~
EffectPluginTypeLoader
();
IEffectPlugin
*
createIEffectPluginInstance
(
void
)
const
;
IEffectPlugin
*
createIEffectPluginInstance
(
void
)
const
;
bool
load
(
QString
const
&
fileName
);
private:
...
...
src/EffectsEngine/EffectPluginTypeManager.cpp
View file @
c72bafdf
...
...
@@ -23,6 +23,11 @@
#include
"EffectPluginTypeManager.h"
#include
"EffectPluginTypeLoader.h"
#include
<QDebug>
#include
<QDir>
EffectPluginTypeManager
::
EffectPluginTypeManager
()
:
m_higherFreeId
(
2
)
{
QDir
dir
;
...
...
src/EffectsEngine/EffectPluginTypeManager.h
View file @
c72bafdf
...
...
@@ -24,11 +24,13 @@
#ifndef EFFECTPLUGINTYPEMANAGER_H_
#define EFFECTPLUGINTYPEMANAGER_H_
#include
<QDir>
#include
"EffectPluginTypeLoader.h"
#define PLUGINS_PATH "./src/EffectsEngine/Plugins/lib/"
#include
<QMap>
class
EffectPluginTypeLoader
;
class
IEffectPlugin
;
class
EffectPluginTypeManager
{
...
...
src/EffectsEngine/EffectsEngine.cpp
View file @
c72bafdf
...
...
@@ -27,6 +27,8 @@
*/
#include
"EffectsEngine.h"
#include
"EffectNode.h"
#include
"EffectNodeFactory.h"
#include
"LightVideoFrame.h"
#include
"InSlot.hpp"
...
...
@@ -212,8 +214,8 @@ EffectsEngine::getVideoOutput( quint32 outId ) const
QReadLocker
rl
(
&
m_rwl
);
if
(
m_processedInBypassPatch
==
false
)
return
(
*
m_patch
->
getInternalStaticVideoInput
(
outId
)
);
return
(
*
m_bypassPatch
->
getInternalStaticVideoInput
(
outId
)
);
return
*
m_patch
->
getInternalStaticVideoInput
(
outId
);
return
*
m_bypassPatch
->
getInternalStaticVideoInput
(
outId
);
}
// BYPASSING
...
...
src/EffectsEngine/EffectsEngine.h
View file @
c72bafdf
...
...
@@ -30,11 +30,12 @@
#define EFFECTSENGINE_H_
#include
"EffectNodeFactory.h"
#include
<QReadWriteLock>
#include
<QtGlobal>
class
EffectNode
;
class
LightVideoFrame
;
class
QReadWriteLock
;
/**
* \class EffectsEngine
...
...
src/EffectsEngine/PluginsAPI/IEffectPlugin.h
View file @
c72bafdf
...
...
@@ -24,7 +24,9 @@
#ifndef IEFFECTPLUGIN_H_
#define IEFFECTPLUGIN_H_
#include
"IEffectNode.h"
//#include "IEffectNode.h"
class
IEffectNode
;
class
IEffectPlugin
{
...
...
src/EffectsEngine/PluginsAPI/IEffectPluginCreator.h
View file @
c72bafdf
/*****************************************************************************
* IEffectPluginCreator.cpp: Interface that must inherit the class who can
an
*
instantiate an effect plugin
* IEffectPluginCreator.cpp: Interface that must inherit the class who can
* instantiate an effect plugin
*****************************************************************************
* Copyright (C) 2008-2009 the VLMC team
*
...
...
@@ -24,7 +24,9 @@
#ifndef IEFFECTPLUGINFACTORY_H_
#define IEFFECTPLUGINFACTORY_H_
#include
"IEffectPlugin.h"
#include
<QtPlugin>
class
IEffectPlugin
;
class
IEffectPluginCreator
{
...
...
src/EffectsEngine/PluginsAPI/LightVideoFrame.cpp
View file @
c72bafdf
...
...
@@ -24,6 +24,12 @@
#include
"LightVideoFrame.h"
#include
<QSharedData>
#include
<QDebug>
#include
<qmutex.h>
#include
<QWriteLocker>
#include
<QReadLocker>
VideoFrame
::~
VideoFrame
()
{
if
(
frame
.
octets
!=
NULL
)
...
...
src/EffectsEngine/PluginsAPI/LightVideoFrame.h
View file @
c72bafdf
...
...
@@ -26,11 +26,11 @@
#define LIGHTVIDEOFRAME_H_
#include
<QSharedDataPointer>
#include
<QSharedData>
#include
<QDebug>
#include
<qmutex.h>
#include
<QWriteLocker>
#include
<QReadLocker>
/*
#include <QSharedData>
*/
/*
#include <QDebug>
*/
/*
#include <qmutex.h>
*/
/*
#include <QWriteLocker>
*/
/*
#include <QReadLocker>
*/
struct
Pixel
{
...
...
@@ -75,7 +75,7 @@ public:
VideoFrame
const
&
operator
*
(
void
)
const
;
VideoFrame
*
operator
->
(
void
);
VideoFrame
&
operator
*
(
void
);
private:
QSharedDataPointer
<
VideoFrame
>
m_videoFrame
;
...
...
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