Rename audioVolume parameter to volume

The new name is consistent with the corresponding parameters to `onVolumeChanged`, `setDeviceVolume` and `onDeviceVolumeChanged`.

PiperOrigin-RevId: 395705288
This commit is contained in:
andrewlewis 2021-09-09 16:11:45 +01:00 committed by Oliver Woodman
parent 1bef1a2b38
commit 0c4bb23dd3
6 changed files with 17 additions and 17 deletions

View File

@ -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

View File

@ -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

View File

@ -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).

View File

@ -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

View File

@ -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<Cue> 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);
}

View File

@ -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();
}