From 68036cc1d90bedd9d67e7751c9625e719ffbdea5 Mon Sep 17 00:00:00 2001 From: pei-jiankang Date: Mon, 27 Sep 2021 17:23:13 +0800 Subject: [PATCH] repair the kylin-recorder volume dispaly error in kylin-media --- ...-recorder-volume-dispaly-error-in-ky.patch | 60 +++++++++++++++++++ ukui-media.spec | 9 ++- 2 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 0001-repair-the-kylin-recorder-volume-dispaly-error-in-ky.patch diff --git a/0001-repair-the-kylin-recorder-volume-dispaly-error-in-ky.patch b/0001-repair-the-kylin-recorder-volume-dispaly-error-in-ky.patch new file mode 100644 index 0000000..df7dfbf --- /dev/null +++ b/0001-repair-the-kylin-recorder-volume-dispaly-error-in-ky.patch @@ -0,0 +1,60 @@ +From 9505c2aa17d0914afe73abfab2cdb7f4febc99ef Mon Sep 17 00:00:00 2001 +From: pei-jiankang +Date: Mon, 27 Sep 2021 17:08:43 +0800 +Subject: [PATCH] repair the kylin-recorder volume dispaly error in kylin-media + +--- + .../ukmedia_device_switch_widget.cpp | 30 ++++++++++++------- + 1 file changed, 20 insertions(+), 10 deletions(-) + +diff --git a/ukui-volume-control-applet-qt/ukmedia_device_switch_widget.cpp b/ukui-volume-control-applet-qt/ukmedia_device_switch_widget.cpp +index 2cd9612..04c5beb 100755 +--- a/ukui-volume-control-applet-qt/ukmedia_device_switch_widget.cpp ++++ b/ukui-volume-control-applet-qt/ukmedia_device_switch_widget.cpp +@@ -1391,12 +1391,14 @@ void DeviceSwitchWidget::add_stream (DeviceSwitchWidget *w, MateMixerStream *str + MateMixerAppInfo *m_pAppInfo = mate_mixer_stream_control_get_app_info(w->control); + if (m_pAppInfo != nullptr) { + const gchar *m_pAppName = mate_mixer_app_info_get_name(m_pAppInfo); +- if (strcmp(m_pAppName,"ukui-session") != 0 && strcmp(m_pAppName,"ukui-volume-control-applet-qt") != 0 && strcmp(m_pAppName,"Volume Control") && \ +- strcmp(m_pAppName,"ALSA plug-in [mate-screenshot]") && strcmp(m_pAppName,"ALSA plug-in [ukui-volume-control-applet-qt]")) { +- if G_UNLIKELY (w->control == nullptr) +- return; +- add_application_control (w, w->control,m_pStreamControlName); +- } ++ if (strcmp(m_pAppName,"ukui-session") != 0 && strcmp(m_pAppName,"ukui-volume-control-applet-qt") != 0 && strcmp(m_pAppName,"Volume Control") && \ ++ strcmp(m_pAppName,"ALSA plug-in [mate-screenshot]") && strcmp(m_pAppName,"ALSA plug-in [ukui-volume-control-applet-qt]") && \ ++ strcmp(m_pAppName,"Ukui Volume Control App") && !strstr(m_pAppName,"QtPulseAudio") && strcmp(m_pAppName,"ukuimedia-volume-control") != 0 && \ ++ !strstr(m_pAppName,"ukui-settings-daemon")) { ++ if G_UNLIKELY (w->control == nullptr) ++ return; ++ add_application_control (w, w->control,m_pStreamControlName); ++ } + } + else + return; +@@ -1506,10 +1508,18 @@ void DeviceSwitchWidget::on_stream_control_added (MateMixerStream *stream,const + MateMixerAppInfo *m_pAppInfo = mate_mixer_stream_control_get_app_info(w->control); + if (m_pAppInfo != nullptr) { + const gchar *m_pAppName = mate_mixer_app_info_get_name(m_pAppInfo); +- if (strcmp(m_pAppName,"ukui-session") != 0 && strcmp(m_pAppName,"ukui-volume-control-applet-qt") != 0 && strcmp(m_pAppName,"Volume Control") && \ +- strcmp(m_pAppName,"ALSA plug-in [mate-screenshot]") && strcmp(m_pAppName,"ALSA plug-in [ukui-volume-control-applet-qt]")) { +- if G_UNLIKELY (w->control == nullptr) +- return; ++ const gchar *appIconName = mate_mixer_app_info_get_icon(m_pAppInfo); ++ if (appIconName && strstr(appIconName,"recording")) { ++ m_pAppName = "kylin-recorder"; ++ appIconName = "kylin-recorder"; ++ } ++ ++ if (strcmp(m_pAppName,"ukui-session") != 0 && strcmp(m_pAppName,"ukui-volume-control-applet-qt") != 0 && strcmp(m_pAppName,"Volume Control") && \ ++ strcmp(m_pAppName,"ALSA plug-in [mate-screenshot]") && strcmp(m_pAppName,"ALSA plug-in [ukui-volume-control-applet-qt]") && \ ++ strcmp(m_pAppName,"Ukui Volume Control App") && !strstr(m_pAppName,"QtPulseAudio") && strcmp(m_pAppName,"ukuimedia-volume-control") != 0 && \ ++ !strstr(m_pAppName,"ukui-settings-daemon")) { ++ if G_UNLIKELY (w->control == nullptr) ++ return; + + role = mate_mixer_stream_control_get_role (w->control); + if (role == MATE_MIXER_STREAM_CONTROL_ROLE_APPLICATION) { +-- +2.30.0 + diff --git a/ukui-media.spec b/ukui-media.spec index d7c4dc6..72595f5 100644 --- a/ukui-media.spec +++ b/ukui-media.spec @@ -1,6 +1,6 @@ Name: ukui-media Version: 3.0.2 -Release: 11 +Release: 12 Summary: UKUI media utilities License: GPL-2+ GPL-3+ LGPL-2+ BSD-3-Clause URL: http://www.ukui.org @@ -41,7 +41,7 @@ patch0: 0001-fix-vol-icon-bug.patch #patch6: 0007-fix-probabilistic-crash-when-keyboard-keys-are-mute.patch #patch7: 0008-Set-the-app-name-and-icon-for-Kirin-Recording.patch #patch8: 0009-repair-the-input-device-is-not-find-of-recorder.patch - +patch1: 0001-repair-the-kylin-recorder-volume-dispaly-error-in-ky.patch %description A simple and lightweight screensaver written by Qt5. The screensaver supports biometric auhentication which is @@ -59,7 +59,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q %patch0 -p1 -#%%patch1 -p1 +%patch1 -p1 #%%patch2 -p1 #%%patch3 -p1 #%%patch4 -p1 @@ -128,6 +128,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ %{_datadir}/glib-2.0/ %changelog +* Mon Sep 26 2021 peijiankang - 3.0.2-12 +- repair the kylin recorder volume dispaly error in ky + * Sun Sep 26 2021 peijiankang - 3.0.2-11 - return version to 3.0.2-2