Skip to content

Commit 8955a6c

Browse files
Vlad PopaAndroid (Google) Code Review
authored andcommitted
Merge "Add new mute state for port volume mute" into main
2 parents 50db70a + dc1ce4d commit 8955a6c

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

include/audiomanager/AudioManager.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ enum {
5959
PLAYER_MUTE_PLAYBACK_RESTRICTED = (1 << 3),
6060
PLAYER_MUTE_CLIENT_VOLUME = (1 << 4),
6161
PLAYER_MUTE_VOLUME_SHAPER = (1 << 5),
62+
PLAYER_MUTE_PORT_VOLUME = (1 << 6),
6263
};
6364

6465
struct mute_state_t {
@@ -72,8 +73,10 @@ struct mute_state_t {
7273
bool muteFromPlaybackRestricted = false;
7374
/** Flag used when audio track was muted by client volume. */
7475
bool muteFromClientVolume = false;
75-
/** Flag used when volume is muted by volume shaper. */
76+
/** Flag used when volume is muted by volume shaper. */
7677
bool muteFromVolumeShaper = false;
78+
/** Flag used when volume is muted by port volume. */
79+
bool muteFromPortVolume = false;
7780

7881
explicit operator int() const
7982
{
@@ -83,6 +86,7 @@ struct mute_state_t {
8386
result |= muteFromPlaybackRestricted * PLAYER_MUTE_PLAYBACK_RESTRICTED;
8487
result |= muteFromClientVolume * PLAYER_MUTE_CLIENT_VOLUME;
8588
result |= muteFromVolumeShaper * PLAYER_MUTE_VOLUME_SHAPER;
89+
result |= muteFromPortVolume * PLAYER_MUTE_PORT_VOLUME;
8690
return result;
8791
}
8892

0 commit comments

Comments
 (0)