fix: switch to libmpv2

while also building with the build_libmpv feature; mpv.lib is now redundant

Author: Vernoxvernax

.github/workflows/dev-builds.yml

@@ -11,8 +11,6 @@ on:
       - ".github/workflows/**.yml"
       - "src/**.rs"
       - "./Cargo.toml"
-      - "./mpv/**.lib" # Will hopefully soon be removed when I finally get to create the damn lib file in a CI
-      - ".cargo/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -31,14 +29,20 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt update
-        sudo apt install libmpv-dev gcc-mingw-w64 -y
+        sudo apt install libmpv-dev gcc-mingw-w64 7z -y
         rustup target add x86_64-pc-windows-gnu
-    
+
+    - name: Get libmpv for the windows build
+      run: |
+        wget https://downloads.sourceforge.net/project/mpv-player-windows/libmpv/mpv-dev-x86_64-20250928-git-db2b436.7z -O mpv.7z
+        7z e -y mpv.7z -o64
+
     - name: Build Linux and Windows bin
       run: |
+        export MPV_SOURCE="$(pwd)"
         cargo build --release
         cargo build --release --target=x86_64-pc-windows-gnu
-    
+
     - name: Rename artifacts
       run: |
         mv ./target/release/puddler puddler-${GITHUB_SHA::7}-dev

Cargo.toml

@@ -14,11 +14,11 @@ dirs = "6.0.0"
 discord-presence = "2.1.0"
 futures = "0.3.31"
 isolanguage-1 = { version = "0.2.3", git = "https://github.com/Vernoxvernax/isolanguage-1.git" }
-libmpv-sirno = "2.0.2-fork.1"
+libmpv2 = { git = "https://github.com/Vernoxvernax/libmpv2-rs.git", version = "5.0.1", features = ["build_libmpv"] }
 regex = "1.11.3"
 reqwest = { version = "0.12.15", features = ["blocking"] }
-serde = "1.0.219"
-serde_derive = "1.0.227"
+serde = "1.0.228"
+serde_derive = "1.0.228"
 serde_json = "1.0.140"
 tokio = { version = "1.44.2", features = ["full"] }
 tokio-tungstenite = { version = "0.28.0", features = ["native-tls"] }

config.toml

@@ -2,7 +2,7 @@ use futures::{
   SinkExt, StreamExt,
   stream::{SplitSink, SplitStream},
 };
-use libmpv::{Mpv, events::Event};
+use libmpv2::{Mpv, events::Event};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::{
@@ -316,7 +316,7 @@ impl Player {
       config.media_center_type.to_string()
     );
 
-    let mpv = Mpv::new().expect("Failed to create mpv handle!");
+    let mut mpv = Mpv::new().expect("Failed to create mpv handle!");
 
     if let Some(path) = &self.settings.mpv_config_location {
       mpv.set_property("config-dir", path.clone()).unwrap();
@@ -353,8 +353,7 @@ impl Player {
       .set_property("title", mpv_title)
       .expect("Failed to configure title.");
 
-    let mut ctx = mpv.create_event_context();
-    ctx
+    mpv
       .disable_deprecated_events()
       .expect("Failed to disable deprecated events.");
 
@@ -400,11 +399,11 @@ impl Player {
             match json_message.Data.get("Command").unwrap().as_str().unwrap() {
               "PlayPause" => {
                 if paused {
-                  mpv.unpause().unwrap();
+                  mpv.set_property("pause", false).unwrap();
                   paused = false;
                   old_pos -= 16.0;
                 } else {
-                  mpv.pause().unwrap();
+                  mpv.set_property("pause", true).unwrap();
                   paused = true;
                 }
               },
@@ -416,7 +415,7 @@ impl Player {
           }
         }
       }
-      while let Some(event_res) = ctx.wait_event(0.0) {
+      while let Some(event_res) = mpv.wait_event(0.0) {
         let event = if let Ok(event) = event_res {
           event
         } else {
@@ -465,7 +464,7 @@ impl Player {
           },
         }
       }
-      let result: Result<f64, libmpv::Error> = mpv.get_property("time-pos");
+      let result: Result<f64, libmpv2::Error> = mpv.get_property("time-pos");
       if let Ok(current_time) = result {
         if let Ok(track) = mpv.get_property::<String>("current-tracks/audio/src-id") {
           audio_track = track.parse::<u32>().unwrap();