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
41e87260
Commit
41e87260
authored
Oct 02, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix audio mixer track effects applied twice when reopening project, leading to incorrect volume.
Fixes
#792
parent
9a94ca4e
Pipeline
#36222
passed with stage
in 12 minutes and 10 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/audiomixer/mixerwidget.cpp
View file @
41e87260
...
...
@@ -200,7 +200,7 @@ void MixerWidget::buildUI(Mlt::Tractor *service, const QString &trackTag)
m_monitorFilter
->
set
(
"disable"
,
0
);
}
else
if
(
filterService
==
QLatin1String
(
"volume"
))
{
m_levelFilter
=
fl
;
int
volume
=
m_levelFilter
->
get_
int
(
"level"
);
double
volume
=
m_levelFilter
->
get_
double
(
"level"
);
m_volumeSpin
->
setValue
(
volume
);
m_volumeSlider
->
setValue
(
fromDB
(
volume
));
}
else
if
(
filterService
==
QLatin1String
(
"panner"
))
{
...
...
src/effects/effectstack/model/effectstackmodel.cpp
View file @
41e87260
...
...
@@ -916,7 +916,8 @@ void EffectStackModel::importEffects(const std::weak_ptr<Mlt::Service> &service,
int
imported
=
0
;
for
(
int
i
=
0
;
i
<
max
;
i
++
)
{
std
::
unique_ptr
<
Mlt
::
Filter
>
filter
(
ptr
->
filter
(
i
));
if
(
filter
->
get_int
(
"internal_added"
)
>
0
)
{
if
(
filter
->
get_int
(
"internal_added"
)
>
0
&&
m_ownerId
.
first
!=
ObjectType
::
TimelineTrack
)
{
// Required to load master audio effects
if
(
auto
ms
=
m_masterService
.
lock
())
{
ms
->
attach
(
*
filter
.
get
());
}
...
...
Write
Preview
Supports
Markdown
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