From 9cd589e5d47411b5148b5fee2810d193faf28dcc Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Tue, 16 May 2023 11:16:58 +0800 Subject: [PATCH 1/4] add ipc code modify Signed-off-by: hwzhangchuang --- common/include/daudio_ipc_interface_code.h | 2 +- .../audio_sink/include/idaudio_sink.h | 7 ------- .../audio_sink/src/daudio_sink_proxy.cpp | 13 ++++++++----- .../include/idaudio_ipc_callback.h | 4 ---- .../audio_source/include/idaudio_source.h | 8 -------- .../src/daudio_ipc_callback_stub.cpp | 7 +++++-- .../audio_source/src/daudio_source_proxy.cpp | 17 +++++++++++------ .../servicesink/src/daudio_sink_stub.cpp | 16 +++++++++++----- .../src/daudio_ipc_callback_proxy.cpp | 5 +++-- .../servicesource/src/daudio_source_stub.cpp | 19 +++++++++++++------ 10 files changed, 52 insertions(+), 46 deletions(-) diff --git a/common/include/daudio_ipc_interface_code.h b/common/include/daudio_ipc_interface_code.h index 6ab67e48..b5a5eda6 100644 --- a/common/include/daudio_ipc_interface_code.h +++ b/common/include/daudio_ipc_interface_code.h @@ -40,7 +40,7 @@ enum class IDAudioSinkInterfaceCode : uint32_t { }; /* SAID: 4805 */ -enum IDAudioIpcCBInterfaceCode : uint32_t { +enum class IDAudioIpcCBInterfaceCode : uint32_t { NOTIFY_REGRESULT = 0, NOTIFY_UNREGRESULT = 1, }; diff --git a/interfaces/inner_kits/native_cpp/audio_sink/include/idaudio_sink.h b/interfaces/inner_kits/native_cpp/audio_sink/include/idaudio_sink.h index 3ba15b2a..a007622c 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/include/idaudio_sink.h +++ b/interfaces/inner_kits/native_cpp/audio_sink/include/idaudio_sink.h @@ -23,13 +23,6 @@ namespace DistributedHardware { class IDAudioSink : public OHOS::IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.distributedhardware.distributedaudiosink"); - enum { - INIT_SINK = 0, - RELEASE_SINK = 1, - SUBSCRIBE_LOCAL_HARDWARE = 2, - UNSUBSCRIBE_LOCAL_HARDWARE = 3, - DAUDIO_NOTIFY = 4, - }; ~IDAudioSink() override = default; virtual int32_t InitSink(const std::string ¶ms) = 0; diff --git a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp index 218a218f..ed3978ba 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp @@ -17,6 +17,7 @@ #include "daudio_constants.h" #include "daudio_errorcode.h" +#include "daudio_ipc_interface_code.h" #include "daudio_log.h" #undef DH_LOG_TAG @@ -37,7 +38,7 @@ int32_t DAudioSinkProxy::InitSink(const std::string ¶ms) return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } - Remote()->SendRequest(INIT_SINK, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioSinkInterfaceCode::INIT_SINK), data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -51,7 +52,7 @@ int32_t DAudioSinkProxy::ReleaseSink() return ERR_DH_AUDIO_SA_WRITE_INTERFACE_TOKEN_FAILED; } - Remote()->SendRequest(RELEASE_SINK, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioSinkInterfaceCode::RELEASE_SINK), data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -71,7 +72,8 @@ int32_t DAudioSinkProxy::SubscribeLocalHardware(const std::string &dhId, const s return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } - Remote()->SendRequest(SUBSCRIBE_LOCAL_HARDWARE, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioSinkInterfaceCode::SUBSCRIBE_LOCAL_HARDWARE), + data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -91,7 +93,8 @@ int32_t DAudioSinkProxy::UnsubscribeLocalHardware(const std::string &dhId) return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } - Remote()->SendRequest(UNSUBSCRIBE_LOCAL_HARDWARE, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioSinkInterfaceCode::UNSUBSCRIBE_LOCAL_HARDWARE), + data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -113,7 +116,7 @@ void DAudioSinkProxy::DAudioNotify(const std::string &devId, const std::string & return; } - Remote()->SendRequest(DAUDIO_NOTIFY, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioSinkInterfaceCode::DAUDIO_NOTIFY), data, reply, option); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h index 599f5fb1..030bf6d7 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h +++ b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h @@ -23,10 +23,6 @@ namespace DistributedHardware { class IDAudioIpcCallback : public OHOS::IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.distributedhardware.distributedaudioipccallback"); - enum { - NOTIFY_REGRESULT = 0, - NOTIFY_UNREGRESULT = 1, - }; ~IDAudioIpcCallback() override {} virtual int32_t OnNotifyRegResult(const std::string &devId, const std::string &dhId, const std::string &reqId, diff --git a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_source.h b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_source.h index d23f72f8..293d6daf 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_source.h +++ b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_source.h @@ -25,14 +25,6 @@ namespace DistributedHardware { class IDAudioSource : public OHOS::IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.distributedhardware.distributedaudiosource"); - enum { - INIT_SOURCE = 0, - RELEASE_SOURCE = 1, - REGISTER_DISTRIBUTED_HARDWARE = 2, - UNREGISTER_DISTRIBUTED_HARDWARE = 3, - CONFIG_DISTRIBUTED_HARDWARE = 4, - DAUDIO_NOTIFY = 5, - }; ~IDAudioSource() override = default; virtual int32_t InitSource(const std::string ¶ms, const sptr &callback) = 0; diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp index 68f950c2..61eb4fad 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp @@ -16,6 +16,7 @@ #include "daudio_ipc_callback_stub.h" #include "daudio_errorcode.h" +#include "daudio_ipc_interface_code.h" #include "daudio_log.h" #undef DH_LOG_TAG @@ -25,8 +26,10 @@ namespace OHOS { namespace DistributedHardware { DAudioIpcCallbackStub::DAudioIpcCallbackStub() { - memberFuncMap_[NOTIFY_REGRESULT] = &DAudioIpcCallbackStub::OnNotifyRegResultInner; - memberFuncMap_[NOTIFY_UNREGRESULT] = &DAudioIpcCallbackStub::OnNotifyUnregResultInner; + memberFuncMap_[static_cast(IDAudioIpcCBInterfaceCode::NOTIFY_REGRESULT)] = + &DAudioIpcCallbackStub::OnNotifyRegResultInner; + memberFuncMap_[static_cast(IDAudioIpcCBInterfaceCode::NOTIFY_UNREGRESULT)] = + &DAudioIpcCallbackStub::OnNotifyUnregResultInner; } int32_t DAudioIpcCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp index 6ad6046d..4d829bbf 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp @@ -17,6 +17,7 @@ #include "daudio_constants.h" #include "daudio_errorcode.h" +#include "daudio_ipc_interface_code.h" #include "daudio_log.h" #undef DH_LOG_TAG @@ -37,7 +38,7 @@ int32_t DAudioSourceProxy::InitSource(const std::string ¶ms, const sptrSendRequest(INIT_SOURCE, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioSourceInterfaceCode::INIT_SOURCE), data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -51,7 +52,7 @@ int32_t DAudioSourceProxy::ReleaseSource() return ERR_DH_AUDIO_SA_WRITE_INTERFACE_TOKEN_FAILED; } - Remote()->SendRequest(RELEASE_SOURCE, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioSourceInterfaceCode::RELEASE_SOURCE), data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -74,7 +75,8 @@ int32_t DAudioSourceProxy::RegisterDistributedHardware(const std::string &devId, return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } - Remote()->SendRequest(REGISTER_DISTRIBUTED_HARDWARE, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioSourceInterfaceCode::REGISTER_DISTRIBUTED_HARDWARE), + data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -96,7 +98,8 @@ int32_t DAudioSourceProxy::UnregisterDistributedHardware(const std::string &devI return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } - Remote()->SendRequest(UNREGISTER_DISTRIBUTED_HARDWARE, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioSourceInterfaceCode::UNREGISTER_DISTRIBUTED_HARDWARE), + data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -117,7 +120,8 @@ int32_t DAudioSourceProxy::ConfigDistributedHardware(const std::string &devId, c return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } - Remote()->SendRequest(CONFIG_DISTRIBUTED_HARDWARE, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioSourceInterfaceCode::CONFIG_DISTRIBUTED_HARDWARE), + data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -139,7 +143,8 @@ void DAudioSourceProxy::DAudioNotify(const std::string &devId, const std::string return; } - Remote()->SendRequest(DAUDIO_NOTIFY, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioSourceInterfaceCode::DAUDIO_NOTIFY), + data, reply, option); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp index de02c128..c4ba7b01 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp @@ -17,6 +17,7 @@ #include "daudio_constants.h" #include "daudio_errorcode.h" +#include "daudio_ipc_interface_code.h" #include "daudio_log.h" #undef DH_LOG_TAG @@ -27,11 +28,16 @@ namespace DistributedHardware { DAudioSinkStub::DAudioSinkStub() { DHLOGI("Distributed audio sink stub constructed."); - memberFuncMap_[INIT_SINK] = &DAudioSinkStub::InitSinkInner; - memberFuncMap_[RELEASE_SINK] = &DAudioSinkStub::ReleaseSinkInner; - memberFuncMap_[SUBSCRIBE_LOCAL_HARDWARE] = &DAudioSinkStub::SubscribeLocalHardwareInner; - memberFuncMap_[UNSUBSCRIBE_LOCAL_HARDWARE] = &DAudioSinkStub::UnsubscribeLocalHardwareInner; - memberFuncMap_[DAUDIO_NOTIFY] = &DAudioSinkStub::DAudioNotifyInner; + memberFuncMap_[static_cast(IDAudioSinkInterfaceCode::INIT_SINK)] = + &DAudioSinkStub::InitSinkInner; + memberFuncMap_[static_cast(IDAudioSinkInterfaceCode::RELEASE_SINK)] = + &DAudioSinkStub::ReleaseSinkInner; + memberFuncMap_[static_cast(IDAudioSinkInterfaceCode::SUBSCRIBE_LOCAL_HARDWARE)] = + &DAudioSinkStub::SubscribeLocalHardwareInner; + memberFuncMap_[static_cast(IDAudioSinkInterfaceCode::UNSUBSCRIBE_LOCAL_HARDWARE)] = + &DAudioSinkStub::UnsubscribeLocalHardwareInner; + memberFuncMap_[static_cast(IDAudioSinkInterfaceCode::DAUDIO_NOTIFY)] = + &DAudioSinkStub::DAudioNotifyInner; } DAudioSinkStub::~DAudioSinkStub() diff --git a/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp b/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp index eadcdc82..382f7233 100644 --- a/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp +++ b/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp @@ -16,6 +16,7 @@ #include "daudio_ipc_callback_proxy.h" #include "daudio_errorcode.h" +#include "daudio_ipc_interface_code.h" #undef DH_LOG_TAG #define DH_LOG_TAG "DAudioIpcCallbackProxy" @@ -37,7 +38,7 @@ int32_t DAudioIpcCallbackProxy::OnNotifyRegResult(const std::string &devId, cons return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } - Remote()->SendRequest(NOTIFY_REGRESULT, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioIpcCBInterfaceCode::NOTIFY_REGRESULT), data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -58,7 +59,7 @@ int32_t DAudioIpcCallbackProxy::OnNotifyUnregResult(const std::string &devId, co return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } - Remote()->SendRequest(NOTIFY_UNREGRESULT, data, reply, option); + Remote()->SendRequest(static_cast(IDAudioIpcCBInterfaceCode::NOTIFY_UNREGRESULT), data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } diff --git a/services/audiomanager/servicesource/src/daudio_source_stub.cpp b/services/audiomanager/servicesource/src/daudio_source_stub.cpp index ed68f4f9..2c58c67b 100644 --- a/services/audiomanager/servicesource/src/daudio_source_stub.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_stub.cpp @@ -18,6 +18,7 @@ #include "daudio_constants.h" #include "daudio_errorcode.h" #include "daudio_ipc_callback_proxy.h" +#include "daudio_ipc_interface_code.h" #include "daudio_log.h" #undef DH_LOG_TAG @@ -27,12 +28,18 @@ namespace OHOS { namespace DistributedHardware { DAudioSourceStub::DAudioSourceStub() { - memberFuncMap_[INIT_SOURCE] = &DAudioSourceStub::InitSourceInner; - memberFuncMap_[RELEASE_SOURCE] = &DAudioSourceStub::ReleaseSourceInner; - memberFuncMap_[REGISTER_DISTRIBUTED_HARDWARE] = &DAudioSourceStub::RegisterDistributedHardwareInner; - memberFuncMap_[UNREGISTER_DISTRIBUTED_HARDWARE] = &DAudioSourceStub::UnregisterDistributedHardwareInner; - memberFuncMap_[CONFIG_DISTRIBUTED_HARDWARE] = &DAudioSourceStub::ConfigDistributedHardwareInner; - memberFuncMap_[DAUDIO_NOTIFY] = &DAudioSourceStub::DAudioNotifyInner; + memberFuncMap_[static_cast(IDAudioSourceInterfaceCode::INIT_SOURCE)] = + &DAudioSourceStub::InitSourceInner; + memberFuncMap_[static_cast(IDAudioSourceInterfaceCode::RELEASE_SOURCE)] = + &DAudioSourceStub::ReleaseSourceInner; + memberFuncMap_[static_cast(IDAudioSourceInterfaceCode::REGISTER_DISTRIBUTED_HARDWARE)] = + &DAudioSourceStub::RegisterDistributedHardwareInner; + memberFuncMap_[static_cast(IDAudioSourceInterfaceCode::UNREGISTER_DISTRIBUTED_HARDWARE)] = + &DAudioSourceStub::UnregisterDistributedHardwareInner; + memberFuncMap_[static_cast(IDAudioSourceInterfaceCode::CONFIG_DISTRIBUTED_HARDWARE)] = + &DAudioSourceStub::ConfigDistributedHardwareInner; + memberFuncMap_[static_cast(IDAudioSourceInterfaceCode::DAUDIO_NOTIFY)] = + &DAudioSourceStub::DAudioNotifyInner; } int32_t DAudioSourceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, -- Gitee From e8d358aec2ad8df195019e5f0cd3e7be158f4495 Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Wed, 17 May 2023 14:51:25 +0800 Subject: [PATCH 2/4] modify time scope Signed-off-by: hwzhangchuang --- .../inner_kits/native_cpp/audio_sink/include/idaudio_sink.h | 2 +- .../inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp | 2 +- .../native_cpp/audio_source/include/idaudio_ipc_callback.h | 2 +- .../inner_kits/native_cpp/audio_source/include/idaudio_source.h | 2 +- .../native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp | 2 +- .../native_cpp/audio_source/src/daudio_source_proxy.cpp | 2 +- services/audiomanager/servicesink/src/daudio_sink_stub.cpp | 2 +- .../servicesource/src/daudio_ipc_callback_proxy.cpp | 2 +- services/audiomanager/servicesource/src/daudio_source_stub.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/audio_sink/include/idaudio_sink.h b/interfaces/inner_kits/native_cpp/audio_sink/include/idaudio_sink.h index a007622c..ba07a292 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/include/idaudio_sink.h +++ b/interfaces/inner_kits/native_cpp/audio_sink/include/idaudio_sink.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp index ed3978ba..d33e6e39 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_proxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h index 030bf6d7..72bb34d8 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h +++ b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_source.h b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_source.h index 293d6daf..33f65844 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_source.h +++ b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_source.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp index 61eb4fad..59499480 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp index 4d829bbf..480d77f9 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp index c4ba7b01..78c96ece 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp b/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp index 382f7233..9968b7ce 100644 --- a/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp +++ b/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/services/audiomanager/servicesource/src/daudio_source_stub.cpp b/services/audiomanager/servicesource/src/daudio_source_stub.cpp index 2c58c67b..cc62a2d7 100644 --- a/services/audiomanager/servicesource/src/daudio_source_stub.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at -- Gitee From 4ed5ba2541b69a51154af1fab3704fc1c0d2b6f2 Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Wed, 17 May 2023 19:39:09 +0800 Subject: [PATCH 3/4] modify Signed-off-by: hwzhangchuang --- common/include/daudio_ipc_interface_code.h | 6 ------ .../native_cpp/audio_source/include/idaudio_ipc_callback.h | 4 ++++ .../audio_source/src/daudio_ipc_callback_stub.cpp | 6 ++---- .../servicesource/src/daudio_ipc_callback_proxy.cpp | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/common/include/daudio_ipc_interface_code.h b/common/include/daudio_ipc_interface_code.h index b5a5eda6..93cee7c8 100644 --- a/common/include/daudio_ipc_interface_code.h +++ b/common/include/daudio_ipc_interface_code.h @@ -38,12 +38,6 @@ enum class IDAudioSinkInterfaceCode : uint32_t { UNSUBSCRIBE_LOCAL_HARDWARE = 3, DAUDIO_NOTIFY = 4, }; - -/* SAID: 4805 */ -enum class IDAudioIpcCBInterfaceCode : uint32_t { - NOTIFY_REGRESULT = 0, - NOTIFY_UNREGRESULT = 1, -}; } // namespace DistributedHardware } // namespace OHOS #endif diff --git a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h index 72bb34d8..03a06d8c 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h +++ b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h @@ -23,6 +23,10 @@ namespace DistributedHardware { class IDAudioIpcCallback : public OHOS::IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.distributedhardware.distributedaudioipccallback"); + enum { + NOTIFY_REGRESULT = 0, + NOTIFY_UNREGRESULT = 1, + }; ~IDAudioIpcCallback() override {} virtual int32_t OnNotifyRegResult(const std::string &devId, const std::string &dhId, const std::string &reqId, diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp index 59499480..af6d52f6 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp @@ -26,10 +26,8 @@ namespace OHOS { namespace DistributedHardware { DAudioIpcCallbackStub::DAudioIpcCallbackStub() { - memberFuncMap_[static_cast(IDAudioIpcCBInterfaceCode::NOTIFY_REGRESULT)] = - &DAudioIpcCallbackStub::OnNotifyRegResultInner; - memberFuncMap_[static_cast(IDAudioIpcCBInterfaceCode::NOTIFY_UNREGRESULT)] = - &DAudioIpcCallbackStub::OnNotifyUnregResultInner; + memberFuncMap_[NOTIFY_REGRESULT] = &DAudioIpcCallbackStub::OnNotifyRegResultInner; + memberFuncMap_[NOTIFY_UNREGRESULT] = &DAudioIpcCallbackStub::OnNotifyUnregResultInner; } int32_t DAudioIpcCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, diff --git a/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp b/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp index 9968b7ce..34f0699a 100644 --- a/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp +++ b/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp @@ -38,7 +38,7 @@ int32_t DAudioIpcCallbackProxy::OnNotifyRegResult(const std::string &devId, cons return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } - Remote()->SendRequest(static_cast(IDAudioIpcCBInterfaceCode::NOTIFY_REGRESULT), data, reply, option); + Remote()->SendRequest(NOTIFY_REGRESULT, data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -59,7 +59,7 @@ int32_t DAudioIpcCallbackProxy::OnNotifyUnregResult(const std::string &devId, co return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } - Remote()->SendRequest(static_cast(IDAudioIpcCBInterfaceCode::NOTIFY_UNREGRESULT), data, reply, option); + Remote()->SendRequest(static_cast(NOTIFY_UNREGRESULT), data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } -- Gitee From fab7b65485df68d56bf330bc2628cb9654b3c166 Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Wed, 17 May 2023 19:54:58 +0800 Subject: [PATCH 4/4] modify Signed-off-by: hwzhangchuang --- .../native_cpp/audio_source/include/idaudio_ipc_callback.h | 2 +- .../native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp | 3 +-- .../servicesource/src/daudio_ipc_callback_proxy.cpp | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h index 03a06d8c..599f5fb1 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h +++ b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_ipc_callback.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp index af6d52f6..68f950c2 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,6 @@ #include "daudio_ipc_callback_stub.h" #include "daudio_errorcode.h" -#include "daudio_ipc_interface_code.h" #include "daudio_log.h" #undef DH_LOG_TAG diff --git a/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp b/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp index 34f0699a..eadcdc82 100644 --- a/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp +++ b/services/audiomanager/servicesource/src/daudio_ipc_callback_proxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,6 @@ #include "daudio_ipc_callback_proxy.h" #include "daudio_errorcode.h" -#include "daudio_ipc_interface_code.h" #undef DH_LOG_TAG #define DH_LOG_TAG "DAudioIpcCallbackProxy" @@ -59,7 +58,7 @@ int32_t DAudioIpcCallbackProxy::OnNotifyUnregResult(const std::string &devId, co return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } - Remote()->SendRequest(static_cast(NOTIFY_UNREGRESULT), data, reply, option); + Remote()->SendRequest(NOTIFY_UNREGRESULT, data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } -- Gitee