Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
075622d2
Commit
075622d2
authored
Jul 27, 2010
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Effects: Clean things up a bit.
parent
c14bb4cc
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
3 additions
and
31 deletions
+3
-31
src/EffectsEngine/Effect.cpp
src/EffectsEngine/Effect.cpp
+2
-16
src/EffectsEngine/Effect.h
src/EffectsEngine/Effect.h
+0
-2
src/EffectsEngine/EffectsEngine.cpp
src/EffectsEngine/EffectsEngine.cpp
+0
-7
src/EffectsEngine/EffectsEngine.h
src/EffectsEngine/EffectsEngine.h
+0
-1
src/Gui/MainWindow.cpp
src/Gui/MainWindow.cpp
+1
-2
src/Renderer/WorkflowRenderer.cpp
src/Renderer/WorkflowRenderer.cpp
+0
-1
src/Workflow/MainWorkflow.cpp
src/Workflow/MainWorkflow.cpp
+0
-1
src/Workflow/VideoClipWorkflow.cpp
src/Workflow/VideoClipWorkflow.cpp
+0
-1
No files found.
src/EffectsEngine/Effect.cpp
View file @
075622d2
...
...
@@ -36,9 +36,9 @@ Effect::Effect( const QString &fileName ) :
Effect
::~
Effect
()
{
m_f0r_deinit
();
if
(
m_instance
!=
NULL
)
{
m_f0r_deinit
();
m_f0r_destruct
(
m_instance
);
}
}
...
...
@@ -63,6 +63,7 @@ Effect::load()
//Initializing structures
f0r_plugin_info_t
infos
;
m_f0r_init
();
m_f0r_info
(
&
infos
);
m_name
=
infos
.
name
;
m_desc
=
infos
.
explanation
;
...
...
@@ -93,18 +94,9 @@ Effect::type() const
void
Effect
::
init
(
quint32
width
,
quint32
height
)
{
//Don't init if the effect is not currently used.
if
(
m_used
==
false
)
return
;
if
(
width
!=
m_width
||
height
!=
m_height
)
{
if
(
m_instance
!=
NULL
)
{
m_f0r_deinit
();
m_f0r_destruct
(
m_instance
);
}
m_instance
=
m_f0r_construct
(
width
,
height
);
m_f0r_init
();
m_width
=
width
;
m_height
=
height
;
}
...
...
@@ -115,9 +107,3 @@ Effect::process( double time, const quint32 *input, quint32 *output ) const
{
m_f0r_update
(
m_instance
,
time
,
input
,
output
);
}
void
Effect
::
setUsed
(
bool
used
)
{
m_used
=
used
;
}
src/EffectsEngine/Effect.h
View file @
075622d2
...
...
@@ -48,7 +48,6 @@ class Effect : public QLibrary
Effect
(
const
QString
&
fileName
);
virtual
~
Effect
();
void
setUsed
(
bool
used
);
bool
load
();
const
QString
&
name
()
const
;
const
QString
&
description
()
const
;
...
...
@@ -69,7 +68,6 @@ class Effect : public QLibrary
quint32
m_width
;
quint32
m_height
;
Type
m_type
;
bool
m_used
;
};
#endif // EFFECT_H
src/EffectsEngine/EffectsEngine.cpp
View file @
075622d2
...
...
@@ -48,13 +48,6 @@ EffectsEngine::EffectHelper::EffectHelper( Effect *_effect, qint64 _start, qint6
uuid
=
_uuid
;
}
void
EffectsEngine
::
initAll
(
quint32
width
,
quint32
height
)
{
foreach
(
Effect
*
e
,
m_effects
)
e
->
init
(
width
,
height
);
}
Effect
*
EffectsEngine
::
effect
(
const
QString
&
name
)
{
...
...
src/EffectsEngine/EffectsEngine.h
View file @
075622d2
...
...
@@ -47,7 +47,6 @@ class EffectsEngine : public QObject, public Singleton<EffectsEngine>
};
typedef
QList
<
EffectHelper
*>
EffectList
;
void
initAll
(
quint32
width
,
quint32
height
);
Effect
*
effect
(
const
QString
&
name
);
bool
loadEffect
(
const
QString
&
fileName
);
void
browseDirectory
(
const
QString
&
path
);
...
...
src/Gui/MainWindow.cpp
View file @
075622d2
...
...
@@ -427,13 +427,12 @@ MainWindow::initializeDockWidgets( void )
{
DockWidgetManager
*
dockManager
=
DockWidgetManager
::
getInstance
();
//FIXME !!!
EffectsList
*
effectsList
=
new
EffectsList
(
this
);
dockManager
->
addDockedWidget
(
effectsList
,
QT_TRANSLATE_NOOP
(
"DockWidgetManager"
,
"Effects List"
),
Qt
::
AllDockWidgetAreas
,
QDockWidget
::
AllDockWidgetFeatures
,
Qt
::
LeftDockWidgetArea
);
//FIXME !!!
EffectsEngine
::
getInstance
()
->
browseDirectory
(
"/usr/local/frei0r/lib/"
);
m_renderer
=
new
WorkflowRenderer
();
...
...
src/Renderer/WorkflowRenderer.cpp
View file @
075622d2
...
...
@@ -386,7 +386,6 @@ WorkflowRenderer::paramsHasChanged( quint32 width, quint32 height, double fps )
void
WorkflowRenderer
::
appendEffect
(
Effect
*
effect
,
qint64
start
,
qint64
end
)
{
effect
->
setUsed
(
true
);
effect
->
init
(
m_width
,
m_height
);
QWriteLocker
lock
(
m_effectsLock
);
m_effects
.
push_back
(
new
EffectsEngine
::
EffectHelper
(
effect
,
start
,
end
)
);
...
...
src/Workflow/MainWorkflow.cpp
View file @
075622d2
...
...
@@ -106,7 +106,6 @@ void
MainWorkflow
::
startRender
(
quint32
width
,
quint32
height
)
{
//Reinit the effects in case the width/height has change
EffectsEngine
::
getInstance
()
->
initAll
(
width
,
height
);
m_renderStarted
=
true
;
m_width
=
width
;
m_height
=
height
;
...
...
src/Workflow/VideoClipWorkflow.cpp
View file @
075622d2
...
...
@@ -213,7 +213,6 @@ VideoClipWorkflow::appendEffect( Effect *effect, qint64 start, qint64 end )
qWarning
()
<<
"VideoClipWorkflow does not handle non filter effects."
;
return
false
;
}
effect
->
setUsed
(
true
);
effect
->
init
(
m_width
,
m_height
);
QWriteLocker
lock
(
m_effectsLock
);
m_effects
.
push_back
(
new
EffectsEngine
::
EffectHelper
(
effect
,
start
,
end
)
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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