Refactor plugin configuration flags to use appropriate types and improve FFI compatibility

Author: animafps

example/src/lib.rs

@@ -15,7 +15,7 @@ mod plugin {
     const NAME: &str = "Example Plugin";
     const PLUGIN_VER: i32 = MakeVersion!(1, 0);
     const API_VER: i32 = ffi::VAPOURSYNTH_API_VERSION;
-    const FLAGS: i32 = PluginConfigFlags::NONE.bits();
+    const FLAGS: PluginConfigFlags = PluginConfigFlags::NONE;
 
     #[vapoursynth_filter(video)]
     #[derive(Clone)]

rustsynth-derive/src/lib.rs

@@ -115,7 +115,7 @@ fn generate_vs_plugin(input: ItemMod) -> syn::Result<proc_macro2::TokenStream> {
                     name.as_ptr(),
                     plugin_version,
                     api_version,
-                    flags,
+                    flags.bits() as i32,
                     plugin
                 );
                 // Register all filters in this plugin

rustsynth-sys/build.rs

@@ -119,7 +119,6 @@ fn main() {
         .rustified_enum("VSTransferCharacteristics")
         .bitfield_enum("VSCoreCreationFlags")
         .bitfield_enum("VSPluginConfigFlags")
-        .translate_enum_integer_types(true)
         .use_core()
         .prepend_enum_name(false)
         .derive_eq(false)

rustsynth/src/core.rs

@@ -44,13 +44,19 @@ bitflags! {
     /// Options when creating a core.
     pub struct CoreCreationFlags: u32 {
         /// No flags.
-        const NONE = 0b00000000;
+        const NONE = 0;
         /// Required to use the graph inspection api functions. Increases memory usage due to the extra information stored.
-        const ENABLE_GRAPH_INSPECTION = 0b00000001;
+        const ENABLE_GRAPH_INSPECTION = ffi::VSCoreCreationFlags::ccfEnableGraphInspection.0;
         /// Don’t autoload any user plugins. Core plugins are always loaded.
-        const DISABLE_AUTO_LOADING = 0b00000010;
+        const DISABLE_AUTO_LOADING = ffi::VSCoreCreationFlags::ccfDisableAutoLoading.0;
         /// Don’t unload plugin libraries when the core is destroyed. Due to a small amount of memory leaking every load and unload (windows feature, not my fault) of a library this may help in applications with extreme amount of script reloading.
-        const DISABLE_LIBRARY_UNLOADING = 0b00000100;
+        const DISABLE_LIBRARY_UNLOADING = ffi::VSCoreCreationFlags::ccfDisableLibraryUnloading.0;
+    }
+}
+
+impl CoreCreationFlags {
+    pub const fn to_ffi(&self) -> ffi::VSCoreCreationFlags {
+        ffi::VSCoreCreationFlags(self.bits() as _)
     }
 }
 

rustsynth/src/plugin.rs

@@ -242,17 +242,17 @@ unsafe extern "C" fn public_function(
 pub type PublicFunction = fn(in_map: &MapRef<'_>, out_map: &mut MapRef<'_>, core: CoreRef);
 
 bitflags! {
-    pub struct PluginConfigFlags: i32 {
+    pub struct PluginConfigFlags: u32 {
         /// Allow functions to be added to the plugin object after the plugin loading phase. Mostly useful for Avisynth compatibility and other foreign plugin loaders.
-        const MODIFIABLE = 1;
+        const MODIFIABLE = ffi::VSPluginConfigFlags::pcModifiable.0 as u32;
         const NONE  = 0;
     }
 }
 
 impl PluginConfigFlags {
     #[must_use]
     pub const fn as_ffi(&self) -> ffi::VSPluginConfigFlags {
-        VSPluginConfigFlags(self.bits() as u32)
+        VSPluginConfigFlags(self.bits() as _)
     }
 }