From 0c4bb23dd33cb4e2bc671a5d011fb9aa8715f5b6 Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Thu, 9 Sep 2021 16:11:45 +0100 Subject: [PATCH] Rename `audioVolume` parameter to `volume` The new name is consistent with the corresponding parameters to `onVolumeChanged`, `setDeviceVolume` and `onDeviceVolumeChanged`. PiperOrigin-RevId: 395705288 --- .../exoplayer2/ext/cast/CastPlayer.java | 2 +- .../android/exoplayer2/ForwardingPlayer.java | 4 ++-- .../com/google/android/exoplayer2/Player.java | 4 ++-- .../android/exoplayer2/ExoPlayerImpl.java | 2 +- .../android/exoplayer2/SimpleExoPlayer.java | 20 +++++++++---------- .../exoplayer2/testutil/StubExoPlayer.java | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java index c8d6a4ba99..3e6f7a7e8a 100644 --- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java +++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java @@ -678,7 +678,7 @@ public final class CastPlayer extends BasePlayer { /** This method is not supported and does nothing. */ @Override - public void setVolume(float audioVolume) {} + public void setVolume(float volume) {} /** This method is not supported and returns 1. */ @Override diff --git a/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java b/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java index b1a7ae0405..1f990befef 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/ForwardingPlayer.java @@ -525,8 +525,8 @@ public class ForwardingPlayer implements Player { } @Override - public void setVolume(float audioVolume) { - player.setVolume(audioVolume); + public void setVolume(float volume) { + player.setVolume(volume); } @Override diff --git a/library/common/src/main/java/com/google/android/exoplayer2/Player.java b/library/common/src/main/java/com/google/android/exoplayer2/Player.java index b24d29db4c..f1eb502d08 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/Player.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/Player.java @@ -2210,9 +2210,9 @@ public interface Player { /** * Sets the audio volume, with 0 being silence and 1 being unity gain (signal unchanged). * - * @param audioVolume Linear output gain to apply to all audio channels. + * @param volume Linear output gain to apply to all audio channels. */ - void setVolume(@FloatRange(from = 0) float audioVolume); + void setVolume(@FloatRange(from = 0) float volume); /** * Returns the audio volume, with 0 being silence and 1 being unity gain (signal unchanged). diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java index 8933b388e9..9ba5c42394 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -1010,7 +1010,7 @@ import java.util.concurrent.CopyOnWriteArraySet; /** This method is not supported and does nothing. */ @Override - public void setVolume(float audioVolume) {} + public void setVolume(float volume) {} /** This method is not supported and returns 1. */ @Override diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java index 849cdc8433..2e2615cfca 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java @@ -452,7 +452,7 @@ public class SimpleExoPlayer extends BasePlayer @Nullable private DecoderCounters audioDecoderCounters; private int audioSessionId; private AudioAttributes audioAttributes; - private float audioVolume; + private float volume; private boolean skipSilenceEnabled; private List currentCues; @Nullable private VideoFrameMetadataListener videoFrameMetadataListener; @@ -517,7 +517,7 @@ public class SimpleExoPlayer extends BasePlayer componentListener); // Set initial values. - audioVolume = 1; + volume = 1; if (Util.SDK_INT < 21) { audioSessionId = initializeKeepSessionIdAudioTrack(C.AUDIO_SESSION_ID_UNSET); } else { @@ -870,24 +870,24 @@ public class SimpleExoPlayer extends BasePlayer } @Override - public void setVolume(float audioVolume) { + public void setVolume(float volume) { verifyApplicationThread(); - audioVolume = Util.constrainValue(audioVolume, /* min= */ 0, /* max= */ 1); - if (this.audioVolume == audioVolume) { + volume = Util.constrainValue(volume, /* min= */ 0, /* max= */ 1); + if (this.volume == volume) { return; } - this.audioVolume = audioVolume; + this.volume = volume; sendVolumeToRenderers(); - analyticsCollector.onVolumeChanged(audioVolume); + analyticsCollector.onVolumeChanged(volume); // TODO(internal b/187152483): Events should be dispatched via ListenerSet for (Listener listener : listeners) { - listener.onVolumeChanged(audioVolume); + listener.onVolumeChanged(volume); } } @Override public float getVolume() { - return audioVolume; + return volume; } @Override @@ -1772,7 +1772,7 @@ public class SimpleExoPlayer extends BasePlayer } private void sendVolumeToRenderers() { - float scaledVolume = audioVolume * audioFocusManager.getVolumeMultiplier(); + float scaledVolume = volume * audioFocusManager.getVolumeMultiplier(); sendRendererMessage(TRACK_TYPE_AUDIO, MSG_SET_VOLUME, scaledVolume); } diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java index 9e866a3d9a..fece3444e5 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java @@ -543,7 +543,7 @@ public class StubExoPlayer extends BasePlayer implements ExoPlayer { } @Override - public void setVolume(float audioVolume) { + public void setVolume(float volume) { throw new UnsupportedOperationException(); }