From 9fbca27acc8dcff1c95f9e8e7753127549b8070c Mon Sep 17 00:00:00 2001
From: donghualin <donghualin@uniontech.com>
Date: Wed, 7 Dec 2022 05:39:06 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A3=B0=E9=9F=B3=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

org.deepin.daemon.Audio1改成org.deepin.dde.Audio1

Log: 声音调整换新接口
Influence: 鼠标移动到任务栏的声音图标，滚动鼠标，声音跟着调整
Bug: https://pms.uniontech.com/bug-view-172417.html
Change-Id: I369b74beb8e5e2e7e95c83dc88eef98c2849efc4
---
 CMakeLists.txt                |  5 +++--
 plugins/sound/soundplugin.cpp | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 175e386f3..5665ec78d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,9 +56,10 @@ if (${EXIT_CODE} EQUAL 0)
 endif()
 
 function(generation_dbus_interface xmldir outdir)
-    IF(NOT EXISTS ${outdir})
-        execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir})
+    IF(EXISTS ${outdir})
+        file(REMOVE_RECURSE ${outdir})
     ENDIF()
+    execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir})
     file(GLOB_RECURSE allXmls ${xmldir}/*.xml)
     foreach(XMLFILE ${allXmls})
         string(FIND ${XMLFILE} "/" INDEX REVERSE)
diff --git a/plugins/sound/soundplugin.cpp b/plugins/sound/soundplugin.cpp
index 7b8e9f17b..3313d4c3c 100644
--- a/plugins/sound/soundplugin.cpp
+++ b/plugins/sound/soundplugin.cpp
@@ -173,9 +173,9 @@ bool SoundPlugin::eventHandler(QEvent *event)
         return PluginsItemInterface::eventHandler(event);
 
     // 获取当前默认的声音设备
-    QDBusPendingCall defaultSinkCall = DDBusSender().service("org.deepin.daemon.Audio1")
-            .path("/org/deepin/daemon/Audio1")
-            .interface("org.deepin.daemon.Audio1")
+    QDBusPendingCall defaultSinkCall = DDBusSender().service("org.deepin.dde.Audio1")
+            .path("/org/deepin/dde/Audio1")
+            .interface("org.deepin.dde.Audio1")
             .property("DefaultSink").get();
     defaultSinkCall.waitForFinished();
     QDBusReply<QVariant> path = defaultSinkCall.reply();
@@ -184,8 +184,8 @@ bool SoundPlugin::eventHandler(QEvent *event)
         return false;
 
     // 获取当前默认声音设备的音量
-    DDBusSender sinkDBus = DDBusSender().service("org.deepin.daemon.Audio1")
-            .path(defaultSinkPath).interface("org.deepin.daemon.Audio1.Sink");
+    DDBusSender sinkDBus = DDBusSender().service("org.deepin.dde.Audio1")
+            .path(defaultSinkPath).interface("org.deepin.dde.Audio1.Sink");
     QDBusPendingCall volumeCall = sinkDBus.property("Volume").get();
     volumeCall.waitForFinished();
     QDBusReply<QVariant> volumePath = volumeCall.reply();