76 lines
3.6 KiB
Diff
76 lines
3.6 KiB
Diff
From 73b3469f25ac345abb66621b9cb34cdd2839e3f6 Mon Sep 17 00:00:00 2001
|
|
From: luoqing <luoqing@kylinsec.com.cn>
|
|
Date: Mon, 27 Mar 2023 16:34:04 +0800
|
|
Subject: [PATCH 2/2] fix(audio):Fix an error where the sound output left/right
|
|
balance function fails
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 修复声音输出左/右平衡功能失效的错误
|
|
---
|
|
plugins/audio/src/plugin/input-page.cpp | 4 ++--
|
|
plugins/audio/src/plugin/output-page.cpp | 8 ++++----
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/plugins/audio/src/plugin/input-page.cpp b/plugins/audio/src/plugin/input-page.cpp
|
|
index e9f5018..00826b4 100644
|
|
--- a/plugins/audio/src/plugin/input-page.cpp
|
|
+++ b/plugins/audio/src/plugin/input-page.cpp
|
|
@@ -256,7 +256,7 @@ void InputPage::initInputSettins()
|
|
|
|
void InputPage::initConnet()
|
|
{
|
|
- connect(ui->inputDevices, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), [=](int index)
|
|
+ connect(ui->inputDevices, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), [this](int index)
|
|
{
|
|
QString namePort = ui->inputDevices->itemData(index, Qt::UserRole).toString();
|
|
if (!namePort.isNull())
|
|
@@ -272,7 +272,7 @@ void InputPage::initConnet()
|
|
else
|
|
KLOG_DEBUG() << "namePort is null"; });
|
|
|
|
- connect(ui->volumeSetting, &QSlider::valueChanged, [=](int value)
|
|
+ connect(ui->volumeSetting, &QSlider::valueChanged, [this](int value)
|
|
{
|
|
double volumeValue = static_cast<double>(value) / static_cast<double>(100);
|
|
if (m_defaultSource != nullptr)
|
|
diff --git a/plugins/audio/src/plugin/output-page.cpp b/plugins/audio/src/plugin/output-page.cpp
|
|
index b28ba53..ef52165 100644
|
|
--- a/plugins/audio/src/plugin/output-page.cpp
|
|
+++ b/plugins/audio/src/plugin/output-page.cpp
|
|
@@ -167,7 +167,7 @@ void OutputPage::initConnect()
|
|
connect(m_audioInterface, &AudioInterface::SinkDelete, this, &OutputPage::handleSinkDelete);
|
|
connect(m_audioInterface, &AudioInterface::DefaultSinkChange, this, &OutputPage::handleDefaultSinkChanged, Qt::QueuedConnection);
|
|
|
|
- connect(ui->outputDevices, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [=](int index)
|
|
+ connect(ui->outputDevices, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [this](int index)
|
|
{
|
|
QString namePort = ui->outputDevices->itemData(index, Qt::UserRole).toString();
|
|
KLOG_DEBUG() << "SetActivePort:" << namePort;
|
|
@@ -176,7 +176,7 @@ void OutputPage::initConnect()
|
|
else
|
|
KLOG_DEBUG() << "m_defaultSink is null"; });
|
|
|
|
- connect(ui->volumeSetting, &QSlider::valueChanged, [=](int value)
|
|
+ connect(ui->volumeSetting, &QSlider::valueChanged, [this](int value)
|
|
{
|
|
double volumeValue = static_cast<double>(ui->volumeSetting->sliderPosition()) / static_cast<double>(100);
|
|
if(m_defaultSink != nullptr)
|
|
@@ -187,10 +187,10 @@ void OutputPage::initConnect()
|
|
else
|
|
KLOG_DEBUG() << "m_defaultSink is null"; });
|
|
|
|
- connect(ui->volumeBalance, &QSlider::valueChanged, [=](int value)
|
|
+ connect(ui->volumeBalance, &QSlider::valueChanged, [this](int value)
|
|
{
|
|
double balanceValue = static_cast<double>(value) / static_cast<double>(100);
|
|
- if (m_defaultSink == nullptr)
|
|
+ if (m_defaultSink != nullptr)
|
|
{
|
|
m_defaultSink->SetBalance(balanceValue);
|
|
KLOG_DEBUG() << "balanceValue" << balanceValue;
|
|
--
|
|
2.33.0
|
|
|