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
258
Issues
258
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
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
13f180f9
Commit
13f180f9
authored
May 15, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dragging multistream clip using target tracks
parent
efad2514
Pipeline
#20216
passed with stage
in 9 minutes and 32 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
src/timeline2/model/timelinemodel.cpp
src/timeline2/model/timelinemodel.cpp
+2
-2
src/timeline2/model/timelinemodel.hpp
src/timeline2/model/timelinemodel.hpp
+2
-0
src/timeline2/view/timelinecontroller.cpp
src/timeline2/view/timelinecontroller.cpp
+8
-8
src/timeline2/view/timelinecontroller.h
src/timeline2/view/timelinecontroller.h
+0
-2
No files found.
src/timeline2/model/timelinemodel.cpp
View file @
13f180f9
...
...
@@ -1072,7 +1072,7 @@ bool TimelineModel::requestClipInsertion(const QString &binClipId, int trackId,
QMap
<
int
,
int
>
dropTargets
;
if
(
res
&&
(
canMirrorDrop
||
!
target_track
.
isEmpty
())
&&
master
->
hasAudioAndVideo
())
{
if
(
!
useTargets
)
{
int
streamsCount
=
m_
audioTarget
.
keys
().
count
();
int
streamsCount
=
m_
binAudioTargets
.
keys
().
count
();
target_track
=
{
mirror
};
QList
<
int
>
audioTids
=
getLowerTracksId
(
mirror
,
TrackType
::
AudioTrack
);
if
(
streamsCount
>
audioTids
.
count
()
+
1
)
{
...
...
@@ -1085,7 +1085,7 @@ bool TimelineModel::requestClipInsertion(const QString &binClipId, int trackId,
streamsCount
--
;
}
}
QList
<
int
>
aTargets
=
m_
audioTarget
.
value
s
();
QList
<
int
>
aTargets
=
m_
binAudioTargets
.
key
s
();
std
::
sort
(
aTargets
.
begin
(),
aTargets
.
end
());
for
(
int
i
=
0
;
i
<
target_track
.
count
();
++
i
)
{
dropTargets
.
insert
(
target_track
.
at
(
i
),
aTargets
.
at
(
i
));
...
...
src/timeline2/model/timelinemodel.hpp
View file @
13f180f9
...
...
@@ -822,6 +822,8 @@ protected:
// The preferred audio target for clip insertion in the form {timeline track id, bin clip stream index}
QMap
<
int
,
int
>
m_audioTarget
;
/** @brief The list of audio streams available from the selected bin clip, in the form: {stream index, stream description} */
QMap
<
int
,
QString
>
m_binAudioTargets
;
// The preferred video target for clip insertion or -1 if not defined
int
m_videoTarget
;
// Timeline editing mode
...
...
src/timeline2/view/timelinecontroller.cpp
View file @
13f180f9
...
...
@@ -120,7 +120,7 @@ void TimelineController::setModel(std::shared_ptr<TimelineItemModel> model)
void
TimelineController
::
setTargetTracks
(
bool
hasVideo
,
QMap
<
int
,
QString
>
audioTargets
)
{
int
videoTrack
=
-
1
;
m_binAudioTargets
=
audioTargets
;
m_
model
->
m_
binAudioTargets
=
audioTargets
;
QMap
<
int
,
int
>
audioTracks
;
m_hasVideoTarget
=
hasVideo
;
m_hasAudioTarget
=
audioTargets
.
size
();
...
...
@@ -1161,7 +1161,7 @@ void TimelineController::assignAudioTarget(int trackId, int stream)
int
TimelineController
::
getFirstUnassignedStream
()
const
{
QList
<
int
>
keys
=
m_binAudioTargets
.
keys
();
QList
<
int
>
keys
=
m_
model
->
m_
binAudioTargets
.
keys
();
QList
<
int
>
assigned
=
m_model
->
m_audioTarget
.
values
();
for
(
int
k
:
keys
)
{
if
(
!
assigned
.
contains
(
k
))
{
...
...
@@ -2431,13 +2431,13 @@ QVariantList TimelineController::lastAudioTarget() const
const
QString
TimelineController
::
audioTargetName
(
int
tid
)
const
{
if
(
m_model
->
m_audioTarget
.
contains
(
tid
)
&&
m_binAudioTargets
.
size
()
>
1
)
{
if
(
m_model
->
m_audioTarget
.
contains
(
tid
)
&&
m_
model
->
m_
binAudioTargets
.
size
()
>
1
)
{
int
streamIndex
=
m_model
->
m_audioTarget
.
value
(
tid
);
if
(
m_binAudioTargets
.
contains
(
streamIndex
))
{
QString
targetName
=
m_binAudioTargets
.
value
(
streamIndex
);
if
(
m_
model
->
m_
binAudioTargets
.
contains
(
streamIndex
))
{
QString
targetName
=
m_
model
->
m_
binAudioTargets
.
value
(
streamIndex
);
return
targetName
.
isEmpty
()
?
QChar
(
'x'
)
:
targetName
.
at
(
0
);
}
else
{
qDebug
()
<<
"STREAM INDEX NOT IN TARGET : "
<<
streamIndex
<<
" = "
<<
m_binAudioTargets
;
qDebug
()
<<
"STREAM INDEX NOT IN TARGET : "
<<
streamIndex
<<
" = "
<<
m_
model
->
m_
binAudioTargets
;
}
}
else
{
qDebug
()
<<
"TRACK NOT IN TARGET : "
<<
tid
<<
" = "
<<
m_model
->
m_audioTarget
.
keys
();
...
...
@@ -3381,7 +3381,7 @@ void TimelineController::expandActiveClip()
QMap
<
int
,
QString
>
TimelineController
::
getCurrentTargets
(
int
trackId
,
int
&
activeTargetStream
)
{
if
(
m_binAudioTargets
.
size
()
<
2
)
{
if
(
m_
model
->
m_
binAudioTargets
.
size
()
<
2
)
{
activeTargetStream
=
-
1
;
return
QMap
<
int
,
QString
>
();
}
...
...
@@ -3390,7 +3390,7 @@ QMap <int, QString> TimelineController::getCurrentTargets(int trackId, int &acti
}
else
{
activeTargetStream
=
-
1
;
}
return
m_binAudioTargets
;
return
m_
model
->
m_
binAudioTargets
;
}
void
TimelineController
::
addTracks
(
int
videoTracks
,
int
audioTracks
)
...
...
src/timeline2/view/timelinecontroller.h
View file @
13f180f9
...
...
@@ -589,8 +589,6 @@ private:
int
m_hasAudioTarget
{
0
};
bool
m_hasVideoTarget
{
false
};
int
m_lastVideoTarget
{
-
1
};
/** @brief The list of audio streams available from the selected bin clip, in the form: {stream index, stream description} */
QMap
<
int
,
QString
>
m_binAudioTargets
;
/** @brief The last combination of audio targets in the form: {timeline track id, bin stream index} */
QMap
<
int
,
int
>
m_lastAudioTarget
;
bool
m_videoTargetActive
{
true
};
...
...
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