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
321f45f6
Commit
321f45f6
authored
May 17, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wrong stream imported by default on multistream clips
Fixes
#187
parent
bcbbdbba
Pipeline
#3593
passed with stage
in 13 minutes and 42 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
src/jobs/loadjob.cpp
src/jobs/loadjob.cpp
+4
-3
No files found.
src/jobs/loadjob.cpp
View file @
321f45f6
...
...
@@ -474,7 +474,7 @@ void LoadJob::processMultiStream()
QLabel
*
lab1
=
new
QLabel
(
i18n
(
"Additional streams for clip
\n
%1"
,
m_resource
),
mainWidget
);
mainLayout
->
addWidget
(
lab1
);
QList
<
QGroupBox
*>
groupList
;
QList
<
K
ComboBox
*>
comboList
;
QList
<
Q
ComboBox
*>
comboList
;
// We start loading the list at 1, video index 0 should already be loaded
for
(
int
j
=
1
;
j
<
m_video_list
.
count
();
++
j
)
{
m_producer
->
set
(
"video_index"
,
m_video_list
.
at
(
j
));
...
...
@@ -492,7 +492,7 @@ void LoadJob::processMultiStream()
iconLabel
->
setPixmap
(
QPixmap
::
fromImage
(
thumb
));
vh
->
addWidget
(
iconLabel
);
if
(
m_audio_list
.
count
()
>
1
)
{
auto
*
cb
=
new
K
ComboBox
(
mainWidget
);
auto
*
cb
=
new
Q
ComboBox
(
mainWidget
);
mainLayout
->
addWidget
(
cb
);
for
(
int
k
=
0
;
k
<
m_audio_list
.
count
();
++
k
)
{
cb
->
addItem
(
i18n
(
"Audio stream %1"
,
m_audio_list
.
at
(
k
)),
m_audio_list
.
at
(
k
));
...
...
@@ -503,6 +503,7 @@ void LoadJob::processMultiStream()
}
mainLayout
->
addWidget
(
streamFrame
);
}
m_producer
->
set
(
"video_index"
,
m_video_list
.
at
(
0
));
mainLayout
->
addWidget
(
buttonBox
);
if
(
dialog
->
exec
()
==
QDialog
::
Accepted
)
{
// import selected streams
...
...
@@ -518,8 +519,8 @@ void LoadJob::processMultiStream()
addStream
(
vindex
,
aindex
,
undo
,
redo
);
}
}
pCore
->
pushUndo
(
undo
,
redo
,
i18n
(
"Add additional streams for clip"
));
}
pCore
->
pushUndo
(
undo
,
redo
,
i18n
(
"Add additional streams for clip"
));
}
bool
LoadJob
::
commitResult
(
Fun
&
undo
,
Fun
&
redo
)
...
...
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