[vlmc-devel] commit: EffectsEngine: Renaming EffectList to FilterList ( Hugo Beauzée-Luyssen )
git at videolan.org
git at videolan.org
Sun Aug 15 20:53:49 CEST 2010
vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Tue Aug 3 17:29:17 2010 +0200| [a786164a9e96d82da8a7d0bf68958ffe759ec78f] | committer: Hugo Beauzée-Luyssen
EffectsEngine: Renaming EffectList to FilterList
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=a786164a9e96d82da8a7d0bf68958ffe759ec78f
---
src/EffectsEngine/EffectsEngine.cpp | 18 +++++++++---------
src/EffectsEngine/EffectsEngine.h | 8 ++++----
src/Renderer/WorkflowRenderer.h | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/EffectsEngine/EffectsEngine.cpp b/src/EffectsEngine/EffectsEngine.cpp
index cf484e8..202f80e 100644
--- a/src/EffectsEngine/EffectsEngine.cpp
+++ b/src/EffectsEngine/EffectsEngine.cpp
@@ -112,13 +112,13 @@ EffectsEngine::browseDirectory( const QString &path )
}
void
-EffectsEngine::applyEffects( const EffectList &effects, Workflow::Frame* frame,
+EffectsEngine::applyEffects( const FilterList &effects, Workflow::Frame* frame,
qint64 currentFrame, double time )
{
if ( effects.size() == 0 )
return ;
- EffectList::const_iterator it = effects.constBegin();
- EffectList::const_iterator ite = effects.constEnd();
+ FilterList::const_iterator it = effects.constBegin();
+ FilterList::const_iterator ite = effects.constEnd();
quint8 *buff1 = NULL;
quint8 *buff2 = NULL;
@@ -161,12 +161,12 @@ EffectsEngine::applyEffects( const EffectList &effects, Workflow::Frame* frame,
}
void
-EffectsEngine::saveEffects( const EffectList &effects, QXmlStreamWriter &project )
+EffectsEngine::saveEffects( const FilterList &effects, QXmlStreamWriter &project )
{
if ( effects.size() <= 0 )
return ;
- EffectsEngine::EffectList::const_iterator it = effects.begin();
- EffectsEngine::EffectList::const_iterator ite = effects.end();
+ EffectsEngine::FilterList::const_iterator it = effects.begin();
+ EffectsEngine::FilterList::const_iterator ite = effects.end();
project.writeStartElement( "effects" );
while ( it != ite )
{
@@ -181,10 +181,10 @@ EffectsEngine::saveEffects( const EffectList &effects, QXmlStreamWriter &project
}
void
-EffectsEngine::initEffects( const EffectList &effects, quint32 width, quint32 height )
+EffectsEngine::initEffects( const FilterList &effects, quint32 width, quint32 height )
{
- EffectsEngine::EffectList::const_iterator it = effects.begin();
- EffectsEngine::EffectList::const_iterator ite = effects.end();
+ EffectsEngine::FilterList::const_iterator it = effects.begin();
+ EffectsEngine::FilterList::const_iterator ite = effects.end();
while ( it != ite )
{
diff --git a/src/EffectsEngine/EffectsEngine.h b/src/EffectsEngine/EffectsEngine.h
index 19b26b2..05306ec 100644
--- a/src/EffectsEngine/EffectsEngine.h
+++ b/src/EffectsEngine/EffectsEngine.h
@@ -49,16 +49,16 @@ class EffectsEngine : public QObject, public Singleton<EffectsEngine>
qint64 end;
QUuid uuid;
};
- typedef QList<EffectHelper*> EffectList;
+ typedef QList<EffectHelper*> FilterList;
Effect* effect( const QString& name );
bool loadEffect( const QString& fileName );
void browseDirectory( const QString& path );
- static void applyEffects( const EffectList &effects,
+ static void applyEffects( const FilterList &effects,
Workflow::Frame *frame, qint64 currentFrame, double time );
- static void saveEffects( const EffectList &effects, QXmlStreamWriter &project );
- static void initEffects( const EffectList &effects, quint32 width, quint32 height );
+ static void saveEffects( const FilterList &effects, QXmlStreamWriter &project );
+ static void initEffects( const FilterList &effects, quint32 width, quint32 height );
private:
EffectsEngine();
diff --git a/src/Renderer/WorkflowRenderer.h b/src/Renderer/WorkflowRenderer.h
index b93a6d3..a54b47c 100644
--- a/src/Renderer/WorkflowRenderer.h
+++ b/src/Renderer/WorkflowRenderer.h
@@ -284,7 +284,7 @@ class WorkflowRenderer : public GenericRenderer
qint64 m_oldLength;
QReadWriteLock *m_effectsLock;
- EffectsEngine::EffectList m_effects;
+ EffectsEngine::FilterList m_effects;
static const quint8 VideoCookie = '0';
static const quint8 AudioCookie = '1';
More information about the Vlmc-devel
mailing list