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
3d9ffd59
Commit
3d9ffd59
authored
Feb 16, 2014
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ClipRenderer: Remove the notion of endReached. Stopped is enough here
parent
c5e1fbbe
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
19 deletions
+4
-19
src/Renderer/ClipRenderer.cpp
src/Renderer/ClipRenderer.cpp
+3
-12
src/Renderer/ClipRenderer.h
src/Renderer/ClipRenderer.h
+0
-1
src/Renderer/GenericRenderer.h
src/Renderer/GenericRenderer.h
+0
-4
src/Renderer/WorkflowRenderer.cpp
src/Renderer/WorkflowRenderer.cpp
+0
-1
src/Renderer/WorkflowRenderer.h
src/Renderer/WorkflowRenderer.h
+1
-1
No files found.
src/Renderer/ClipRenderer.cpp
View file @
3d9ffd59
...
...
@@ -46,7 +46,6 @@ ClipRenderer::ClipRenderer() :
connect
(
m_mediaPlayer
,
SIGNAL
(
playing
()
),
this
,
SIGNAL
(
playing
()
)
);
connect
(
m_mediaPlayer
,
SIGNAL
(
volumeChanged
()
),
this
,
SIGNAL
(
volumeChanged
()
)
);
connect
(
m_mediaPlayer
,
SIGNAL
(
timeChanged
(
qint64
)
),
this
,
SLOT
(
__timeChanged
(
qint64
)
)
);
connect
(
m_mediaPlayer
,
SIGNAL
(
endReached
()
),
this
,
SLOT
(
__endReached
()
)
);
}
ClipRenderer
::~
ClipRenderer
()
...
...
@@ -256,6 +255,9 @@ ClipRenderer::previewWidgetCursorChanged( qint64 newFrame )
void
ClipRenderer
::
__videoStopped
()
{
m_isRendering
=
false
;
if
(
m_mediaChanged
==
true
)
m_clipLoaded
=
false
;
emit
frameChanged
(
0
,
Vlmc
::
Renderer
);
emit
stopped
();
}
...
...
@@ -268,19 +270,8 @@ ClipRenderer::__timeChanged( qint64 time )
fps
=
m_selectedClip
->
getMedia
()
->
fps
();
qint64
f
=
qRound64
(
(
qreal
)
time
/
1000.0
*
fps
);
if
(
f
>=
m_end
)
{
__endReached
();
return
;
}
f
=
f
-
m_begin
;
emit
frameChanged
(
f
,
Vlmc
::
Renderer
);
}
void
ClipRenderer
::
__endReached
()
{
m_mediaPlayer
->
stop
();
m_isRendering
=
false
;
if
(
m_mediaChanged
==
true
)
m_clipLoaded
=
false
;
}
src/Renderer/ClipRenderer.h
View file @
3d9ffd59
...
...
@@ -90,7 +90,6 @@ public slots:
* \sa frameChanged();
*/
void
__timeChanged
(
qint64
time
);
void
__endReached
();
void
__videoStopped
();
};
...
...
src/Renderer/GenericRenderer.h
View file @
3d9ffd59
...
...
@@ -185,10 +185,6 @@ protected:
QWidget
*
m_renderWidget
;
public
slots
:
/**
* \brief This SLOT has to be called when the render ends.
*/
virtual
void
__endReached
()
=
0
;
/**
* \brief This SLOT will be called when the time cursor has changed.
*
...
...
src/Renderer/WorkflowRenderer.cpp
View file @
3d9ffd59
...
...
@@ -452,7 +452,6 @@ WorkflowRenderer::loadProject( const QDomElement &project )
void
WorkflowRenderer
::
__endReached
()
{
//FIXME: Is this necessary?!
stop
();
}
...
...
src/Renderer/WorkflowRenderer.h
View file @
3d9ffd59
...
...
@@ -317,7 +317,7 @@ class WorkflowRenderer : public GenericRenderer
* \brief Called when the workflow end is reached.
* \sa stop();
*/
v
oid
__endReached
();
v
irtual
void
__endReached
();
private
slots
:
/**
...
...
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