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
f6a35ed8
Commit
f6a35ed8
authored
May 14, 2020
by
Jean-Baptiste Mardelle
Browse files
Remember project channels in audio mixer when no audio
parent
9f5eea45
Pipeline
#20164
passed with stage
in 9 minutes and 22 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/audiomixer/mixerwidget.cpp
View file @
f6a35ed8
...
...
@@ -150,7 +150,10 @@ void MixerWidget::buildUI(Mlt::Tractor *service, const QString &trackTag)
// Build audio meter widget
m_audioMeterWidget
.
reset
(
new
AudioLevelWidget
(
width
(),
this
));
// initialize for stereo display
m_audioMeterWidget
->
setAudioValues
({
-
100
,
-
100
});
for
(
int
i
=
0
;
i
<
m_channels
;
i
++
)
{
m_audioData
<<
-
100
;
}
m_audioMeterWidget
->
setAudioValues
(
m_audioData
);
// Build volume widget
m_volumeSlider
=
new
QSlider
(
Qt
::
Vertical
,
this
);
...
...
@@ -414,7 +417,7 @@ void MixerWidget::updateAudioLevel(int pos)
m_audioMeterWidget
->
setAudioValues
(
m_levels
.
value
(
pos
));
//m_levels.remove(pos);
}
else
{
m_audioMeterWidget
->
setAudioValues
(
{
-
100
,
-
100
}
);
m_audioMeterWidget
->
setAudioValues
(
m_audioData
);
}
}
...
...
@@ -423,7 +426,7 @@ void MixerWidget::reset()
{
QMutexLocker
lk
(
&
m_storeMutex
);
m_levels
.
clear
();
m_audioMeterWidget
->
setAudioValues
(
{
-
100
,
-
100
}
);
m_audioMeterWidget
->
setAudioValues
(
m_audioData
);
}
void
MixerWidget
::
clear
()
...
...
src/audiomixer/mixerwidget.hpp
View file @
f6a35ed8
...
...
@@ -104,6 +104,7 @@ private:
QLabel
*
m_trackLabel
;
QMutex
m_storeMutex
;
int
m_lastVolume
;
QVector
<
double
>
m_audioData
;
Mlt
::
Event
*
m_listener
;
bool
m_recording
;
/** @Update track label to reflect state */
...
...
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