Compare commits

..

2 commits

3 changed files with 508 additions and 108 deletions

596
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -10,11 +10,11 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
clap = { version = "4.4", features = ["derive"] } clap = { version = "4.5", features = ["derive"] }
image = "0.24" image = "0.25"
ggez = "0.9.3" ggez = "0.9.3"
freetype = { version = "0.7", optional = true } freetype = { version = "0.7", optional = true }
wgpu = "0.16" wgpu-types = "0.16"
[build-dependencies] [build-dependencies]
bindgen = { version = "0.69", optional = true } bindgen = { version = "0.69", optional = true }

View file

@ -9,7 +9,7 @@ use ggez::graphics::{
use ggez::input::keyboard::{self, KeyInput}; use ggez::input::keyboard::{self, KeyInput};
use ggez::mint::Vector2; use ggez::mint::Vector2;
use ggez::{Context, GameError, GameResult}; use ggez::{Context, GameError, GameResult};
use image::io::Reader as ImageReader; use image::ImageReader;
use image::DynamicImage; use image::DynamicImage;
use std::io::Cursor; use std::io::Cursor;
use std::path::PathBuf; use std::path::PathBuf;
@ -19,14 +19,14 @@ use std::thread;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
const POLL_TIME: Duration = Duration::from_millis(333); const POLL_TIME: Duration = Duration::from_millis(333);
const INIT_FONT_SIZE_X: f32 = 24.0; const INIT_FONT_SIZE_X: f32 = 36.0;
const INIT_FONT_SIZE_Y: f32 = 34.0; const INIT_FONT_SIZE_Y: f32 = 51.0;
const TEXT_X_OFFSET: f32 = 0.3; const TEXT_X_OFFSET: f32 = 0.3;
const TEXT_OFFSET_Y_SPACING: f32 = 0.4; const TEXT_OFFSET_Y_SPACING: f32 = 0.4;
const TEXT_HEIGHT_SCALE: f32 = 0.1; const TEXT_HEIGHT_SCALE: f32 = 0.1;
const ARTIST_HEIGHT_SCALE: f32 = 0.08; const ARTIST_HEIGHT_SCALE: f32 = 0.12;
const ALBUM_HEIGHT_SCALE: f32 = 0.08; const ALBUM_HEIGHT_SCALE: f32 = 0.12;
const TIMER_HEIGHT_SCALE: f32 = 0.07; const TIMER_HEIGHT_SCALE: f32 = 0.105;
const MIN_WIDTH_RATIO: f32 = 4.0 / 5.0; const MIN_WIDTH_RATIO: f32 = 4.0 / 5.0;
const INCREASE_AMT: f32 = 6.0 / 5.0; const INCREASE_AMT: f32 = 6.0 / 5.0;
const DECREASE_AMT: f32 = 5.0 / 6.0; const DECREASE_AMT: f32 = 5.0 / 6.0;
@ -457,7 +457,7 @@ impl MPDDisplay {
let ggez_img = Image::from_pixels( let ggez_img = Image::from_pixels(
ctx, ctx,
rgba8.as_raw(), rgba8.as_raw(),
wgpu::TextureFormat::Rgba8UnormSrgb, wgpu_types::TextureFormat::Rgba8UnormSrgb,
rgba8.width(), rgba8.width(),
rgba8.height(), rgba8.height(),
); );