From 1d835705c921d5a710dc205906f3751f64ed38b8 Mon Sep 17 00:00:00 2001 From: Andreas Pehrson Date: Tue, 17 Oct 2023 13:37:22 +0200 Subject: [PATCH] Remove LegacyAudioDeviceModule.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LegacyAudioDeviceModule depends on org.webrtc.voiceengine.WebRtcAudioTrack and org.webrtc.voiceengine.WebRtcAudioRecord, which were removed in https://webrtc.googlesource.com/src/+/6fc700ec3d1f86d06e203011aa8f375f32b39d9e. Including LegacyAudioDeviceModule results in build failures like: > /builds/worker/checkouts/gecko/third_party/libwebrtc/sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java:13: error: package org.webrtc.voiceengine does not exist > import org.webrtc.voiceengine.WebRtcAudioRecord; > ^ > /builds/worker/checkouts/gecko/third_party/libwebrtc/sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java:14: error: package org.webrtc.voiceengine does not exist > import org.webrtc.voiceengine.WebRtcAudioTrack; > ^ > /builds/worker/checkouts/gecko/third_party/libwebrtc/sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java:39: error: non-static method setSpeakerMute(boolean) cannot be referenced from a static context > WebRtcAudioTrack.setSpeakerMute(mute); > ^ > /builds/worker/checkouts/gecko/third_party/libwebrtc/sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java:44: error: non-static method setMicrophoneMute(boolean) cannot be referenced from a static context > WebRtcAudioRecord.setMicrophoneMute(mute); Bug: webrtc:7452 Change-Id: Icaa4447ec6dc274d89f827ce4d1cc13c3e9f55ad Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/323880 Reviewed-by: Henrik Andreassson Commit-Queue: Henrik Andreassson Reviewed-by: Björn Terelius Cr-Commit-Position: refs/heads/main@{#40953} --- .../webrtc/audio/LegacyAudioDeviceModule.java | 46 ------------------- 1 file changed, 46 deletions(-) delete mode 100644 sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java diff --git a/sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java b/sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java deleted file mode 100644 index de0d0d61f9..0000000000 --- a/sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2018 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -package org.webrtc.audio; - -import org.webrtc.voiceengine.WebRtcAudioRecord; -import org.webrtc.voiceengine.WebRtcAudioTrack; - -/** - * This class represents the legacy AudioDeviceModule that is currently hardcoded into C++ WebRTC. - * It will return a null native AudioDeviceModule pointer, leading to an internal object being - * created inside WebRTC that is controlled by static calls to the classes under the voiceengine - * package. Please use the new JavaAudioDeviceModule instead of this class. - */ -@Deprecated -public class LegacyAudioDeviceModule implements AudioDeviceModule { - @Override - public long getNativeAudioDeviceModulePointer() { - // Returning a null pointer will make WebRTC construct the built-in legacy AudioDeviceModule for - // Android internally. - return 0; - } - - @Override - public void release() { - // All control for this ADM goes through static global methods and the C++ object is owned - // internally by WebRTC. - } - - @Override - public void setSpeakerMute(boolean mute) { - WebRtcAudioTrack.setSpeakerMute(mute); - } - - @Override - public void setMicrophoneMute(boolean mute) { - WebRtcAudioRecord.setMicrophoneMute(mute); - } -}