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
a94846c4
Commit
a94846c4
authored
Mar 31, 2021
by
Jean-Baptiste Mardelle
Browse files
unbreak audio spectrum
parent
fcc17c06
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/audiospectrum/audiographspectrum.cpp
View file @
a94846c4
...
...
@@ -140,7 +140,7 @@ AudioGraphWidget::AudioGraphWidget(QWidget *parent)
setSizePolicy
(
QSizePolicy
::
MinimumExpanding
,
QSizePolicy
::
MinimumExpanding
);
}
void
AudioGraphWidget
::
showAudio
(
const
QVector
<
double
>
&
bands
)
void
AudioGraphWidget
::
showAudio
(
const
QVector
<
float
>
&
bands
)
{
m_levels
=
bands
;
update
();
...
...
@@ -373,5 +373,5 @@ void AudioGraphSpectrum::processSpectrum(const SharedFrame &frame)
}
// Update the audio signal widget
QMetaObject
::
invokeMethod
(
m_graphWidget
,
"showAudio"
,
Qt
::
QueuedConnection
,
Q_ARG
(
const
QVector
<
double
>
&
,
bands
));
QMetaObject
::
invokeMethod
(
m_graphWidget
,
"showAudio"
,
Qt
::
QueuedConnection
,
Q_ARG
(
const
QVector
<
float
>
&
,
bands
));
}
src/audiospectrum/audiographspectrum.h
View file @
a94846c4
...
...
@@ -55,7 +55,7 @@ public:
void
drawBackground
();
public
slots
:
void
showAudio
(
const
QVector
<
double
>
&
bands
);
void
showAudio
(
const
QVector
<
float
>
&
bands
);
protected:
void
paintEvent
(
QPaintEvent
*
pe
);
...
...
src/monitor/scopes/audiographspectrum.cpp
View file @
a94846c4
...
...
@@ -144,7 +144,7 @@ AudioGraphWidget::AudioGraphWidget(QWidget *parent)
setSizePolicy
(
QSizePolicy
::
MinimumExpanding
,
QSizePolicy
::
MinimumExpanding
);
}
void
AudioGraphWidget
::
showAudio
(
const
QVector
<
double
>
&
bands
)
void
AudioGraphWidget
::
showAudio
(
const
QVector
<
float
>
&
bands
)
{
m_levels
=
bands
;
update
();
...
...
@@ -262,7 +262,7 @@ void AudioGraphWidget::paintEvent(QPaintEvent *pe)
p
.
setOpacity
(
0.6
);
QRectF
rect
(
m_rect
.
left
(),
0
,
barWidth
,
height
);
for
(
int
i
=
0
;
i
<
chanCount
;
i
++
)
{
double
level
=
(
0.5
+
m_levels
.
at
(
i
))
/
1.5
*
height
;
float
level
=
(
0.5
+
m_levels
.
at
(
i
))
/
1.5
*
height
;
if
(
level
<
0
)
{
continue
;
}
...
...
src/monitor/scopes/audiographspectrum.h
View file @
a94846c4
...
...
@@ -57,14 +57,14 @@ public:
void
drawBackground
();
public
slots
:
void
showAudio
(
const
QVector
<
double
>
&
bands
);
void
showAudio
(
const
QVector
<
float
>
&
bands
);
protected:
void
paintEvent
(
QPaintEvent
*
pe
)
override
;
void
resizeEvent
(
QResizeEvent
*
event
)
override
;
private:
QVector
<
double
>
m_levels
;
QVector
<
float
>
m_levels
;
QVector
<
int
>
m_dbLabels
;
QStringList
m_freqLabels
;
QPixmap
m_pixmap
;
...
...
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