From 5528656792906d5f2e7107b3cd9f877bbe3c0f88 Mon Sep 17 00:00:00 2001 From: dou33 Date: Thu, 9 May 2024 17:06:50 +0800 Subject: [PATCH] add 0004-fix-first-install-volume-not-mute.patch (cherry picked from commit c76e5dfd63316b242f9a376a0e18465310162037) --- 0004-fix-first-install-volume-not-mute.patch | 35 ++++++++++++++++++++ ukui-media.spec | 6 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0004-fix-first-install-volume-not-mute.patch diff --git a/0004-fix-first-install-volume-not-mute.patch b/0004-fix-first-install-volume-not-mute.patch new file mode 100644 index 0000000..324ebd5 --- /dev/null +++ b/0004-fix-first-install-volume-not-mute.patch @@ -0,0 +1,35 @@ +diff -Naur ukui-media-3.1.0/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp ukui-media-3.1.0~/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp +--- ukui-media-3.1.0/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp 2024-05-09 16:54:50.944895614 +0800 ++++ ukui-media-3.1.0~/ukui-volume-control-applet-qt/ukmedia_main_widget.cpp 2024-05-09 16:59:55.043191038 +0800 +@@ -323,6 +323,7 @@ + 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 @@ + { + 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 @@ + { + m_pVolumeControl->customSoundFile->addXmlNode(m_pVolumeControl->defaultSourceName,false); + m_pVolumeControl->setSourceVolume(m_pVolumeControl->sourceIndex,MIC_VOLUME); ++ m_pVolumeControl->setSinkMute(false); + qDebug()<< "初始化音量SourcePortName不存在的情况" <defaultSourceName ; + } + +@@ -353,6 +356,7 @@ + { + m_pVolumeControl->customSoundFile->addXmlNode(m_pVolumeControl->sourcePortName,false); + m_pVolumeControl->setSourceVolume(m_pVolumeControl->sourceIndex,MIC_VOLUME); ++ m_pVolumeControl->setSinkMute(false); + qDebug() << "初始化输入音量为100" ; + } + } diff --git a/ukui-media.spec b/ukui-media.spec index 5a80d6e..bc9dfa4 100644 --- a/ukui-media.spec +++ b/ukui-media.spec @@ -1,6 +1,6 @@ Name: ukui-media Version: 3.1.0 -Release: 4 +Release: 5 Summary: UKUI media utilities License: GPL-2.0-or-later and GPL-3.0-or-later and BSD-3-Clause URL: http://www.ukui.org @@ -8,6 +8,7 @@ Source0: https://gitee.com/openkylin/ukui-media/tags/%{name}-%{version}.ta Patch01: 0001-fix-compile-error-of-ukui-media.patch Patch02: 0002-fix-ukui-volume-control-applet-qt-work-error.patch Patch03: 0003-fix-coredump-of-ukui-volume-control-applet-qt.patch +Patch04: 0004-fix-first-install-volume-not-mute.patch Autoreq: yes BuildRequires: intltool @@ -94,6 +95,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||: %{_sysconfdir}/xdg/autostart/ %changelog +* Thu May 09 2024 douyan - 3.1.0-5 +- add 0004-fix-first-install-volume-not-mute.patch + * Fri Feb 10 2023 peijiankang - 3.1.0-4 - fix coredump of ukui-volume-control-applet-qt