Merge pull request #14 from JamesHallowell/entry-points-v10

Update the library entry point version to v10
JamesHallowell · Apr 27, 2024 · 2cdb250 · 2cdb250
2 parents 7c9ff17 + 430b194
commit 2cdb250
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ linux, macos ]
-        cmajor_version: [ 0.9.2170 ]
+        cmajor_version: [ 1.0.2462 ]
         include:
           - os: linux
             runner: ubuntu-latest

diff --git a/src/ffi/mod.rs b/src/ffi/mod.rs
@@ -20,25 +20,25 @@ pub struct Library {
     entry_points: *mut EntryPoints,
 }
 
-type CMajorGetEntryPointsV9 = unsafe extern "C" fn() -> *mut c_void;
+type CMajorGetEntryPointsV10 = unsafe extern "C" fn() -> *mut c_void;
 
 #[cfg(feature = "static")]
 extern "C" {
-    fn cmajor_getEntryPointsV9() -> *mut c_void;
+    fn cmajor_getEntryPointsV10() -> *mut c_void;
 }
 
 impl Library {
     #[cfg(feature = "static")]
     pub fn new() -> Self {
-        let entry_points = unsafe { cmajor_getEntryPointsV9() }.cast();
+        let entry_points = unsafe { cmajor_getEntryPointsV10() }.cast();
         Self { entry_points }
     }
 
     pub fn load(path_to_library: impl AsRef<Path>) -> Result<Self, libloading::Error> {
-        const LIBRARY_ENTRY_POINT: &[u8] = b"cmajor_getEntryPointsV9";
+        const LIBRARY_ENTRY_POINT: &[u8] = b"cmajor_getEntryPointsV10";
 
         let library = unsafe { libloading::Library::new(path_to_library.as_ref()) }?;
-        let entry_point_fn: libloading::Symbol<CMajorGetEntryPointsV9> =
+        let entry_point_fn: libloading::Symbol<CMajorGetEntryPointsV10> =
             unsafe { library.get(LIBRARY_ENTRY_POINT)? };
 
         let entry_points = unsafe { entry_point_fn() }.cast();

diff --git a/src/ffi/performer.rs b/src/ffi/performer.rs
@@ -26,6 +26,7 @@ struct PerformerVTable {
     iterate_output_events:
         unsafe extern "system" fn(*mut Performer, u32, *mut c_void, HandleOutputEventCallback),
 
+    reset: unsafe extern "system" fn(*mut Performer),
     advance: unsafe extern "system" fn(*mut Performer),
     get_string_for_handle:
         unsafe extern "system" fn(*mut Performer, u32, *mut isize) -> *const c_char,