src/meson.build

@@ -47,6 +47,5 @@ audrey_c = static_library(
     '--gresources',
     meson.project_source_root() / 'resources/audrey.gresource.xml',
   ],
-  vala_header: 'audrey.h',
   vala_gir: 'audrey-0.gir',
 )

src/mpv.rs

@@ -4,8 +4,7 @@
 #[allow(unreachable_code)]
 mod ffi;
 
-#[link(name = "mpv")]
+#[link(name = "mpv")] extern "C" {}
-extern "C" {}
 
 pub struct Error(std::ffi::c_int);
 
@@ -57,7 +56,7 @@ impl Handle {
                         name: unsafe { std::ffi::CStr::from_ptr(data.name) }
                             .to_str()
                             .unwrap(),
-                        value: unsafe { FormatData::new(data.format, data.data) },
+                        value: unsafe { FormatData::new(data.format, data.data)},
                     }
                 }),
             )),
@@ -74,7 +73,7 @@ impl Handle {
             22 => todo!("Event::PropertyChange"),
             24 => todo!("Event::QueueOverflow"),
             25 => todo!("Event::Hook"),
-            _ => Some(Event::Ignore(event.event_id)),
+            _ => Event::Ignore(event.event_id),
         }
     }
 }
@@ -133,15 +132,15 @@ impl<'a> FormatData<'a> {
 }
 
 pub struct EventProperty<'a> {
-    pub name: &'a str,
+    name: &'a str,
-    pub value: FormatData<'a>,
+    value: FormatData<'a>,
 }
 
 pub struct EventLogMessage<'a> {
-    pub prefix: &'a str,
+    prefix: &'a str,
-    pub level: &'a str,
+    level: &'a str,
-    pub text: &'a str,
+    text: &'a str,
-    pub log_level: i32,
+    log_level: i32,
 }
 
 pub enum EndFileReason {