Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
98bc1309
Commit
98bc1309
authored
Jul 31, 2021
by
Jean-Baptiste Mardelle
Browse files
Fix some warnings
parent
2a0c6c03
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/dialogs/timeremap.cpp
View file @
98bc1309
...
...
@@ -1592,7 +1592,6 @@ TimeRemap::TimeRemap(QWidget *parent)
connect
(
pitch_compensate
,
&
QCheckBox
::
toggled
,
this
,
&
TimeRemap
::
switchRemapParam
);
connect
(
frame_blending
,
&
QCheckBox
::
toggled
,
this
,
&
TimeRemap
::
switchRemapParam
);
connect
(
m_view
,
&
RemapView
::
updateMaxDuration
,
[
this
](
int
duration
)
{
int
min
=
m_in
->
minimum
();
m_out
->
setRange
(
0
,
INT_MAX
);
//m_in->setRange(0, duration - 1);
});
...
...
@@ -1604,7 +1603,7 @@ const QString &TimeRemap::currentClip() const
return
m_binId
;
}
void
TimeRemap
::
checkClipUpdate
(
const
QModelIndex
&
topLeft
,
const
QModelIndex
&
bottomRight
,
const
QVector
<
int
>&
roles
)
void
TimeRemap
::
checkClipUpdate
(
const
QModelIndex
&
topLeft
,
const
QModelIndex
&
,
const
QVector
<
int
>&
roles
)
{
int
id
=
int
(
topLeft
.
internalId
());
if
(
m_cid
!=
id
||
!
roles
.
contains
(
TimelineModel
::
FinalMoveRole
))
{
...
...
@@ -1652,12 +1651,10 @@ void TimeRemap::selectedClip(int cid)
return
;
}
m_view
->
m_remapLink
.
reset
();
bool
keyframesLoaded
=
false
;
connect
(
model
.
get
(),
&
TimelineItemModel
::
dataChanged
,
this
,
&
TimeRemap
::
checkClipUpdate
);
model
->
requestClipTimeRemap
(
cid
);
m_splitId
=
model
->
m_groups
->
getSplitPartner
(
cid
);
m_binId
=
model
->
getClipBinId
(
cid
);
int
min
=
pCore
->
getItemIn
({
ObjectType
::
TimelineClip
,
cid
});
m_lastLength
=
pCore
->
getItemDuration
({
ObjectType
::
TimelineClip
,
cid
});
m_view
->
m_startPos
=
pCore
->
getItemPosition
({
ObjectType
::
TimelineClip
,
cid
});
std
::
shared_ptr
<
Mlt
::
Producer
>
prod
=
model
->
getClipProducer
(
cid
);
...
...
@@ -1697,7 +1694,6 @@ void TimeRemap::selectedClip(int cid)
QSignalBlocker
bk2
(
frame_blending
);
pitch_compensate
->
setChecked
(
fromLink
->
get_int
(
"pitch"
)
==
1
);
frame_blending
->
setChecked
(
fromLink
->
get
(
"image_mode"
)
==
QLatin1String
(
"blend"
));
keyframesLoaded
=
true
;
setEnabled
(
true
);
break
;
}
...
...
src/timeline2/model/clipmodel.cpp
View file @
98bc1309
...
...
@@ -717,7 +717,7 @@ void ClipModel::refreshProducerFromBin(int trackId, PlaylistState::ClipState sta
qDebug
()
<<
"changing speed"
<<
in
<<
out
<<
m_speed
;
}
QString
remapMap
;
int
remapPitch
;
int
remapPitch
=
0
;
QString
remapBlend
;
if
(
m_hasTimeRemap
)
{
if
(
m_producer
->
parent
().
type
()
==
mlt_service_chain_type
)
{
...
...
src/timeline2/model/trackmodel.hpp
View file @
98bc1309
...
...
@@ -44,11 +44,11 @@ public:
int
firstClipId
=
-
1
;
int
secondClipId
=
-
1
;
/** @brief in and out of the first clip in the mix */
std
::
pair
<
int
,
int
>
firstClipInOut
;
std
::
pair
<
int
,
int
>
firstClipInOut
=
{
-
1
,
-
1
}
;
/** @brief in and out of the second clip in the mix */
std
::
pair
<
int
,
int
>
secondClipInOut
;
std
::
pair
<
int
,
int
>
secondClipInOut
=
{
-
1
,
-
1
}
;
/** @brief Distance between first clip out and cut pos */
int
mixOffset
;
int
mixOffset
=
0
;
};
/** @brief This class represents a Track object, as viewed by the backend.
...
...
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