Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLMC
Manage
Activity
Members
Labels
Plan
Issues
26
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLMC
Commits
467a97a7
Commit
467a97a7
authored
8 years ago
by
luyikei
Committed by
Hugo Beauzée-Luyssen
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
GenericRenderer: Don't inherit EffectUser
Signed-off-by:
Hugo Beauzée-Luyssen
<
hugo@beauzee.fr
>
parent
079ba600
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/Renderer/GenericRenderer.cpp
+1
-0
1 addition, 0 deletions
src/Renderer/GenericRenderer.cpp
src/Renderer/GenericRenderer.h
+2
-7
2 additions, 7 deletions
src/Renderer/GenericRenderer.h
src/Renderer/WorkflowRenderer.h
+4
-0
4 additions, 0 deletions
src/Renderer/WorkflowRenderer.h
with
7 additions
and
7 deletions
src/Renderer/GenericRenderer.cpp
+
1
−
0
View file @
467a97a7
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
GenericRenderer
::
GenericRenderer
()
GenericRenderer
::
GenericRenderer
()
:
m_sourceRenderer
(
nullptr
)
:
m_sourceRenderer
(
nullptr
)
,
m_paused
(
false
)
,
m_paused
(
false
)
,
m_isRendering
(
false
)
{
{
m_eventWatcher
=
new
RendererEventWatcher
;
m_eventWatcher
=
new
RendererEventWatcher
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/Renderer/GenericRenderer.h
+
2
−
7
View file @
467a97a7
...
@@ -27,7 +27,6 @@
...
@@ -27,7 +27,6 @@
#include
<QObject>
#include
<QObject>
#include
"EffectsEngine/EffectUser.h"
#include
"Workflow/Types.h"
#include
"Workflow/Types.h"
#include
"Tools/RendererEventWatcher.h"
#include
"Tools/RendererEventWatcher.h"
...
@@ -37,7 +36,7 @@ class Media;
...
@@ -37,7 +36,7 @@ class Media;
/**
/**
* \class Common base for every renderer.
* \class Common base for every renderer.
*/
*/
class
GenericRenderer
:
public
EffectUser
class
GenericRenderer
:
public
QObject
{
{
Q_OBJECT
Q_OBJECT
Q_DISABLE_COPY
(
GenericRenderer
)
Q_DISABLE_COPY
(
GenericRenderer
)
...
@@ -142,13 +141,8 @@ public:
...
@@ -142,13 +141,8 @@ public:
return
m_isRendering
;
return
m_isRendering
;
}
}
EffectUser
::
Type
effectType
()
const
{
return
EffectUser
::
GlobalEffectUser
;
}
RendererEventWatcher
*
eventWatcher
();
RendererEventWatcher
*
eventWatcher
();
protected
:
protected
:
Backend
::
ISourceRenderer
*
m_sourceRenderer
;
Backend
::
ISourceRenderer
*
m_sourceRenderer
;
RendererEventWatcher
*
m_eventWatcher
;
RendererEventWatcher
*
m_eventWatcher
;
...
@@ -161,6 +155,7 @@ protected:
...
@@ -161,6 +155,7 @@ protected:
* \sa isPaused()
* \sa isPaused()
*/
*/
bool
m_paused
;
bool
m_paused
;
bool
m_isRendering
;
public
slots
:
public
slots
:
/**
/**
...
...
This diff is collapsed.
Click to expand it.
src/Renderer/WorkflowRenderer.h
+
4
−
0
View file @
467a97a7
...
@@ -230,6 +230,10 @@ class WorkflowRenderer : public GenericRenderer
...
@@ -230,6 +230,10 @@ class WorkflowRenderer : public GenericRenderer
qint64
m_audioPts
;
qint64
m_audioPts
;
private
:
private
:
quint32
m_width
;
quint32
m_height
;
/**
/**
* \brief When there's no sound to play, this is the buffer that'll
* \brief When there's no sound to play, this is the buffer that'll
* be injected
* be injected
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment