Dangoware/dango-music-player
1
0
Fork 0
mirror of https://github.com/Dangoware/dango-music-player.git synced 2025-04-19 10:02:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

Added functions to create QueueItemType

Browse source
This commit is contained in:
MrDulfin 2024-06-02 22:46:29 -04:00
parent d094ee734b
commit ee0d4ee0d0
1 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/lib.rs
View file

@ -21,10 +21,10 @@ pub struct QueueItem<
U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items
L: Debug + PartialEq + Clone + Copy + Location // L: The Location Type. Optional but maybe useful L: Debug + PartialEq + Clone + Copy + Location // L: The Location Type. Optional but maybe useful
> { > {
pub(crate) item: QueueItemType<T, U>, pub item: QueueItemType<T, U>,
pub(crate) state: QueueState, pub state: QueueState,
pub(crate) source: Option<L>, pub source: Option<L>,
pub(crate) by_human: bool, pub by_human: bool,
} }
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -37,6 +37,20 @@ pub enum QueueItemType<
Multi(U) Multi(U)
} }
impl<
T: Debug + Clone + PartialEq, // T: The Singular Item Type
U: Debug + PartialEq + Clone + TrackGroup, // U: The Multi-Item Type. Needs to be tracked as multiple items
> QueueItemType<T, U> {
pub fn from_single(item: T) -> Self {
QueueItemType::Single(item)
}
pub fn from_multi(item: U) -> Self {
QueueItemType::Multi(item)
}
}
impl< impl<
T: Debug + Clone + PartialEq, T: Debug + Clone + PartialEq,
U: Debug + PartialEq + Clone + TrackGroup, U: Debug + PartialEq + Clone + TrackGroup,
@ -91,6 +105,15 @@ impl<
); );
} }
pub fn new(loop_: bool, shuffle: Option<Vec<usize>>) -> Self {
Queue {
items: Vec::new(),
played: Vec::new(),
loop_,
shuffle
}
}
pub fn set_items(&mut self, tracks: Vec<QueueItem<T, U, L>>) { pub fn set_items(&mut self, tracks: Vec<QueueItem<T, U, L>>) {
let mut tracks = tracks; let mut tracks = tracks;
self.items.clear(); self.items.clear();
@ -98,7 +121,8 @@ impl<
} }
/// Inserts an item after the AddHere item /// Inserts an item after the AddHere item
pub fn add_item(&mut self, item: QueueItemType<T, U>, source: Option<L>, by_human: bool) { pub fn add_item(&mut self, item: T, source: Option<L>, by_human: bool) {
let item = QueueItemType::from_single(item);
let mut i: usize = 0; let mut i: usize = 0;
self.items = self self.items = self
@ -128,7 +152,8 @@ impl<
} }
/// Inserts an item after the currently playing item /// Inserts an item after the currently playing item
pub fn add_item_next(&mut self, item: QueueItemType<T, U>, source: Option<L>) { pub fn add_item_next(&mut self, item: T, source: Option<L>) {
let item = QueueItemType::from_single(item);
use QueueState::*; use QueueState::*;
let empty = self.items.is_empty(); let empty = self.items.is_empty();