Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
261
Issues
261
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
76a91c65
Commit
76a91c65
authored
Aug 28, 2010
by
Till Theato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix monitor scene not showing up when switching between effects in effect stack
svn path=/trunk/kdenlive/; revision=4774
parent
47924e6c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
src/effectstackedit.cpp
src/effectstackedit.cpp
+2
-1
src/effectstackview.cpp
src/effectstackview.cpp
+1
-1
src/geometrywidget.cpp
src/geometrywidget.cpp
+0
-1
No files found.
src/effectstackedit.cpp
View file @
76a91c65
...
...
@@ -260,6 +260,8 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
}
else
if
(
type
==
"geometry"
)
{
if
(
KdenliveSettings
::
on_monitor_effects
())
{
GeometryWidget
*
geometry
=
new
GeometryWidget
(
m_monitor
,
m_timecode
,
pos
,
isEffect
,
this
);
// connect this before setupParam to make sure the monitor scene shows up at startup
connect
(
geometry
,
SIGNAL
(
checkMonitorPosition
(
int
)),
this
,
SIGNAL
(
checkMonitorPosition
(
int
)));
if
(
minFrame
==
maxFrame
)
geometry
->
setupParam
(
pa
,
m_in
,
m_out
);
else
...
...
@@ -267,7 +269,6 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
m_vbox
->
addWidget
(
geometry
);
m_valueItems
[
paramName
+
"geometry"
]
=
geometry
;
connect
(
geometry
,
SIGNAL
(
parameterChanged
()),
this
,
SLOT
(
collectAllParameters
()));
connect
(
geometry
,
SIGNAL
(
checkMonitorPosition
(
int
)),
this
,
SIGNAL
(
checkMonitorPosition
(
int
)));
connect
(
geometry
,
SIGNAL
(
seekToPos
(
int
)),
this
,
SIGNAL
(
seekTimeline
(
int
)));
connect
(
this
,
SIGNAL
(
syncEffectsPos
(
int
)),
geometry
,
SLOT
(
slotSyncPosition
(
int
)));
}
else
{
...
...
src/effectstackview.cpp
View file @
76a91c65
...
...
@@ -444,7 +444,7 @@ void EffectStackView::slotCheckMonitorPosition(int renderPos)
void
EffectStackView
::
slotRenderPos
(
int
pos
)
{
if
(
m_clipref
&&
m_effectedit
)
if
(
m_clipref
&&
m_effectedit
&&
!
m_trackMode
)
m_effectedit
->
slotSyncEffectsPos
(
pos
-
m_clipref
->
startPos
().
frames
(
KdenliveSettings
::
project_fps
()));
}
...
...
src/geometrywidget.cpp
View file @
76a91c65
...
...
@@ -220,7 +220,6 @@ void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxfra
m_scene
->
addItem
(
m_rect
);
slotPositionChanged
(
0
,
false
);
slotUpdateProperties
();
slotCheckMonitorPosition
(
m_monitor
->
render
->
seekFramePosition
());
}
...
...
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