readme.md

@@ -1,18 +0,0 @@
-# Funring ![representative screenshot](https://user-images.githubusercontent.com/37423245/279222372-2005566f-771e-4d19-9dd2-244d3cc4ed0c.png)
-
-A fun ring for your system tray that shows the status of the currently playing song(s)
-
-`funring [player]`
-
-written with swaybar on arch linux in mind
-
-### Installation
-
-1. `cargo install --path .`
-
-### Usage
-
-1. Start spotify or another [mpris compatible music player](https://wiki.archlinux.org/title/MPRIS#Supported_clients)
-2. `funring`
-
-if the wrong player is selected by default, pass a name i.e. `funring "Pragha Music Player"`

rust-toolchain.toml

@@ -1,2 +0,0 @@
-[toolchain]
-channel = "nightly-2023-10-28"

src/main.rs

@@ -1,74 +1,44 @@
-#![feature(test)]
-
-use std::collections::hash_map::DefaultHasher;
-use std::env::args_os;
-use std::hash::Hash;
-use std::hash::Hasher;
-
-use anyhow::Result;
-use glam::UVec2;
-use glam::Vec2;
 use mpris::PlaybackStatus;
 use mpris::PlayerFinder;
+use anyhow::Result;
 use tray_item::IconSource;
 use tray_item::TrayItem;
+use glam::UVec2;
 fn main() -> Result<()> {
     let pf = PlayerFinder::new()?;
     let players = pf.find_all()?;
 
-    for player in players.iter().map(|p| p.identity()) {
-        println!("found {player}");
-    }
+    let mut tracker = players[0].track_progress(400)?;
 
-    let player = if let Some(name) = args_os().nth(1) {
-        pf.find_by_name(&name.into_string().unwrap())?
-    } else {
-        pf.find_active()?
-    };
-
-    let mut tracker = player.track_progress(25)?;
-
-    let icon = IconSource::Data {
-        data: gen_icon(0.0, false),
-        height: RES,
-        width: RES,
-    };
+    let icon = IconSource::Data{data: gen_icon(0.0, false), height: RES, width: RES};
 
     let mut tray = TrayItem::new("funring", icon)?;
 
-    let mut last_hash = None;
-
-    println!("tracking {}", player.identity());
+    println!("Hello, {}!", players[0].identity());
     loop {
         let tick = tracker.tick();
-        let elapsed = tick.progress.position().as_millis() as f64;
-        let total = tick.progress.length();
-        if total.is_none() {continue};
-        let total = total.unwrap().as_millis();
+        let elapsed = tick.progress.position().as_millis() as f64
+            + tick.progress.age().as_millis() as f64 
+            * tick.progress.playback_rate();
+        let total = tick.progress.length().unwrap().as_millis();
         let prog = elapsed as f32 / total as f32;
         let playing = tick.progress.playback_status() == PlaybackStatus::Playing;
 
-        let buffer = gen_icon(prog, playing);
-        let hash = {
-            let mut hasher = DefaultHasher::new();
-            buffer.hash(&mut hasher);
-            hasher.finish()
-        };
-        if !last_hash.replace(hash).is_some_and(|h| h == hash) {
-            tray.set_icon(IconSource::Data {
-                data: buffer,
-                height: RES,
-                width: RES,
-            })?;
-        }
+        tray.set_icon(
+            IconSource::Data{data: gen_icon(prog, playing), height: RES, width: RES}
+        )?;
     }
 }
 
-const RES: i32 = 32;
+const RES: i32 = 8;
 const LEN: usize = (RES*RES) as usize;
 
-fn gen_icon(prog: f32, playing: bool) -> Vec<u8> {
-    let mut icon = vec![0; LEN * 4];
+fn gen_icon(
+    prog: f32,
+    playing: bool,
+) -> Vec<u8> {
+    let mut icon = Vec::with_capacity(LEN*4);
+    (0..LEN*4).for_each(|_| icon.push(0));
     for pix in 0..(LEN) {
         let x = pix % RES as usize;
         let y = pix / RES as usize;
@@ -76,32 +46,25 @@ fn gen_icon(prog: f32, playing: bool) -> Vec<u8> {
             UVec2::new(x as u32,y as u32),
             prog,
             playing,
-            &mut icon[0..LEN * 4],
+            &mut icon[0..LEN*4]
         );
     }
     icon
 }
 
 // TODO: integrate rust-gpu
-fn icon_cs(idx: UVec2, progress: f32, playing: bool, buf: &mut [u8]) {
-    let index = (idx.y * RES as u32 + idx.x) as usize;
-    let pix = &mut buf[4 * index..4 * index + 4];
-    pix[0] = 0;
+fn icon_cs(
+    pix: UVec2,
+    progress: f32,
+    playing: bool,
+    buf: &mut [u8],
+) {
+    let idx = (pix.y * RES as u32  + pix.x) as usize;
+    let pix = &mut buf[4*idx..4*idx+4];
+    pix[0] = 1;
 
-    let center = Vec2::splat(RES as f32 / 2.0);
-    let idx = idx.as_vec2() - center;
-    let radius = idx.length() / RES as f32 * 2.0;
-    let theta = std::f32::consts::PI - f32::atan2(idx.x, idx.y);
-
-    let offset = theta - progress * std::f32::consts::TAU;
-
-    if offset < 0.0 && (0.5..1.0).contains(&radius) {
-        pix[1] = if playing { 255 } else { 0 };
-        //pix[1] = if playing { 255 - (offset * -55.0) as u8 } else { 0 };
-        pix[2] = if playing { 0 } else { 95 };
-        pix[3] = 0;
-    } else if (0.5..1.0).contains(&radius) {
-        pix[1] = if playing { 6 } else { 20 };
+    if progress > idx as f32 / LEN as f32 {
+        pix[1] = 255;
         pix[2] = 0;
         pix[3] = 0;
     } else {
@@ -110,18 +73,3 @@ fn icon_cs(idx: UVec2, progress: f32, playing: bool, buf: &mut [u8]) {
         pix[3] = 0;
     }
 }
-
-extern crate test;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use test::Bencher;
-
-    use crate::gen_icon;
-
-    #[bench]
-    fn generate_icon(b: &mut Bencher) {
-        b.iter(|| gen_icon(0.5, true));
-    }
-}