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
14
Merge Requests
14
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
f6a35ed8
Commit
f6a35ed8
authored
May 14, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
src/audiomixer/mixerwidget.cpp
src/audiomixer/mixerwidget.cpp
+6
-3
src/audiomixer/mixerwidget.hpp
src/audiomixer/mixerwidget.hpp
+1
-0
No files found.
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