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
261
Issues
261
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
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
85d70754
Commit
85d70754
authored
Oct 13, 2019
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Audio mixer: move master on the right, remember settings on project opening
parent
fdc1d07a
Pipeline
#8926
passed with stage
in 15 minutes and 56 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
5 deletions
+24
-5
src/audiomixer/mixermanager.cpp
src/audiomixer/mixermanager.cpp
+10
-3
src/audiomixer/mixermanager.hpp
src/audiomixer/mixermanager.hpp
+1
-0
src/audiomixer/mixerwidget.cpp
src/audiomixer/mixerwidget.cpp
+6
-1
src/effects/effectstack/model/effectstackmodel.cpp
src/effects/effectstack/model/effectstackmodel.cpp
+7
-1
No files found.
src/audiomixer/mixermanager.cpp
View file @
85d70754
...
...
@@ -45,8 +45,10 @@ MixerManager::MixerManager(QWidget *parent)
,
renderPosition
(
0
)
,
m_connectedWidgets
(
0
)
{
m_masterBox
=
new
QHBoxLayout
;
m_box
=
new
QHBoxLayout
;
m_box
->
addStretch
(
10
);
m_box
->
addLayout
(
m_masterBox
);
setLayout
(
m_box
);
m_timer
.
setSingleShot
(
true
);
m_timer
.
setInterval
(
100
);
...
...
@@ -117,7 +119,12 @@ void MixerManager::resetAudioValues()
void
MixerManager
::
cleanup
()
{
for
(
auto
item
:
m_mixers
)
{
m_box
->
removeWidget
(
item
.
second
.
get
());
if
(
item
.
first
>
-
1
)
{
m_box
->
removeWidget
(
item
.
second
.
get
());
}
}
while
(
!
m_masterBox
->
isEmpty
())
{
m_masterBox
->
takeAt
(
0
);
}
m_mixers
.
clear
();
m_connectedWidgets
=
0
;
...
...
@@ -142,7 +149,7 @@ void MixerManager::setModel(std::shared_ptr<TimelineItemModel> model)
Mlt
::
Tractor
*
service
=
model
->
tractor
();
if
(
m_mixers
.
count
(
tid
)
>
0
)
{
// delete previous master mixer
m_
b
ox
->
removeWidget
(
m_mixers
[
tid
].
get
());
m_
masterB
ox
->
removeWidget
(
m_mixers
[
tid
].
get
());
m_mixers
.
erase
(
tid
);
}
std
::
shared_ptr
<
MixerWidget
>
mixer
(
new
MixerWidget
(
tid
,
service
,
i18n
(
"Master"
),
this
));
...
...
@@ -152,6 +159,6 @@ void MixerManager::setModel(std::shared_ptr<TimelineItemModel> model)
});
connect
(
this
,
&
MixerManager
::
updateLevels
,
mixer
.
get
(),
&
MixerWidget
::
updateAudioLevel
);
m_mixers
[
tid
]
=
mixer
;
m_
box
->
insertWidget
(
0
,
mixer
.
get
());
m_
masterBox
->
addWidget
(
mixer
.
get
());
}
src/audiomixer/mixermanager.hpp
View file @
85d70754
...
...
@@ -67,6 +67,7 @@ private:
std
::
shared_ptr
<
Mlt
::
Tractor
>
m_masterService
;
std
::
shared_ptr
<
TimelineItemModel
>
m_model
;
QHBoxLayout
*
m_box
;
QHBoxLayout
*
m_masterBox
;
QTimer
m_timer
;
int
m_lastFrame
;
int
m_connectedWidgets
;
...
...
src/audiomixer/mixerwidget.cpp
View file @
85d70754
...
...
@@ -129,7 +129,9 @@ void MixerWidget::buildUI(Mlt::Tractor *service, const QString &trackTag)
m_monitorFilter
=
fl
;
}
else
if
(
filterService
==
QLatin1String
(
"volume"
))
{
m_levelFilter
=
fl
;
m_volumeSlider
->
setValue
(
m_levelFilter
->
get_int
(
"level"
));
int
volume
=
m_levelFilter
->
get_int
(
"level"
);
m_volumeSpin
->
setValue
(
volume
);
m_volumeSlider
->
setValue
(
volume
);
}
else
if
(
filterService
==
QLatin1String
(
"panner"
))
{
m_balanceFilter
=
fl
;
m_balanceSpin
->
setValue
(
m_balanceFilter
->
get_double
(
"start"
)
*
100
+
50
);
...
...
@@ -139,12 +141,14 @@ void MixerWidget::buildUI(Mlt::Tractor *service, const QString &trackTag)
if
(
m_levelFilter
==
nullptr
)
{
m_levelFilter
.
reset
(
new
Mlt
::
Filter
(
service
->
get_profile
(),
"volume"
));
if
(
m_levelFilter
->
is_valid
())
{
m_levelFilter
->
set
(
"internal_added"
,
237
);
service
->
attach
(
*
m_levelFilter
.
get
());
}
}
if
(
m_balanceFilter
==
nullptr
)
{
m_balanceFilter
.
reset
(
new
Mlt
::
Filter
(
service
->
get_profile
(),
"panner"
));
if
(
m_balanceFilter
->
is_valid
())
{
m_balanceFilter
->
set
(
"internal_added"
,
237
);
service
->
attach
(
*
m_balanceFilter
.
get
());
}
}
...
...
@@ -196,6 +200,7 @@ void MixerWidget::buildUI(Mlt::Tractor *service, const QString &trackTag)
}
connect
(
m_volumeSlider
,
&
QSlider
::
valueChanged
,
[
&
](
int
value
)
{
QSignalBlocker
bk
(
m_volumeSpin
);
m_volumeSpin
->
setValue
(
value
);
if
(
m_levelFilter
!=
nullptr
)
{
m_levelFilter
->
set
(
"level"
,
value
);
...
...
src/effects/effectstack/model/effectstackmodel.cpp
View file @
85d70754
...
...
@@ -864,7 +864,13 @@ void EffectStackModel::importEffects(const std::weak_ptr<Mlt::Service> &service,
m_loadingExisting
=
alreadyExist
;
if
(
auto
ptr
=
service
.
lock
())
{
for
(
int
i
=
0
;
i
<
ptr
->
filter_count
();
i
++
)
{
std
::
unique_ptr
<
Mlt
::
Service
>
filter
(
ptr
->
filter
(
i
));
std
::
unique_ptr
<
Mlt
::
Filter
>
filter
(
ptr
->
filter
(
i
));
if
(
filter
->
get_int
(
"internal_added"
)
>
0
)
{
if
(
auto
ms
=
m_masterService
.
lock
())
{
ms
->
attach
(
*
filter
.
get
());
}
continue
;
}
if
(
filter
->
get
(
"kdenlive_id"
)
==
nullptr
)
{
// don't consider internal MLT stuff
continue
;
...
...
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