Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
0b999e9c
Commit
0b999e9c
authored
Jul 24, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reversed clips: fix audio thumbnails incorrect and markers position.
Fixes
#89
parent
60b313db
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
src/timeline2/view/qml/Clip.qml
src/timeline2/view/qml/Clip.qml
+1
-1
src/timeline2/view/qml/ClipAudioThumbs.qml
src/timeline2/view/qml/ClipAudioThumbs.qml
+1
-1
src/timeline2/view/qml/timelineitems.cpp
src/timeline2/view/qml/timelineitems.cpp
+1
-1
No files found.
src/timeline2/view/qml/Clip.qml
View file @
0b999e9c
...
...
@@ -341,7 +341,7 @@ Rectangle {
id
:
markerBase
width
:
1
height
:
parent
.
height
x
:
clipRoot
.
speed
<
0
?
clipRoot
.
clip
Duration
*
timeScale
+
(
Math
.
round
(
model
.
frame
/
clipRoot
.
speed
)
-
(
clipRoot
.
maxDuration
-
clipRoot
.
outPoint
)
)
*
timeScale
-
clipRoot
.
border
.
width
:
(
Math
.
round
(
model
.
frame
/
clipRoot
.
speed
)
-
clipRoot
.
inPoint
)
*
timeScale
-
clipRoot
.
border
.
width
;
x
:
clipRoot
.
speed
<
0
?
(
clipRoot
.
max
Duration
-
clipRoot
.
inPoint
)
*
timeScale
+
(
Math
.
round
(
model
.
frame
/
clipRoot
.
speed
))
*
timeScale
-
clipRoot
.
border
.
width
:
(
Math
.
round
(
model
.
frame
/
clipRoot
.
speed
)
-
clipRoot
.
inPoint
)
*
timeScale
-
clipRoot
.
border
.
width
;
color
:
model
.
color
}
Rectangle
{
...
...
src/timeline2/view/qml/ClipAudioThumbs.qml
View file @
0b999e9c
...
...
@@ -51,7 +51,7 @@ Row {
format
:
timeline
.
audioThumbFormat
drawInPoint
:
Math
.
max
(
0
,
clipRoot
.
scrollStart
-
(
index
*
waveform
.
maxWidth
))
drawOutPoint
:
(
clipRoot
.
scrollStart
+
scrollView
.
width
-
(
index
*
waveform
.
maxWidth
))
waveInPoint
:
clipRoot
.
speed
<
0
?
(
Math
.
round
(
clipRoot
.
outPoint
-
(
index
*
waveform
.
maxWidth
/
clipRoot
.
timeScale
)
*
Math
.
abs
(
clipRoot
.
speed
))
*
channels
)
:
(
Math
.
round
((
clipRoot
.
inPoint
+
(
index
*
waveform
.
maxWidth
/
clipRoot
.
timeScale
))
*
clipRoot
.
speed
)
*
channels
)
waveInPoint
:
clipRoot
.
speed
<
0
?
(
Math
.
round
(
(
clipRoot
.
maxDuration
-
1
-
clipRoot
.
inPoint
)
*
Math
.
abs
(
clipRoot
.
speed
)
-
(
index
*
waveform
.
maxWidth
/
clipRoot
.
timeScale
)
*
Math
.
abs
(
clipRoot
.
speed
))
*
channels
)
:
(
Math
.
round
((
clipRoot
.
inPoint
+
(
index
*
waveform
.
maxWidth
/
clipRoot
.
timeScale
))
*
clipRoot
.
speed
)
*
channels
)
waveOutPoint
:
clipRoot
.
speed
<
0
?
(
waveInPoint
-
Math
.
ceil
(
width
/
clipRoot
.
timeScale
*
Math
.
abs
(
clipRoot
.
speed
))
*
channels
)
:
(
waveInPoint
+
Math
.
round
(
width
/
clipRoot
.
timeScale
*
clipRoot
.
speed
)
*
channels
)
fillColor1
:
root
.
thumbColor1
fillColor2
:
root
.
thumbColor2
...
...
src/timeline2/view/qml/timelineitems.cpp
View file @
0b999e9c
...
...
@@ -139,7 +139,7 @@ public:
}
}
qreal
indicesPrPixel
=
qreal
(
m_outPoint
-
m_inPoint
)
/
width
()
*
m_precisionFactor
;
//qDebug()<<"== GOT DIMENSIONS FOR WAVE: "<<
(
m_
out
Point
- m_in
Point
)
<<", WID: "<<width();
//qDebug()<<"== GOT DIMENSIONS FOR WAVE: "<<m_
in
Point
<<"-"<<m_out
Point<<", WID: "<<width();
QPen
pen
=
painter
->
pen
();
pen
.
setColor
(
m_color
);
painter
->
setBrush
(
m_color
);
...
...
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