From 6ed3b98e62a81d34cba8e1c0fcf05e0c28e27e49 Mon Sep 17 00:00:00 2001 From: yangshuai0222 Date: Tue, 8 Mar 2022 17:23:33 +0800 Subject: [PATCH] update service Signed-off-by: yangshuai0222 --- frameworks/native/audiopolicy/BUILD.gn | 2 +- frameworks/native/opensles/BUILD.gn | 4 ++-- interfaces/inner_api/native/audiocapturer/BUILD.gn | 2 +- interfaces/inner_api/native/audiomanager/BUILD.gn | 12 ++++++------ interfaces/inner_api/native/audiorenderer/BUILD.gn | 4 ++-- interfaces/inner_api/native/audioringtone/BUILD.gn | 4 ++-- interfaces/inner_api/native/opensles/BUILD.gn | 2 +- services/BUILD.gn | 8 ++++---- .../include/{ => audio_flinger/client}/audio_error.h | 0 .../{ => audio_flinger}/client/audio_manager_proxy.h | 0 .../client/audio_ringtone_manager.h | 0 .../client}/audio_server_death_recipient.h | 0 .../client/audio_service_client.h | 0 .../include/{ => audio_flinger}/client/audio_timer.h | 0 .../{ => audio_flinger}/server/audio_server.h | 0 .../client/audio_manager_proxy.cpp | 0 .../client/audio_ringtone_manager.cpp | 0 .../client/audio_service_client.cpp | 0 .../src/{ => audio_flinger}/client/audio_session.cpp | 0 .../src/{ => audio_flinger}/client/audio_stream.cpp | 0 .../client/audio_system_manager.cpp | 0 .../server/audio_manager_stub.cpp | 0 .../src/{ => audio_flinger}/server/audio_server.cpp | 0 test/unittest/opensles_test/BUILD.gn | 2 +- 24 files changed, 20 insertions(+), 20 deletions(-) rename services/include/{ => audio_flinger/client}/audio_error.h (100%) rename services/include/{ => audio_flinger}/client/audio_manager_proxy.h (100%) rename services/include/{ => audio_flinger}/client/audio_ringtone_manager.h (100%) rename services/include/{ => audio_flinger/client}/audio_server_death_recipient.h (100%) rename services/include/{ => audio_flinger}/client/audio_service_client.h (100%) rename services/include/{ => audio_flinger}/client/audio_timer.h (100%) rename services/include/{ => audio_flinger}/server/audio_server.h (100%) rename services/src/{ => audio_flinger}/client/audio_manager_proxy.cpp (100%) rename services/src/{ => audio_flinger}/client/audio_ringtone_manager.cpp (100%) rename services/src/{ => audio_flinger}/client/audio_service_client.cpp (100%) rename services/src/{ => audio_flinger}/client/audio_session.cpp (100%) rename services/src/{ => audio_flinger}/client/audio_stream.cpp (100%) rename services/src/{ => audio_flinger}/client/audio_system_manager.cpp (100%) rename services/src/{ => audio_flinger}/server/audio_manager_stub.cpp (100%) rename services/src/{ => audio_flinger}/server/audio_server.cpp (100%) diff --git a/frameworks/native/audiopolicy/BUILD.gn b/frameworks/native/audiopolicy/BUILD.gn index dad52dd..a61d1de 100644 --- a/frameworks/native/audiopolicy/BUILD.gn +++ b/frameworks/native/audiopolicy/BUILD.gn @@ -16,7 +16,7 @@ import("//build/ohos.gni") config("audio_policy_public_config") { include_dirs = [ "//foundation/multimedia/audio_standard/services/include", - "//foundation/multimedia/audio_standard/services/include/client", + "//foundation/multimedia/audio_standard/services/include/audio_flinger/client", "//foundation/distributedschedule/safwk/services/safwk/include", "//foundation/multimedia/audio_standard/frameworks/native/audiopolicy/include", "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include", diff --git a/frameworks/native/opensles/BUILD.gn b/frameworks/native/opensles/BUILD.gn index e4e8b49..0b3fbd5 100644 --- a/frameworks/native/opensles/BUILD.gn +++ b/frameworks/native/opensles/BUILD.gn @@ -9,7 +9,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. +# limitations under the License. import("//build/ohos.gni") @@ -25,7 +25,7 @@ config("audio_renderer_config") { "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiosession/include", "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include", "//foundation/multimedia/audio_standard/services/include", - "//foundation/multimedia/audio_standard/services/include/client", + "//foundation/multimedia/audio_standard/services/include/audio_flinger/client", "//foundation/multimedia/audio_standard/services/test", "//utils/native/base/include", "$pulseaudio_dir/src", diff --git a/interfaces/inner_api/native/audiocapturer/BUILD.gn b/interfaces/inner_api/native/audiocapturer/BUILD.gn index 767839e..4f95666 100644 --- a/interfaces/inner_api/native/audiocapturer/BUILD.gn +++ b/interfaces/inner_api/native/audiocapturer/BUILD.gn @@ -27,7 +27,7 @@ config("audio_capturer_config") { "//foundation/multimedia/audio_standard/frameworks/native/audiostream/include", "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include", "//foundation/multimedia/audio_standard/services/include", - "//foundation/multimedia/audio_standard/services/include/client", + "//foundation/multimedia/audio_standard/services/include/audio_flinger/client", "$pulseaudio_dir/src", "$pulseaudio_dir/confgure/src", ] diff --git a/interfaces/inner_api/native/audiomanager/BUILD.gn b/interfaces/inner_api/native/audiomanager/BUILD.gn index 774046f..3f6e05a 100644 --- a/interfaces/inner_api/native/audiomanager/BUILD.gn +++ b/interfaces/inner_api/native/audiomanager/BUILD.gn @@ -35,7 +35,7 @@ config("audio_client_public_config") { "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include", "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiorenderer/include", "//foundation/multimedia/audio_standard/services/include", - "//foundation/multimedia/audio_standard/services/include/client", + "//foundation/multimedia/audio_standard/services/include/audio_flinger/client", "//foundation/multimedia/audio_standard/services/include/audio_policy/client", "//foundation/multimedia/audio_standard/services/include/audio_policy/common", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", @@ -61,11 +61,11 @@ config("audio_client_public_config") { ohos_shared_library("audio_client") { install_enable = true sources = [ - "//foundation/multimedia/audio_standard/services/src/client/audio_manager_proxy.cpp", - "//foundation/multimedia/audio_standard/services/src/client/audio_service_client.cpp", - "//foundation/multimedia/audio_standard/services/src/client/audio_session.cpp", - "//foundation/multimedia/audio_standard/services/src/client/audio_stream.cpp", - "//foundation/multimedia/audio_standard/services/src/client/audio_system_manager.cpp", + "//foundation/multimedia/audio_standard/services/src/audio_flinger/client/audio_manager_proxy.cpp", + "//foundation/multimedia/audio_standard/services/src/audio_flinger/client/audio_service_client.cpp", + "//foundation/multimedia/audio_standard/services/src/audio_flinger/client/audio_session.cpp", + "//foundation/multimedia/audio_standard/services/src/audio_flinger/client/audio_stream.cpp", + "//foundation/multimedia/audio_standard/services/src/audio_flinger/client/audio_system_manager.cpp", ] public_configs = [ ":audio_client_public_config" ] diff --git a/interfaces/inner_api/native/audiorenderer/BUILD.gn b/interfaces/inner_api/native/audiorenderer/BUILD.gn index 45592a9..b6b996b 100644 --- a/interfaces/inner_api/native/audiorenderer/BUILD.gn +++ b/interfaces/inner_api/native/audiorenderer/BUILD.gn @@ -24,7 +24,7 @@ config("audio_renderer_config") { "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include", "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include", "//foundation/multimedia/audio_standard/services/include", - "//foundation/multimedia/audio_standard/services/include/client", + "//foundation/multimedia/audio_standard/services/include/audio_flinger/client", "//foundation/multimedia/audio_standard/services/test", "//utils/native/base/include", "$pulseaudio_dir/src", @@ -104,7 +104,7 @@ ohos_executable("audio_voip_test") { "//foundation/multimedia/audio_standard/frameworks/native/audiostream/include", "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include", "//foundation/multimedia/audio_standard/services/include", - "//foundation/multimedia/audio_standard/services/include/client", + "//foundation/multimedia/audio_standard/services/include/audio_flinger/client", "//utils/native/base/include", "$pulseaudio_dir/src", "$pulseaudio_dir/confgure/src", diff --git a/interfaces/inner_api/native/audioringtone/BUILD.gn b/interfaces/inner_api/native/audioringtone/BUILD.gn index 2763a5f..5e1c648 100644 --- a/interfaces/inner_api/native/audioringtone/BUILD.gn +++ b/interfaces/inner_api/native/audioringtone/BUILD.gn @@ -15,14 +15,14 @@ import("//build/ohos.gni") ohos_shared_library("audio_ringtone_client") { install_enable = true - sources = [ "//foundation/multimedia/audio_standard/services/src/client/audio_ringtone_manager.cpp" ] + sources = [ "//foundation/multimedia/audio_standard/services/src/audio_flinger/client/audio_ringtone_manager.cpp" ] public_configs = [ ":ringtone_external_library_config" ] include_dirs = [ "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audioringtone/include", "//foundation/multimedia/audio_standard/frameworks/native/ringtoneplayer/include", - "//foundation/multimedia/audio_standard/services/include/client", + "//foundation/multimedia/audio_standard/services/include/audio_flinger/client", "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include", "//foundation/multimedia/medialibrary_standard/interfaces/innerkits/native/include", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb/include", diff --git a/interfaces/inner_api/native/opensles/BUILD.gn b/interfaces/inner_api/native/opensles/BUILD.gn index 5b72fc0..75227d0 100644 --- a/interfaces/inner_api/native/opensles/BUILD.gn +++ b/interfaces/inner_api/native/opensles/BUILD.gn @@ -25,7 +25,7 @@ config("audio_renderer_config") { "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiosession/include", "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include", "//foundation/multimedia/audio_standard/services/include", - "//foundation/multimedia/audio_standard/services/include/client", + "//foundation/multimedia/audio_standard/services/include/audio_flinger/client", "//foundation/multimedia/audio_standard/services/test", "//utils/native/base/include", "$pulseaudio_dir/src", diff --git a/services/BUILD.gn b/services/BUILD.gn index 3f598dd..6b7c925 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -28,7 +28,7 @@ config("audio_service_config") { include_dirs = [ "include", - "include/server", + "include/audio_flinger/server", "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiocommon/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/multimedia/audio_standard/frameworks/native/audiocapturer/include", @@ -46,8 +46,8 @@ ohos_shared_library("audio_service") { install_enable = true sources = [ - "src/server/audio_manager_stub.cpp", - "src/server/audio_server.cpp", + "src/audio_flinger/server/audio_manager_stub.cpp", + "src/audio_flinger/server/audio_server.cpp", ] configs = [ ":audio_service_config" ] @@ -91,7 +91,7 @@ ohos_prebuilt_etc("audio_policy.rc") { config("audio_policy_public_config") { include_dirs = [ "//foundation/multimedia/audio_standard/services/include", - "//foundation/multimedia/audio_standard/services/include/client", + "//foundation/multimedia/audio_standard/services/include/audio_flinger/client", "//foundation/distributedschedule/safwk/services/safwk/include", "//foundation/multimedia/audio_standard/frameworks/native/audioadapter/include", "//foundation/multimedia/audio_standard/frameworks/native/audiopolicy/include", diff --git a/services/include/audio_error.h b/services/include/audio_flinger/client/audio_error.h similarity index 100% rename from services/include/audio_error.h rename to services/include/audio_flinger/client/audio_error.h diff --git a/services/include/client/audio_manager_proxy.h b/services/include/audio_flinger/client/audio_manager_proxy.h similarity index 100% rename from services/include/client/audio_manager_proxy.h rename to services/include/audio_flinger/client/audio_manager_proxy.h diff --git a/services/include/client/audio_ringtone_manager.h b/services/include/audio_flinger/client/audio_ringtone_manager.h similarity index 100% rename from services/include/client/audio_ringtone_manager.h rename to services/include/audio_flinger/client/audio_ringtone_manager.h diff --git a/services/include/audio_server_death_recipient.h b/services/include/audio_flinger/client/audio_server_death_recipient.h similarity index 100% rename from services/include/audio_server_death_recipient.h rename to services/include/audio_flinger/client/audio_server_death_recipient.h diff --git a/services/include/client/audio_service_client.h b/services/include/audio_flinger/client/audio_service_client.h similarity index 100% rename from services/include/client/audio_service_client.h rename to services/include/audio_flinger/client/audio_service_client.h diff --git a/services/include/client/audio_timer.h b/services/include/audio_flinger/client/audio_timer.h similarity index 100% rename from services/include/client/audio_timer.h rename to services/include/audio_flinger/client/audio_timer.h diff --git a/services/include/server/audio_server.h b/services/include/audio_flinger/server/audio_server.h similarity index 100% rename from services/include/server/audio_server.h rename to services/include/audio_flinger/server/audio_server.h diff --git a/services/src/client/audio_manager_proxy.cpp b/services/src/audio_flinger/client/audio_manager_proxy.cpp similarity index 100% rename from services/src/client/audio_manager_proxy.cpp rename to services/src/audio_flinger/client/audio_manager_proxy.cpp diff --git a/services/src/client/audio_ringtone_manager.cpp b/services/src/audio_flinger/client/audio_ringtone_manager.cpp similarity index 100% rename from services/src/client/audio_ringtone_manager.cpp rename to services/src/audio_flinger/client/audio_ringtone_manager.cpp diff --git a/services/src/client/audio_service_client.cpp b/services/src/audio_flinger/client/audio_service_client.cpp similarity index 100% rename from services/src/client/audio_service_client.cpp rename to services/src/audio_flinger/client/audio_service_client.cpp diff --git a/services/src/client/audio_session.cpp b/services/src/audio_flinger/client/audio_session.cpp similarity index 100% rename from services/src/client/audio_session.cpp rename to services/src/audio_flinger/client/audio_session.cpp diff --git a/services/src/client/audio_stream.cpp b/services/src/audio_flinger/client/audio_stream.cpp similarity index 100% rename from services/src/client/audio_stream.cpp rename to services/src/audio_flinger/client/audio_stream.cpp diff --git a/services/src/client/audio_system_manager.cpp b/services/src/audio_flinger/client/audio_system_manager.cpp similarity index 100% rename from services/src/client/audio_system_manager.cpp rename to services/src/audio_flinger/client/audio_system_manager.cpp diff --git a/services/src/server/audio_manager_stub.cpp b/services/src/audio_flinger/server/audio_manager_stub.cpp similarity index 100% rename from services/src/server/audio_manager_stub.cpp rename to services/src/audio_flinger/server/audio_manager_stub.cpp diff --git a/services/src/server/audio_server.cpp b/services/src/audio_flinger/server/audio_server.cpp similarity index 100% rename from services/src/server/audio_server.cpp rename to services/src/audio_flinger/server/audio_server.cpp diff --git a/test/unittest/opensles_test/BUILD.gn b/test/unittest/opensles_test/BUILD.gn index 4bd819f..be0fa30 100644 --- a/test/unittest/opensles_test/BUILD.gn +++ b/test/unittest/opensles_test/BUILD.gn @@ -26,7 +26,7 @@ config("audio_renderer_config") { "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiosession/include", "//foundation/multimedia/audio_standard/interfaces/inner_api/native/audiomanager/include", "//foundation/multimedia/audio_standard/services/include", - "//foundation/multimedia/audio_standard/services/include/client", + "//foundation/multimedia/audio_standard/services/include/audio_flinger/client", "//foundation/multimedia/audio_standard/services/test", "//utils/native/base/include", "$pulseaudio_dir/src",