WinGui: Change the services library dll imports to be "hb" rather than "hb.dll". This will allow libhb.dylib and libhb.so to be loaded.

1 files changed, 92 insertions, 92 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
index 1adba8944..beb572f0d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HbLib/HbFunctions.cs
@@ -18,61 +18,61 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
     /// </summary>

     public static class HBFunctions

     {

-        [DllImport("hb.dll", EntryPoint = "hb_register_logger", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_register_logger", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_register_logger(LoggingCallback callback);

 

-        [DllImport("hb.dll", EntryPoint = "hb_register_error_handler", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_register_error_handler", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_register_error_handler(LoggingCallback callback);

 

-        [DllImport("hb.dll", EntryPoint = "hb_global_init", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_global_init", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_global_init();

 

         /// Return Type: hb_handle_t*

         ///verbose: int

         ///update_check: int

-        [DllImport("hb.dll", EntryPoint = "hb_init", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_init", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_init(int verbose, int update_check);

 

 

         /// Return Type: hb_handle_t*

         ///verbose: int

         ///update_check: int

-        [DllImport("hb.dll", EntryPoint = "hb_init_dl", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_init_dl", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_init_dl(int verbose, int update_check);

 

 

         /// Return Type: char*

         ///param0: hb_handle_t*

-        [DllImport("hb.dll", EntryPoint = "hb_get_version", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_get_version", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_get_version(IntPtr hbHandle);

 

 

         /// Return Type: int

         ///param0: hb_handle_t*

-        [DllImport("hb.dll", EntryPoint = "hb_get_build", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_get_build", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_get_build(IntPtr hbHandle);

 

 

         /// Return Type: int

         ///h: hb_handle_t*

         ///version: char**

-        [DllImport("hb.dll", EntryPoint = "hb_check_update", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_check_update", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_check_update(IntPtr handle, ref IntPtr version);

 

 

         /// Return Type: char*

         ///path: char*

-        [DllImport("hb.dll", EntryPoint = "hb_dvd_name", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_dvd_name", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_dvd_name(IntPtr path);

 

 

         /// Return Type: void

         ///enable: int

-        [DllImport("hb.dll", EntryPoint = "hb_dvd_set_dvdnav", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_dvd_set_dvdnav", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_dvd_set_dvdnav(int enable);

 

         // void hb_opencl_set_enable(hb_handle_t* h, int enable_opencl);

-        [DllImport("hb.dll", EntryPoint = "hb_opencl_set_enable", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_opencl_set_enable", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_opencl_set_enable(IntPtr hbHandle, int enable);

 

         /// Return Type: void

@@ -81,119 +81,119 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
         ///title_index: int

         ///preview_count: int

         ///store_previews: int

-        [DllImport("hb.dll", EntryPoint = "hb_scan", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_scan", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_scan(IntPtr hbHandle, IntPtr path, int title_index, int preview_count, int store_previews, ulong min_duration);

 

-        [DllImport("hb.dll", EntryPoint = "hb_scan_stop", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_scan_stop", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_scan_stop(IntPtr hbHandle);

 

         /// Return Type: hb_list_t*

         ///param0: hb_handle_t*

-        [DllImport("hb.dll", EntryPoint = "hb_get_titles", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_get_titles", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_get_titles(IntPtr hbHandle);

 

-        [DllImport("hb.dll", EntryPoint = "hb_set_anamorphic_size2", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_set_anamorphic_size2", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_set_anamorphic_size2(ref hb_geometry_s sourceGeometry, ref hb_geometry_settings_s uiGeometry, ref hb_geometry_s result);

         

 

         /// Return Type: int

         ///param0: hb_handle_t*

-        [DllImport("hb.dll", EntryPoint = "hb_count", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_count", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_count(IntPtr hbHandle);

 

 

         /// Return Type: hb_job_t*

         ///param0: hb_handle_t*

         ///param1: int

-        [DllImport("hb.dll", EntryPoint = "hb_job", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_job", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_job(IntPtr hbHandle, int jobIndex);

 

         /// Return Type: void

         ///param0: hb_handle_t*

         ///param1: hb_job_t*

-        [DllImport("hb.dll", EntryPoint = "hb_rem", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_rem", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_rem(IntPtr hbHandle, IntPtr job);

 

 

         /// Return Type: void

         ///param0: hb_handle_t*

-        [DllImport("hb.dll", EntryPoint = "hb_start", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_start", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_start(IntPtr hbHandle);

 

 

         /// Return Type: void

         ///param0: hb_handle_t*

-        [DllImport("hb.dll", EntryPoint = "hb_pause", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_pause", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_pause(IntPtr hbHandle);

 

 

         /// Return Type: void

         ///param0: hb_handle_t*

-        [DllImport("hb.dll", EntryPoint = "hb_resume", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_resume", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_resume(IntPtr hbHandle);

 

 

         /// Return Type: void

         ///param0: hb_handle_t*

-        [DllImport("hb.dll", EntryPoint = "hb_stop", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_stop", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_stop(IntPtr hbHandle);

 

 

         /// Return Type: void

         ///param0: hb_handle_t**

-        [DllImport("hb.dll", EntryPoint = "hb_close", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_close", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_close(IntPtr hbHandle);

 

-        [DllImport("hb.dll", EntryPoint = "hb_global_close", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_global_close", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_global_close();

 

         //hb_list_t * hb_list_init();

-        [DllImport("hb.dll", EntryPoint = "hb_list_init", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_list_init", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_list_init();

 

         //int         hb_list_count( const hb_list_t * );

-        [DllImport("hb.dll", EntryPoint = "hb_list_count", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_list_count", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_list_count(IntPtr listPtr);

 

         //void        hb_list_add( hb_list_t *, void * );

-        [DllImport("hb.dll", EntryPoint = "hb_list_add", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_list_add", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_list_add(IntPtr listPtr, IntPtr item);

 

         //void        hb_list_insert( hb_list_t * l, int pos, void * p );

-        [DllImport("hb.dll", EntryPoint = "hb_list_insert", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_list_insert", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_list_insert(IntPtr listPtr, int pos, IntPtr item);

 

         //void        hb_list_rem( hb_list_t *, void * );

-        [DllImport("hb.dll", EntryPoint = "hb_list_rem", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_list_rem", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_list_rem(IntPtr listPtr, IntPtr item);

 

         //void      * hb_list_item( const hb_list_t *, int );

-        [DllImport("hb.dll", EntryPoint = "hb_list_item", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_list_item", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_list_item(IntPtr listPtr, int itemIndex);

 

         //void        hb_list_close( hb_list_t ** );

-        [DllImport("hb.dll", EntryPoint = "hb_list_close", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_list_close", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_list_close(IntPtr listPtrPtr);

 

-        [DllImport("hb.dll", EntryPoint = "hb_subtitle_can_force", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_subtitle_can_force", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_subtitle_can_force(int source);

 

-        [DllImport("hb.dll", EntryPoint = "hb_subtitle_can_burn", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_subtitle_can_burn", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_subtitle_can_burn(int source);

 

-        [DllImport("hb.dll", EntryPoint = "hb_subtitle_can_pass", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_subtitle_can_pass", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_subtitle_can_pass(int source, int mux);

 

 

         // int hb_video_framerate_get_from_name(const char *name)

-        [DllImport("hb.dll", EntryPoint = "hb_video_framerate_get_from_name", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_video_framerate_get_from_name", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_video_framerate_get_from_name(IntPtr name);

 

 //const char*      hb_video_framerate_get_name(int framerate);

 //const char*      hb_video_framerate_sanitize_name(const char *name);

 

         // returns hb_rate_s

-        [DllImport("hb.dll", EntryPoint = "hb_video_framerate_get_next", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_video_framerate_get_next", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_video_framerate_get_next(IntPtr last);

 

 

@@ -202,43 +202,43 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
 //const char*      hb_audio_samplerate_get_name(int samplerate);

 

         // returns hb_rate_s

-        [DllImport("hb.dll", EntryPoint = "hb_audio_samplerate_get_next", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_audio_samplerate_get_next", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_audio_samplerate_get_next(IntPtr last);

 

 

-        [DllImport("hb.dll", EntryPoint = "hb_audio_bitrate_get_best", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_best", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_audio_bitrate_get_best(uint codec, int bitrate, int samplerate, int mixdown);

 

-        [DllImport("hb.dll", EntryPoint = "hb_audio_bitrate_get_default", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_default", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_audio_bitrate_get_default(uint codec, int samplerate, int mixdown);

 

-        [DllImport("hb.dll", EntryPoint = "hb_audio_bitrate_get_limits", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_limits", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_audio_bitrate_get_limits(uint codec, int samplerate, int mixdown, ref int low, ref int high);

 

-        [DllImport("hb.dll", EntryPoint = "hb_audio_bitrate_get_next", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_audio_bitrate_get_next", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_audio_bitrate_get_next(IntPtr last);

 

-        [DllImport("hb.dll", EntryPoint = "hb_video_quality_get_limits", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_video_quality_get_limits", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_video_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);

 

-        [DllImport("hb.dll", EntryPoint = "hb_video_quality_get_name", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_video_quality_get_name", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_video_quality_get_name(uint codec);

 

-        [DllImport("hb.dll", EntryPoint = "hb_audio_quality_get_limits", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_audio_quality_get_limits", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_audio_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);

 

 //float hb_audio_quality_get_best(uint32_t codec, float quality);

 

-        [DllImport("hb.dll", EntryPoint = "hb_audio_quality_get_default", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_audio_quality_get_default", CallingConvention = CallingConvention.Cdecl)]

         public static extern float hb_audio_quality_get_default(uint codec);

 

 

-        [DllImport("hb.dll", EntryPoint = "hb_audio_compression_get_limits", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_audio_compression_get_limits", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_audio_compression_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);

 

 //float hb_audio_compression_get_best(uint32_t codec, float compression);

 

-        [DllImport("hb.dll", EntryPoint = "hb_audio_compression_get_default", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_audio_compression_get_default", CallingConvention = CallingConvention.Cdecl)]

         public static extern float hb_audio_compression_get_default(uint codec);

 

 

@@ -250,25 +250,25 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
 //const hb_dither_t* hb_audio_dither_get_next(const hb_dither_t *last);

 

         // hb_audio_can_apply_drc2(hb_handle_t *h, int title_idx, int audio_idx, int encoder)

-        [DllImport("hb.dll", EntryPoint = "hb_audio_can_apply_drc2", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_audio_can_apply_drc2", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_audio_can_apply_drc2(IntPtr handle, int title_index, int audio_index, int encoder);

 

-        [DllImport("hb.dll", EntryPoint = "hb_mixdown_is_supported", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_mixdown_is_supported", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_mixdown_is_supported(int mixdown, uint codec, ulong layout);

 

-        [DllImport("hb.dll", EntryPoint = "hb_mixdown_has_codec_support", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_mixdown_has_codec_support", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_mixdown_has_codec_support(int mixdown, uint codec);

 

-        [DllImport("hb.dll", EntryPoint = "hb_mixdown_has_remix_support", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_mixdown_has_remix_support", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_mixdown_has_remix_support(int mixdown, ulong layout);

 

 //int                 hb_mixdown_get_discrete_channel_count(int mixdown);

 //int                 hb_mixdown_get_low_freq_channel_count(int mixdown);

 

-        [DllImport("hb.dll", EntryPoint = "hb_mixdown_get_best", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_mixdown_get_best", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_mixdown_get_best(uint codec, ulong layout, int mixdown);

 

-        [DllImport("hb.dll", EntryPoint = "hb_mixdown_get_default", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_mixdown_get_default", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_mixdown_get_default(uint codec, ulong layout);

 

 //int                 hb_mixdown_get_from_name(const char *name);

@@ -276,7 +276,7 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
 //const char*         hb_mixdown_get_short_name(int mixdown);

 //const char*         hb_mixdown_sanitize_name(const char *name);

 

-        [DllImport("hb.dll", EntryPoint = "hb_mixdown_get_next", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_mixdown_get_next", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_mixdown_get_next(IntPtr last);

 

 //int                 hb_video_encoder_get_default(int muxer);

@@ -286,7 +286,7 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
 //const char*         hb_video_encoder_get_long_name(int encoder);

 //const char*         hb_video_encoder_sanitize_name(const char *name);

 

-        [DllImport("hb.dll", EntryPoint = "hb_video_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_video_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_video_encoder_get_next(IntPtr last);

 

 /*

@@ -304,7 +304,7 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
 //const char*         hb_audio_encoder_get_long_name(int encoder);

 //const char*         hb_audio_encoder_sanitize_name(const char *name);

 

-        [DllImport("hb.dll", EntryPoint = "hb_audio_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_audio_encoder_get_next", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_audio_encoder_get_next(IntPtr last);

 

 //int                   hb_container_get_from_name(const char *name);

@@ -315,57 +315,57 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
 //const char*           hb_container_get_default_extension(int format);

 //const char*           hb_container_sanitize_name(const char *name);

 

-        [DllImport("hb.dll", EntryPoint = "hb_container_get_from_name", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_container_get_from_name", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_container_get_from_name([In] [MarshalAs(UnmanagedType.LPStr)] string name);

 

-        [DllImport("hb.dll", EntryPoint = "hb_container_get_next", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_container_get_next", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_container_get_next(IntPtr last);

 

-        [DllImport("hb.dll", EntryPoint = "hb_video_encoder_get_presets", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_video_encoder_get_presets", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_video_encoder_get_presets(int encoder);

 

-        [DllImport("hb.dll", EntryPoint = "hb_video_encoder_get_tunes", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_video_encoder_get_tunes", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_video_encoder_get_tunes(int encoder);

 

-        [DllImport("hb.dll", EntryPoint = "hb_video_encoder_get_profiles", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_video_encoder_get_profiles", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_video_encoder_get_profiles(int encoder);

 

-        [DllImport("hb.dll", EntryPoint = "hb_video_encoder_get_levels", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_video_encoder_get_levels", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_video_encoder_get_levels(int encoder);

 

 

-        [DllImport("hb.dll", EntryPoint = "lang_get_next", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "lang_get_next", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr lang_get_next(IntPtr last);

 

-        [DllImport("hb.dll", EntryPoint = "lang_for_code2", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "lang_for_code2", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr lang_for_code2([In] [MarshalAs(UnmanagedType.LPStr)] string code2);

 

 

         ///hb_title_set_t  * hb_get_title_set( hb_handle_t * );

-        [DllImport("hb.dll", EntryPoint = "hb_get_title_set", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_get_title_set", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_get_title_set(IntPtr hbHandle);

 

         ///hb_job_t * hb_job_init_by_index( hb_handle_t *h, int title_index );

-        [DllImport("hb.dll", EntryPoint = "hb_job_init_by_index", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_job_init_by_index", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_job_init_by_index(IntPtr hbHandle, int title_index);

 

         ///void hb_job_close( hb_job_t ** job );

-        [DllImport("hb.dll", EntryPoint = "hb_job_close", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_job_close", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_job_close(IntPtr job);

 

         ///void hb_chapter_set_title(hb_chapter_t *chapter, const char *title);

-        [DllImport("hb.dll", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_chapter_set_title(IntPtr chapter, [In] [MarshalAs(UnmanagedType.LPStr)] string title);

 

         ///void hb_chapter_set_title(hb_chapter_t *chapter, const char *title);

-        [DllImport("hb.dll", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_chapter_set_title__ptr(IntPtr chapter, IntPtr title);

 

         /// hb_filter_object_t * hb_filter_init( int filter_id );

-        [DllImport("hb.dll", EntryPoint = "hb_filter_init", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_filter_init", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_filter_init(int filter_id);

 

-        [DllImport("hb.dll", EntryPoint = "hb_generate_filter_settings_json", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_generate_filter_settings_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_generate_filter_settings_json(

             int filter_id,

             [In] [MarshalAs(UnmanagedType.LPStr)] string preset,

@@ -373,24 +373,24 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
             [In] [MarshalAs(UnmanagedType.LPStr)] string custom);

 

         /// char* hb_filter_get_presets_json(int filter_id);

-        [DllImport("hb.dll", EntryPoint = "hb_filter_get_presets_json", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_filter_get_presets_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_filter_get_presets_json(int filter_id);

 

         /// char* hb_filter_get_tuness_json(int filter_id);

-        [DllImport("hb.dll", EntryPoint = "hb_filter_get_tunes_json", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_filter_get_tunes_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_filter_get_tunes_json(int filter_id);

 

         // char ** hb_filter_get_keys(int filter_id);

-        [DllImport("hb.dll", EntryPoint = "hb_filter_get_keys", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_filter_get_keys", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_filter_get_keys(int filter_id);

 

-        [DllImport("hb.dll", EntryPoint = "hb_x264_encopt_name", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_x264_encopt_name", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_x264_encopt_name(IntPtr name);

 

-        [DllImport("hb.dll", EntryPoint = "hb_check_h264_level", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_check_h264_level", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_check_h264_level([In] [MarshalAs(UnmanagedType.LPStr)] string level, int width, int height, int fps_num, int fps_den, int interlaced, int fake_interlaced);

 

-        [DllImport("hb.dll", EntryPoint = "hb_x264_param_unparse", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_x264_param_unparse", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_x264_param_unparse(

             int bit_depth,

             [In] [MarshalAs(UnmanagedType.LPStr)] string x264_preset,

@@ -402,63 +402,63 @@ namespace HandBrake.ApplicationServices.Interop.HbLib
             int height);

 

 

-        [DllImport("hb.dll", EntryPoint = "hb_get_opencl_env", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_get_opencl_env", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_get_opencl_env();

 

-        [DllImport("hb.dll", EntryPoint = "hb_qsv_available", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_qsv_available", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_qsv_available();

         

-        [DllImport("hb.dll", EntryPoint = "hb_qsv_info_init", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_qsv_info_init", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_qsv_info_init();

 

         // hb_image_t* hb_get_preview2(hb_handle_t* h, int title_idx, int picture, hb_geometry_settings_t* geo, int deinterlace);

-        [DllImport("hb.dll", EntryPoint = "hb_get_preview2", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_get_preview2", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_get_preview2(IntPtr hbHandle, int title_idx, int preview_idx,  ref hb_geometry_settings_s geo, int deinterlace);

 

         // void hb_image_close(hb_image_t **_image);

-        [DllImport("hb.dll", EntryPoint = "hb_image_close", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_image_close", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_image_close(IntPtr image);

 

         /* JSON API */

 

         // char     * hb_get_title_set_json(hb_handle_t * h);

-        [DllImport("hb.dll", EntryPoint = "hb_get_title_set_json", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_get_title_set_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_get_title_set_json(IntPtr hbHandle);

 

         // char     * hb_job_init_json(hb_handle_t *h, int title_index);

-        [DllImport("hb.dll", EntryPoint = "hb_job_init_json", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_job_init_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_job_init_json(IntPtr hbHandle, int title_index);

 

         // hb_job_t * hb_json_to_job(hb_handle_t * h, const char * json_job);

-        [DllImport("hb.dll", EntryPoint = "hb_json_to_job", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_json_to_job", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_json_to_job(IntPtr hbHandle, IntPtr json_job);

 

         // int           hb_add_json( hb_handle_t *, const char * ) 

-        [DllImport("hb.dll", EntryPoint = "hb_add_json", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_add_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern int hb_add_json(IntPtr hbHandle, IntPtr json_job);

 

         //char     * hb_set_anamorphic_size_json(const char * json_param);

-        [DllImport("hb.dll", EntryPoint = "hb_set_anamorphic_size_json", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_set_anamorphic_size_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_set_anamorphic_size_json(IntPtr json_param);

 

         // char     * hb_get_state_json(hb_handle_t * h);

-        [DllImport("hb.dll", EntryPoint = "hb_get_state_json", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_get_state_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_get_state_json(IntPtr hbHandle);

 

         // char* hb_get_preview_params_json(int title_idx, int preview_idx, int deinterlace, hb_geometry_settings_t *settings)

-        [DllImport("hb.dll", EntryPoint = "hb_get_preview_params_json", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_get_preview_params_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_get_preview_params_json(int title_idx, int preview_idx, int deinterlace, ref hb_geometry_settings_s settings);

         

         //void         hb_presets_builtin_init(void);

-        [DllImport("hb.dll", EntryPoint = "hb_presets_builtin_init", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_presets_builtin_init", CallingConvention = CallingConvention.Cdecl)]

         public static extern void hb_presets_builtin_init();

 

         // char       * hb_presets_builtin_get_json(void); // Get list of HandBrake builtin presets as json string

-        [DllImport("hb.dll", EntryPoint = "hb_presets_builtin_get_json", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_presets_builtin_get_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_presets_builtin_get_json();

 

         // 	char       * hb_presets_read_file_json(const char *filename);

-        [DllImport("hb.dll", EntryPoint = "hb_presets_read_file_json", CallingConvention = CallingConvention.Cdecl)]

+        [DllImport("hb", EntryPoint = "hb_presets_read_file_json", CallingConvention = CallingConvention.Cdecl)]

         public static extern IntPtr hb_presets_read_file_json(IntPtr filename);

     }

 }