From 9eb2c1c4312adead7c81047aec838d9b1024efda Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sat, 19 Nov 2022 23:56:09 -0700
Subject: [PATCH] Remove old mpris comments

---
 apps/music-player/src/main.rs | 94 +----------------------------------
 1 file changed, 1 insertion(+), 93 deletions(-)

diff --git a/apps/music-player/src/main.rs b/apps/music-player/src/main.rs
index b4a77f1..dec15f9 100644
--- a/apps/music-player/src/main.rs
+++ b/apps/music-player/src/main.rs
@@ -81,6 +81,7 @@ async fn player_main(
 
     loop {
         futures_util::select! {
+            // TODO also update volume, shuffle status, and loop status
             status = playback_status.next() => {
                 let status = match status {
                     Some(v) => v,
@@ -184,97 +185,4 @@ fn main() {
             }
         }
     });
-
-    /*let mut first_loop = true;
-    let mut connected = false;
-
-    loop {
-        if !first_loop {
-            let wait = std::time::Duration::from_secs(1);
-            std::thread::sleep(wait);
-        }
-
-        first_loop = false;
-
-        if connected {
-            println!("Disconnected from MPRIS");
-            let msg = InMsg::Disconnected;
-            magpie.send_json_message(0, &msg);
-            connected = false;
-        }
-
-        println!("Connecting to MPRIS...");
-
-        let player = match player_finder.find_active() {
-            Ok(player) => player,
-            Err(err) => {
-                eprintln!("Couldn't find player: {:?}", err);
-                continue;
-            }
-        };
-
-        println!(
-            "Connected to \"{}\" ({})",
-            player.identity(),
-            player.bus_name()
-        );
-        connected = true;
-        magpie.send_json_message(0, &InMsg::Connected);
-
-        let metadata = player.get_metadata().unwrap();
-        let mut metadata_tracker = MetadataTracker::new(&mut magpie, &metadata);
-
-        let mut events = match player.events() {
-            Ok(events) => events,
-            Err(err) => {
-                eprintln!("Player events D-Bus error: {:?}", err);
-                continue;
-            }
-        };
-
-        loop {
-            let event = match events.next() {
-                None => break,
-                Some(Ok(e)) => e,
-                Some(Err(err)) => {
-                    eprintln!("D-Bus error while reading player events: {:?}", err);
-                    continue;
-                }
-            };
-
-            use mpris::Event::*;
-            let in_msg = match event {
-                Playing => Some(InMsg::PlaybackStatusChanged(PlaybackStatus::Playing)),
-                Paused => Some(InMsg::PlaybackStatusChanged(PlaybackStatus::Paused)),
-                Stopped => Some(InMsg::PlaybackStatusChanged(PlaybackStatus::Stopped)),
-                LoopingChanged(status) => {
-                    use mpris::LoopStatus::*;
-                    let status = match status {
-                        None => LoopStatus::None,
-                        Track => LoopStatus::Track,
-                        Playlist => LoopStatus::Playlist,
-                    };
-
-                    Some(InMsg::LoopingChanged(status))
-                }
-                ShuffleToggled(shuffle) => Some(InMsg::ShuffleChanged { shuffle }),
-                VolumeChanged(volume) => Some(InMsg::VolumeChanged {
-                    volume: volume as f32,
-                }),
-                PlayerShutDown => None,
-                TrackChanged(ref metadata) => {
-                    metadata_tracker.update(&mut magpie, metadata);
-                    None
-                }
-                _ => {
-                    eprintln!("Unhandled MPRIS message: {:?}", event);
-                    None
-                }
-            };
-
-            if let Some(msg) = in_msg {
-                magpie.send_json_message(0, &msg);
-            }
-        }
-    }*/
 }