mark/musicdb
1
0
Fork 0
mirror of https://github.com/Dummi26/musicdb.git synced 2026-04-28 17:49:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: playback-via-mpv, rust 2024

Browse Source
This commit is contained in:
Mark
2026-04-15 22:07:49 +02:00
committed by Mark
parent 8d4d418166
commit ab17477285
12 changed files with 460 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
musicdb-client/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "musicdb-client"
version = "0.1.0"
edition = "2021"
edition = "2024"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -32,5 +32,7 @@ merscfg = []
mers = []
playback = []
default-playback = ["playback", "musicdb-lib/default-playback"]
playback-via-sleep = ["playback", "musicdb-lib/playback-via-sleep"]
playback-via-mpv = ["playback", "musicdb-lib/playback-via-mpv"]
playback-via-playback-rs = ["playback", "musicdb-lib/playback-via-playback-rs"]
playback-via-rodio = ["playback", "musicdb-lib/playback-via-rodio"]

12
musicdb-client/src/gui_idle_display.rs
View File

@@ -1,13 +1,13 @@
use std::sync::{atomic::AtomicBool, Arc};
use std::sync::{Arc, atomic::AtomicBool};
use musicdb_lib::data::ArtistId;
use speedy2d::{color::Color, dimen::Vec2, image::ImageHandle, shape::Rectangle};
use crate::{
gui::{rect_from_rel, DrawInfo, GuiAction, GuiElem, GuiElemCfg, GuiServerImage},
gui::{DrawInfo, GuiAction, GuiElem, GuiElemCfg, GuiServerImage, rect_from_rel},
gui_anim::AnimationController,
gui_base::Button,
gui_playback::{get_right_x, image_display, CurrentInfo},
gui_playback::{CurrentInfo, get_right_x, image_display},
gui_playpause::PlayPause,
gui_text::{AdvancedLabel, Label},
};
@@ -126,7 +126,7 @@ impl GuiElem for IdleDisplay {
self.c_top_label.content = if let Some(song) = self.current_info.current_song {
info.gui_config
.idle_top_text
.gen(&info.database, info.database.get_song(&song))
.gen_new(&info.database, info.database.get_song(&song))
} else {
vec![]
};
@@ -134,7 +134,7 @@ impl GuiElem for IdleDisplay {
self.c_side1_label.content = if let Some(song) = self.current_info.current_song {
info.gui_config
.idle_side1_text
.gen(&info.database, info.database.get_song(&song))
.gen_new(&info.database, info.database.get_song(&song))
} else {
vec![]
};
@@ -142,7 +142,7 @@ impl GuiElem for IdleDisplay {
self.c_side2_label.content = if let Some(song) = self.current_info.current_song {
info.gui_config
.idle_side2_text
.gen(&info.database, info.database.get_song(&song))
.gen_new(&info.database, info.database.get_song(&song))
} else {
vec![]
};

6
musicdb-client/src/gui_statusbar.rs
View File

@@ -1,11 +1,11 @@
use std::sync::{atomic::AtomicBool, Arc};
use std::sync::{Arc, atomic::AtomicBool};
use speedy2d::{dimen::Vec2, shape::Rectangle};
use crate::{
gui::{DrawInfo, GuiElem, GuiElemCfg},
gui_anim::AnimationController,
gui_playback::{image_display, CurrentInfo},
gui_playback::{CurrentInfo, image_display},
gui_playpause::PlayPause,
gui_text::AdvancedLabel,
};
@@ -61,7 +61,7 @@ impl GuiElem for StatusBar {
self.c_song_label.content = if let Some(song) = self.current_info.current_song {
info.gui_config
.status_bar_text
.gen(&info.database, info.database.get_song(&song))
.gen_new(&info.database, info.database.get_song(&song))
} else {
vec![]
};

48
musicdb-client/src/textcfg.rs
View File

@@ -3,7 +3,7 @@ use std::{
str::{Chars, FromStr},
};
use musicdb_lib::data::{database::Database, song::Song, CoverId, GeneralData};
use musicdb_lib::data::{CoverId, GeneralData, database::Database, song::Song};
use speedy2d::color::Color;
use crate::gui_text::{AdvancedContent, Content, ImageSource};
@@ -38,7 +38,7 @@ pub enum TextPart {
ImgCustom(TextBuilder),
}
impl TextBuilder {
pub fn gen(
pub fn gen_new(
&self,
db: &Database,
current_song: Option<&Song>,
@@ -151,40 +151,39 @@ impl TextBuilder {
}
}
TextPart::TagEq(p) => {
for (i, gen) in all_general(db, &current_song).into_iter().enumerate() {
if let Some(_) = gen.and_then(|gen| gen.tags.iter().find(|t| *t == p)) {
push!(match i {
0 => 's',
1 => 'a',
2 => 'A',
_ => unreachable!("array length should be 3"),
}
.to_string());
for (i, g) in all_general(db, &current_song).into_iter().enumerate() {
if let Some(_) = g.and_then(|g| g.tags.iter().find(|t| *t == p)) {
push!(
match i {
0 => 's',
1 => 'a',
2 => 'A',
_ => unreachable!("array length should be 3"),
}
.to_string()
);
break;
}
}
}
TextPart::TagEnd(p) => {
for gen in all_general(db, &current_song) {
if let Some(t) =
gen.and_then(|gen| gen.tags.iter().find(|t| t.starts_with(p)))
{
for g in all_general(db, &current_song) {
if let Some(t) = g.and_then(|g| g.tags.iter().find(|t| t.starts_with(p))) {
push!(t[p.len()..].to_owned());
break;
}
}
}
TextPart::TagContains(p) => {
for gen in all_general(db, &current_song) {
if let Some(t) = gen.and_then(|gen| gen.tags.iter().find(|t| t.contains(p)))
{
for g in all_general(db, &current_song) {
if let Some(t) = g.and_then(|g| g.tags.iter().find(|t| t.contains(p))) {
push!(t.to_owned());
break;
}
}
}
TextPart::If(condition, yes, no) => {
if !condition.gen(db, current_song).is_empty() {
if !condition.gen_new(db, current_song).is_empty() {
yes.gen_to(db, current_song, out, line, scale, align, color);
} else {
no.gen_to(db, current_song, out, line, scale, align, color);
@@ -195,7 +194,7 @@ impl TextBuilder {
}
TextPart::ImgCustom(path) => {
push_img!(ImageSource::CustomFile(
path.gen(db, current_song)
path.gen_new(db, current_song)
.into_iter()
.flat_map(|v| v.into_iter().map(|(v, _, _)| v.to_string()))
.collect()
@@ -326,7 +325,7 @@ impl TextBuilder {
None => {
return Err(TextBuilderParseError::InvalidImageSourceName(
src,
))
));
}
Some(':') => break,
Some(c) => src.push(c),
@@ -349,7 +348,7 @@ impl TextBuilder {
}
"CustomFile" => TextPart::ImgCustom(Self::from_chars(chars)?),
_ => {
return Err(TextBuilderParseError::InvalidImageSourceName(src))
return Err(TextBuilderParseError::InvalidImageSourceName(src));
}
});
}
@@ -419,7 +418,10 @@ impl Display for TextBuilderParseError {
write!(f, "Unknown tag mode '{mode}': Allowed are only _, > or =.")
}
Self::TooFewCharsForColor => write!(f, "Too few chars for color: Syntax is \\cRRGGBB."),
Self::ColorNotHex => write!(f, "Color value wasn't a hex number! Syntax is \\cRRGGBB, where R, G, and B are values from 0-9 and A-F (hex 0-F)."),
Self::ColorNotHex => write!(
f,
"Color value wasn't a hex number! Syntax is \\cRRGGBB, where R, G, and B are values from 0-9 and A-F (hex 0-F)."
),
Self::CouldntParse(v, t) => write!(f, "Couldn't parse value '{v}' to type '{t}'."),
Self::InvalidImageSourceName(name) => write!(f, "Invalid image source name: '{name}'."),
Self::InvalidImageCoverId(id) => write!(f, "Invalid image cover id: '{id}'."),