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
0adfcd21
Commit
0adfcd21
authored
Nov 13, 2019
by
Jean-Baptiste Mardelle
Browse files
Fix compilation
parent
5d6f44a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/audiomixer/mixermanager.cpp
View file @
0adfcd21
...
...
@@ -132,7 +132,7 @@ void MixerManager::cleanup()
}
m_mixers
.
clear
();
if
(
m_masterMixer
)
{
m_masterMixer
->
clear
(
true
);
m_masterMixer
->
reset
(
);
}
}
...
...
src/audiomixer/mixerwidget.cpp
View file @
0adfcd21
...
...
@@ -240,7 +240,7 @@ void MixerWidget::buildUI(Mlt::Tractor *service, const QString &trackTag)
}
}
else
{
emit
muteTrack
(
m_tid
,
!
active
);
clear
(
true
);
reset
(
);
}
updateLabel
();
});
...
...
@@ -403,15 +403,21 @@ void MixerWidget::updateAudioLevel(int pos)
}
}
void
MixerWidget
::
clear
(
bool
reset
)
void
MixerWidget
::
reset
()
{
QMutexLocker
lk
(
&
m_storeMutex
);
m_levels
.
clear
();
m_audioMeterWidget
->
setAudioValues
({
-
100
,
-
100
});
}
void
MixerWidget
::
clear
()
{
if
(
reset
)
{
m_audioMeterWidget
->
setAudioValues
({
-
100
,
-
100
});
}
QMutexLocker
lk
(
&
m_storeMutex
);
m_levels
.
clear
();
}
bool
MixerWidget
::
isMute
()
const
{
return
m_muteAction
->
isActive
();
...
...
src/audiomixer/mixerwidget.hpp
View file @
0adfcd21
...
...
@@ -55,7 +55,9 @@ public:
virtual
~
MixerWidget
();
void
buildUI
(
Mlt
::
Tractor
*
service
,
const
QString
&
trackTag
);
/** @brief discard stored audio values and reset vu-meter to 0 if requested */
void
clear
(
bool
reset
=
false
);
void
reset
();
/** @brief discard stored audio values */
void
clear
();
static
void
property_changed
(
mlt_service
,
MixerWidget
*
self
,
char
*
name
);
void
setMute
(
bool
mute
);
/** @brief Returs true if track is muted
...
...
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