feat: shuffle play an album, artist or playlist with a long press
Holding South on a row, or shift+s on the keyboard, plays its tracks in random order with track shuffle on, so turning shuffle off goes back to their own order. On a song row it shuffles the page the song is on. An artist plays every track of every album, fetched a few albums at a time. South now acts on release, so a long press can mean something else. A long press on a row with nothing to shuffle activates as before.
This commit is contained in:
+9
-1
@@ -38,6 +38,8 @@ pub enum Control {
|
||||
/// Cycles the shuffle mode on now playing: the queue button on a
|
||||
/// controller, a key of its own on the keyboard.
|
||||
Shuffle,
|
||||
/// Shuffle play on a row: a long press of activate on a controller.
|
||||
ShufflePlay,
|
||||
/// Steam + X brings up Steam's on-screen keyboard. Nothing to show for a
|
||||
/// real keyboard.
|
||||
OnScreenKeyboard,
|
||||
@@ -45,7 +47,7 @@ pub enum Control {
|
||||
|
||||
#[cfg(test)]
|
||||
impl Control {
|
||||
pub const ALL: [Control; 13] = [
|
||||
pub const ALL: [Control; 14] = [
|
||||
Control::Activate,
|
||||
Control::Back,
|
||||
Control::PlayPause,
|
||||
@@ -58,6 +60,7 @@ impl Control {
|
||||
Control::Volume,
|
||||
Control::Mute,
|
||||
Control::Shuffle,
|
||||
Control::ShufflePlay,
|
||||
Control::OnScreenKeyboard,
|
||||
];
|
||||
}
|
||||
@@ -86,10 +89,12 @@ pub fn icons(prompts: Prompts, control: Control) -> &'static [&'static [u8]] {
|
||||
Volume => &[icon!("keyboard", "keyboard_minus"), icon!("keyboard", "keyboard_plus")],
|
||||
Mute => &[icon!("keyboard", "keyboard_m")],
|
||||
Shuffle => &[icon!("keyboard", "keyboard_s")],
|
||||
ShufflePlay => &[icon!("keyboard", "keyboard_shift"), icon!("keyboard", "keyboard_s")],
|
||||
OnScreenKeyboard => &[],
|
||||
},
|
||||
Prompts::Pad(Family::Xbox) => match control {
|
||||
Activate => &[icon!("xbox", "xbox_button_color_a")],
|
||||
ShufflePlay => &[icon!("xbox", "xbox_button_color_a")],
|
||||
Back => &[icon!("xbox", "xbox_button_color_b")],
|
||||
PlayPause => &[icon!("xbox", "xbox_button_color_x")],
|
||||
Queue => &[icon!("xbox", "xbox_button_color_y")],
|
||||
@@ -105,6 +110,7 @@ pub fn icons(prompts: Prompts, control: Control) -> &'static [&'static [u8]] {
|
||||
},
|
||||
Prompts::Pad(Family::PlayStation) => match control {
|
||||
Activate => &[icon!("playstation", "playstation_button_color_cross")],
|
||||
ShufflePlay => &[icon!("playstation", "playstation_button_color_cross")],
|
||||
Back => &[icon!("playstation", "playstation_button_color_circle")],
|
||||
PlayPause => &[icon!("playstation", "playstation_button_color_square")],
|
||||
Queue => &[icon!("playstation", "playstation_button_color_triangle")],
|
||||
@@ -131,6 +137,7 @@ pub fn icons(prompts: Prompts, control: Control) -> &'static [&'static [u8]] {
|
||||
// By position, as gilrs reports buttons: the bottom face button is B on a Switch.
|
||||
Prompts::Pad(Family::Switch) => match control {
|
||||
Activate => &[icon!("switch", "switch_button_b")],
|
||||
ShufflePlay => &[icon!("switch", "switch_button_b")],
|
||||
Back => &[icon!("switch", "switch_button_a")],
|
||||
PlayPause => &[icon!("switch", "switch_button_y")],
|
||||
Queue => &[icon!("switch", "switch_button_x")],
|
||||
@@ -149,6 +156,7 @@ pub fn icons(prompts: Prompts, control: Control) -> &'static [&'static [u8]] {
|
||||
},
|
||||
Prompts::Pad(Family::SteamDeck) => match control {
|
||||
Activate => &[icon!("steamdeck", "steamdeck_button_a")],
|
||||
ShufflePlay => &[icon!("steamdeck", "steamdeck_button_a")],
|
||||
Back => &[icon!("steamdeck", "steamdeck_button_b")],
|
||||
PlayPause => &[icon!("steamdeck", "steamdeck_button_x")],
|
||||
Queue => &[icon!("steamdeck", "steamdeck_button_y")],
|
||||
|
||||
Reference in New Issue
Block a user