Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Farid Abdelnour
kdenlive
Commits
f6071883
Commit
f6071883
authored
Oct 30, 2011
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix setting zone when working with slow codecs
svn path=/trunk/kdenlive/; revision=6008
parent
9a4d506b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
src/monitor.cpp
src/monitor.cpp
+4
-4
src/smallruler.cpp
src/smallruler.cpp
+5
-0
src/smallruler.h
src/smallruler.h
+1
-0
No files found.
src/monitor.cpp
View file @
f6071883
...
...
@@ -428,7 +428,7 @@ void Monitor::slotZoneMoved(int start, int end)
void
Monitor
::
slotSetZoneStart
()
{
m_ruler
->
setZone
(
render
->
seekFrameP
osition
(),
-
1
);
m_ruler
->
setZone
(
m_ruler
->
p
osition
(),
-
1
);
emit
zoneUpdated
(
m_ruler
->
zone
());
checkOverlay
();
setClipZone
(
m_ruler
->
zone
());
...
...
@@ -436,7 +436,7 @@ void Monitor::slotSetZoneStart()
void
Monitor
::
slotSetZoneEnd
()
{
m_ruler
->
setZone
(
-
1
,
render
->
seekFrameP
osition
());
m_ruler
->
setZone
(
-
1
,
m_ruler
->
p
osition
());
emit
zoneUpdated
(
m_ruler
->
zone
());
checkOverlay
();
setClipZone
(
m_ruler
->
zone
());
...
...
@@ -549,7 +549,7 @@ void Monitor::slotMouseSeek(int eventDelta, bool fast)
if
(
fast
)
{
int
delta
=
m_monitorManager
->
timecode
().
fps
();
if
(
eventDelta
>
0
)
delta
=
0
-
delta
;
slotSeek
(
render
->
seekFrameP
osition
()
-
delta
);
slotSeek
(
m_ruler
->
p
osition
()
-
delta
);
}
else
{
if
(
eventDelta
>=
0
)
slotForwardOneFrame
();
else
slotRewindOneFrame
();
...
...
@@ -620,7 +620,7 @@ void Monitor::slotSeek(int pos)
void
Monitor
::
checkOverlay
()
{
if
(
m_overlay
==
NULL
)
return
;
int
pos
=
render
->
seekFrameP
osition
();
int
pos
=
m_ruler
->
p
osition
();
QPoint
zone
=
m_ruler
->
zone
();
if
(
pos
==
zone
.
x
())
m_overlay
->
setOverlayText
(
i18n
(
"In Point"
));
...
...
src/smallruler.cpp
View file @
f6071883
...
...
@@ -140,6 +140,11 @@ bool SmallRuler::slotNewValue(int value)
return
true
;
}
int
SmallRuler
::
position
()
const
{
return
m_cursorFramePosition
;
}
//virtual
void
SmallRuler
::
resizeEvent
(
QResizeEvent
*
)
{
...
...
src/smallruler.h
View file @
f6071883
...
...
@@ -37,6 +37,7 @@ public:
void
setZone
(
int
start
,
int
end
);
QPoint
zone
();
void
setMarkers
(
QList
<
int
>
list
);
int
position
()
const
;
protected:
virtual
void
paintEvent
(
QPaintEvent
*
e
);
...
...
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