packages/ukui-media
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!73 fix ukui-volume-control-applet-qt work error

Browse Source 
From: @peijiankang 
Reviewed-by: @hua_yadong 
Signed-off-by: @hua_yadong
This commit is contained in:
openeuler-ci-bot 2023-01-12 09:35:44 +00:00 committed by Gitee
commit 35600369ab
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
0002-fix-ukui-volume-control-applet-qt-work-error.patch
View File

@ -1,48 +1,46 @@
From ae9669d82eaa4e346e6587b4a1254db75e5c838b Mon Sep 17 00:00:00 2001
From ce6b7033cd4d546040eeb3851f8e2d00fac87048 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Fri, 30 Dec 2022 15:19:54 +0800
Date: Thu, 12 Jan 2023 15:09:23 +0800
Subject: [PATCH] fix ukui-volume-control-applet-qt work error
---
ukui-volume-control-applet-qt/ukmedia_main_widget.cpp | 4 ++++
1 file changed, 4 insertions(+)
ukui-volume-control-applet-qt/ukmedia_main_widget.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp b/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp
index a6dd72d..3bf86b2 100644
index a6dd72d..a57919a 100644
--- a/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp
+++ b/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp
@@ -323,6 +323,7 @@ void UkmediaMainWidget::initDefaultSinkVolume()
if(outputCardName.contains(BLUEZ,Qt::CaseInsensitive))
volume = OUTPUT_VOLUME;
m_pVolumeControl->setSinkVolume(m_pVolumeControl->sinkIndex,volume);
+ m_pVolumeControl->setSinkMute(false);
m_pVolumeControl->customSoundFile->addXmlNode(m_pVolumeControl->sinkPortName,false);
qDebug() << "初始化输出音量为:" << volume ;
if (temp != "")
@@ -333,6 +334,7 @@ void UkmediaMainWidget::initDefaultSinkVolume()
{
volume = OUTPUT_VOLUME;
m_pVolumeControl->setSinkVolume(m_pVolumeControl->sinkIndex,volume);
+ m_pVolumeControl->setSinkMute(false);
m_pVolumeControl->customSoundFile->addXmlNode(m_pVolumeControl->defaultSinkName,false);
qDebug()<< "初始化音量SinkPortName不存在的情况" << volume;
}
@@ -346,6 +348,7 @@ void UkmediaMainWidget::initDefaultSourceVolume()
{
m_pVolumeControl->customSoundFile->addXmlNode(m_pVolumeControl->defaultSourceName,false);
m_pVolumeControl->setSourceVolume(m_pVolumeControl->sourceIndex,MIC_VOLUME);
+ m_pVolumeControl->setSourceMute(false);
qDebug()<< "初始化音量SourcePortName不存在的情况" <<m_pVolumeControl->defaultSourceName ;
@@ -3203,8 +3203,8 @@ void UkmediaMainWidget::switchModuleEchoCancel()
if ( strstr(m_pVolumeControl->defaultSourceName,"alsa_input") && !strstr(m_pVolumeControl->defaultSourceName,"input.usb")) {
sourceState = true;
}
- qDebug() << "switchModuleEchoCancel" << m_pVolumeControl->defaultSourceName << switchState << sourceState;
- if (switchState && sourceState && !isLoadEchoCancel && !strstr(m_pVolumeControl->defaultSourceName,"noiseReduceSource")) {
+ qDebug() << "switchModuleEchoCancel" << "loadechocancel"<< isLoadEchoCancel << m_pVolumeControl->defaultSourceName << switchState << sourceState;
+ if (switchState && sourceState) {
pa_operation *o;
qDebug() << "load module echo cancel";
isLoadEchoCancel = true;
@@ -3212,7 +3212,7 @@ void UkmediaMainWidget::switchModuleEchoCancel()
m_pVolumeControl->showError(QObject::tr("pa_context_load_module() failed").toUtf8().constData());
}
}
- else {
+ else if (strstr(m_pVolumeControl->defaultSourceName,"noiseReduceSource") && !switchState) {
isLoadEchoCancel = false;
m_pVolumeControl->getModuleIndexByName("module-echo-cancel");
@@ -353,6 +356,7 @@ void UkmediaMainWidget::initDefaultSourceVolume()
{
m_pVolumeControl->customSoundFile->addXmlNode(m_pVolumeControl->sourcePortName,false);
m_pVolumeControl->setSourceVolume(m_pVolumeControl->sourceIndex,MIC_VOLUME);
+ m_pVolumeControl->setSourceMute(false);
qDebug() << "初始化输入音量为100" ;
@@ -3221,6 +3221,9 @@ void UkmediaMainWidget::switchModuleEchoCancel()
pa_context_unload_module(m_pVolumeControl->getContext(),m_pVolumeControl->findModuleIndex,nullptr,nullptr);
});
}
+ else {
+ isLoadEchoCancel = false;
+ }
}
UkmediaMainWidget::~UkmediaMainWidget()
--
2.33.0