feat: add volume control with the right stick and keys
Right stick up and down change the volume in steps of 5 and clicking it mutes; + (or =), - and m do the same on a keyboard, on every screen. The stick's dominant axis wins, so a diagonal push does not seek and change the volume at once. Any step unmutes. The level goes to playbin's volume on a cubic scale, so steps sound even, and to its mute. A pill shows the level for a moment after each change, the now-playing screen shows it under the times, and it is saved in settings.toml once the changes stop and on quit. Hint icons for the right stick and the keys are from Kenney's Input Prompts 1.5, like the others.
This commit is contained in:
+15
-1
@@ -33,6 +33,8 @@ pub enum Control {
|
||||
Search,
|
||||
NowPlaying,
|
||||
Seek,
|
||||
Volume,
|
||||
Mute,
|
||||
/// Steam + X brings up Steam's on-screen keyboard. Nothing to show for a
|
||||
/// real keyboard.
|
||||
OnScreenKeyboard,
|
||||
@@ -40,7 +42,7 @@ pub enum Control {
|
||||
|
||||
#[cfg(test)]
|
||||
impl Control {
|
||||
pub const ALL: [Control; 10] = [
|
||||
pub const ALL: [Control; 12] = [
|
||||
Control::Activate,
|
||||
Control::Back,
|
||||
Control::PlayPause,
|
||||
@@ -50,6 +52,8 @@ impl Control {
|
||||
Control::Search,
|
||||
Control::NowPlaying,
|
||||
Control::Seek,
|
||||
Control::Volume,
|
||||
Control::Mute,
|
||||
Control::OnScreenKeyboard,
|
||||
];
|
||||
}
|
||||
@@ -75,6 +79,8 @@ pub fn icons(prompts: Prompts, control: Control) -> &'static [&'static [u8]] {
|
||||
Search => &[icon!("keyboard", "keyboard_slash_forward")],
|
||||
NowPlaying => &[icon!("keyboard", "keyboard_f")],
|
||||
Seek => &[icon!("keyboard", "keyboard_arrows_horizontal")],
|
||||
Volume => &[icon!("keyboard", "keyboard_minus"), icon!("keyboard", "keyboard_plus")],
|
||||
Mute => &[icon!("keyboard", "keyboard_m")],
|
||||
OnScreenKeyboard => &[],
|
||||
},
|
||||
Prompts::Pad(Family::Xbox) => match control {
|
||||
@@ -87,6 +93,8 @@ pub fn icons(prompts: Prompts, control: Control) -> &'static [&'static [u8]] {
|
||||
Search => &[icon!("xbox", "xbox_button_view")],
|
||||
NowPlaying => &[icon!("xbox", "xbox_button_menu")],
|
||||
Seek => &[icon!("xbox", "xbox_dpad_horizontal")],
|
||||
Volume => &[icon!("xbox", "xbox_stick_r_vertical")],
|
||||
Mute => &[icon!("xbox", "xbox_stick_r_press")],
|
||||
OnScreenKeyboard => &[icon!("xbox", "xbox_guide"), icon!("xbox", "xbox_button_color_x")],
|
||||
},
|
||||
Prompts::Pad(Family::PlayStation) => match control {
|
||||
@@ -105,6 +113,8 @@ pub fn icons(prompts: Prompts, control: Control) -> &'static [&'static [u8]] {
|
||||
Search => &[icon!("playstation", "playstation5_button_create")],
|
||||
NowPlaying => &[icon!("playstation", "playstation5_button_options")],
|
||||
Seek => &[icon!("playstation", "playstation_dpad_horizontal")],
|
||||
Volume => &[icon!("playstation", "playstation_stick_r_vertical")],
|
||||
Mute => &[icon!("playstation", "playstation_stick_r_press")],
|
||||
// The pack has no PS button; Steam's own label says the same thing.
|
||||
OnScreenKeyboard => &[
|
||||
icon!("steamdeck", "steamdeck_button_guide"),
|
||||
@@ -122,6 +132,8 @@ pub fn icons(prompts: Prompts, control: Control) -> &'static [&'static [u8]] {
|
||||
Search => &[icon!("switch", "switch_button_minus")],
|
||||
NowPlaying => &[icon!("switch", "switch_button_plus")],
|
||||
Seek => &[icon!("switch", "switch_dpad_horizontal")],
|
||||
Volume => &[icon!("switch", "switch_stick_r_vertical")],
|
||||
Mute => &[icon!("switch", "switch_stick_r_press")],
|
||||
OnScreenKeyboard => &[
|
||||
icon!("switch", "switch_button_home"),
|
||||
icon!("switch", "switch_button_y"),
|
||||
@@ -143,6 +155,8 @@ pub fn icons(prompts: Prompts, control: Control) -> &'static [&'static [u8]] {
|
||||
Search => &[icon!("steamdeck", "steamdeck_button_view")],
|
||||
NowPlaying => &[icon!("steamdeck", "steamdeck_button_options")],
|
||||
Seek => &[icon!("steamdeck", "steamdeck_dpad_horizontal")],
|
||||
Volume => &[icon!("steamdeck", "steamdeck_stick_r_vertical")],
|
||||
Mute => &[icon!("steamdeck", "steamdeck_stick_r_press")],
|
||||
OnScreenKeyboard => &[
|
||||
icon!("steamdeck", "steamdeck_button_guide"),
|
||||
icon!("steamdeck", "steamdeck_button_x"),
|
||||
|
||||
Reference in New Issue
Block a user