diff --git a/docs/features.md b/docs/features.md index bbfb2d9b..0d8b9879 100644 --- a/docs/features.md +++ b/docs/features.md @@ -37,10 +37,3 @@ Default: Yes Load `libjack` at runtime as opposed to the standard dynamic linking. This is preferred as it allows `pw-jack` to intercept the loading at runtime to provide the Pipewire JACK server implementation. - -## `metadata` - -Default: No - -Provides access to the metadata API. This is experimental. Details on the JACK -metadata API can be found at . diff --git a/src/properties.rs b/src/properties.rs index bcf2e6ee..0c8bdea8 100644 --- a/src/properties.rs +++ b/src/properties.rs @@ -23,7 +23,6 @@ pub trait PropertyChangeHandler: Send { fn property_changed(&mut self, change: &PropertyChange); } -#[allow(dead_code)] //dead if we haven't enabled metadata pub(crate) unsafe extern "C" fn property_changed

( subject: j::jack_uuid_t, key: *const ::libc::c_char, diff --git a/src/tests/client.rs b/src/tests/client.rs index aa9837a8..5ff4fc9b 100644 --- a/src/tests/client.rs +++ b/src/tests/client.rs @@ -44,12 +44,9 @@ fn client_uuid_are_unique() { assert_ne!(client1.uuid_string(), ""); assert_ne!(client2.uuid_string(), ""); assert_ne!(client1.uuid_string(), client2.uuid_string()); - #[cfg(feature = "metadata")] - { - assert_ne!(client1.uuid(), 0); - assert_ne!(client2.uuid(), 0); - assert_ne!(client1.uuid(), client2.uuid()); - } + assert_ne!(client1.uuid(), 0); + assert_ne!(client2.uuid(), 0); + assert_ne!(client1.uuid(), client2.uuid()); } #[test] @@ -67,17 +64,14 @@ fn uuid_can_map_to_client_name() { client1.name_by_uuid_str(&client2.uuid_string()).unwrap(), "uuid-client-2" ); - #[cfg(feature = "metadata")] - { - assert_eq!( - client1.name_by_uuid(client1.uuid()).unwrap(), - "uuid-client-1" - ); - assert_eq!( - client1.name_by_uuid(client2.uuid()).unwrap(), - "uuid-client-2" - ); - } + assert_eq!( + client1.name_by_uuid(client1.uuid()).unwrap(), + "uuid-client-1" + ); + assert_eq!( + client1.name_by_uuid(client2.uuid()).unwrap(), + "uuid-client-2" + ); } #[test] @@ -86,10 +80,8 @@ fn nonexistant_uuid_to_client_name_returns_none() { let (client2, _) = crate::Client::new("dropped-client", crate::ClientOptions::NO_START_SERVER).unwrap(); let uuid_string = client2.uuid_string(); - #[cfg(feature = "metadata")] let uuid = client2.uuid(); drop(client2); assert_eq!(client1.name_by_uuid_str(&uuid_string), None); - #[cfg(feature = "metadata")] assert_eq!(client1.name_by_uuid(uuid), None); }