Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-02 15:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 声音调整改成新接口

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

Log: 声音调整换新接口
Influence: 鼠标移动到任务栏的声音图标，滚动鼠标，声音跟着调整
Bug: https://pms.uniontech.com/bug-view-172417.html
Change-Id: I369b74beb8e5e2e7e95c83dc88eef98c2849efc4
This commit is contained in:
donghualin 2022-12-07 05:39:06 +00:00
parent 309d2508ca
commit 9fbca27acc
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -56,9 +56,10 @@ if (${EXIT_CODE} EQUAL 0)
endif() endif()
function(generation_dbus_interface xmldir outdir) function(generation_dbus_interface xmldir outdir)
IF(NOT EXISTS ${outdir}) IF(EXISTS ${outdir})
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir}) file(REMOVE_RECURSE ${outdir})
ENDIF() ENDIF()
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${outdir})
file(GLOB_RECURSE allXmls ${xmldir}/*.xml) file(GLOB_RECURSE allXmls ${xmldir}/*.xml)
foreach(XMLFILE ${allXmls}) foreach(XMLFILE ${allXmls})
string(FIND ${XMLFILE} "/" INDEX REVERSE) string(FIND ${XMLFILE} "/" INDEX REVERSE)

10
plugins/sound/soundplugin.cpp
View File

@ -173,9 +173,9 @@ bool SoundPlugin::eventHandler(QEvent *event)
return PluginsItemInterface::eventHandler(event); return PluginsItemInterface::eventHandler(event);
// 获取当前默认的声音设备 // 获取当前默认的声音设备
QDBusPendingCall defaultSinkCall = DDBusSender().service("org.deepin.daemon.Audio1") QDBusPendingCall defaultSinkCall = DDBusSender().service("org.deepin.dde.Audio1")
.path("/org/deepin/daemon/Audio1") .path("/org/deepin/dde/Audio1")
.interface("org.deepin.daemon.Audio1") .interface("org.deepin.dde.Audio1")
.property("DefaultSink").get(); .property("DefaultSink").get();
defaultSinkCall.waitForFinished(); defaultSinkCall.waitForFinished();
QDBusReply<QVariant> path = defaultSinkCall.reply(); QDBusReply<QVariant> path = defaultSinkCall.reply();
@ -184,8 +184,8 @@ bool SoundPlugin::eventHandler(QEvent *event)
return false; return false;
// 获取当前默认声音设备的音量 // 获取当前默认声音设备的音量
DDBusSender sinkDBus = DDBusSender().service("org.deepin.daemon.Audio1") DDBusSender sinkDBus = DDBusSender().service("org.deepin.dde.Audio1")
.path(defaultSinkPath).interface("org.deepin.daemon.Audio1.Sink"); .path(defaultSinkPath).interface("org.deepin.dde.Audio1.Sink");
QDBusPendingCall volumeCall = sinkDBus.property("Volume").get(); QDBusPendingCall volumeCall = sinkDBus.property("Volume").get();
volumeCall.waitForFinished(); volumeCall.waitForFinished();
QDBusReply<QVariant> volumePath = volumeCall.reply(); QDBusReply<QVariant> volumePath = volumeCall.reply();