diff --git a/common/include/daudio_ipc_interface_code.h b/common/include/daudio_ipc_interface_code.h index 6ab67e48b6ac05cb9e02e03595e11e2084f6c174..93cee7c86fb04d8ae7ab24b29d8d8d78bfdc7aa5 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 IDAudioIpcCBInterfaceCode : uint32_t { - NOTIFY_REGRESULT = 0, - NOTIFY_UNREGRESULT = 1, -}; } // namespace DistributedHardware } // namespace OHOS #endif 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 3ba15b2a9b3cf894229c86b536f41857219bcb18..ba07a29283dd120f81149add2cd432c172f81609 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 @@ -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 218a218f479b3ca30e8838027b9a76f5566bd50b..d33e6e390598bacd141188a626cec84bd0949741 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 @@ -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_source.h b/interfaces/inner_kits/native_cpp/audio_source/include/idaudio_source.h index d23f72f840b2c8fca1e938e797665bee50bbe1b9..33f658448032829b47cbc3dd51b22a267d4fe9ee 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 @@ -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_source_proxy.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp index 6ad6046d83cb18be38aebb7f5e907d6a2177c144..480d77f911cde5ecc71ec0a769521715b44323cb 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 @@ -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 de02c128058fb2f2e16381c11499b81979f407fb..78c96ecef334536f66d28949815827e006e81e91 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 @@ -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_source_stub.cpp b/services/audiomanager/servicesource/src/daudio_source_stub.cpp index ed68f4f976fac12d0da6365d49f16ae3d969eba8..cc62a2d772f50200c1234ddcf24e522e1e2b646a 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 @@ -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,