From b16119cd2aa7307990ec42343a808dbd64d0197f Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 16 May 2006 18:10:58 +0000 Subject: [PATCH] More C# patches from Patrick van Staveren: http://sting.vanstaveren.us:8000/diffs/gphoto/libgphoto2-csharp-_port{1,2,3}.diff git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8804 67ed7778-7388-44ab-90cf-0a291f65f57c --- bindings/csharp/ErrorCodes.cs | 2 +- bindings/csharp/Port.cs | 62 ++++++++++++++++----------------- bindings/csharp/PortInfoList.cs | 16 ++++----- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/bindings/csharp/ErrorCodes.cs b/bindings/csharp/ErrorCodes.cs index 9d0b3b392..ac18675d7 100644 --- a/bindings/csharp/ErrorCodes.cs +++ b/bindings/csharp/ErrorCodes.cs @@ -79,7 +79,7 @@ namespace LibGPhoto2 [DllImport ("libgphoto2.so")] internal static extern IntPtr gp_result_as_string (ErrorCode result); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern IntPtr gp_port_result_as_string (ErrorCode result); } diff --git a/bindings/csharp/Port.cs b/bindings/csharp/Port.cs index 5fc5a32a2..99db64fef 100644 --- a/bindings/csharp/Port.cs +++ b/bindings/csharp/Port.cs @@ -83,59 +83,59 @@ namespace LibGPhoto2 PortPrivateLibrary *pl; PortPrivateCore *pc; - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_new (out _Port *port); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_free (_Port *port); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_set_info (_Port *port, ref _PortInfo info); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_get_info (_Port *port, out _PortInfo info); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_open (_Port *port); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_close (_Port *port); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_read (_Port *port, [MarshalAs(UnmanagedType.LPTStr)] byte[] data, int size); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_write (_Port *port, [MarshalAs(UnmanagedType.LPTStr)] byte[] data, int size); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_get_settings (_Port *port, out PortSettings settings); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_set_settings (_Port *port, PortSettings settings); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_get_timeout (_Port *port, int *timeout); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_set_timeout (_Port *port, int timeout); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_get_pin (_Port *port, Pin pin, Level *level); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_set_pin (_Port *port, Pin pin, Level level); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern char* gp_port_get_error (_Port *port); - //[DllImport ("libgphoto2.so")] + //[DllImport ("libgphoto2_port.so")] //internal static extern int gp_port_set_error (_Port *port, const char *format, ...); } #endif public class Port : Object { - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_new (out IntPtr port); public Port() @@ -147,7 +147,7 @@ namespace LibGPhoto2 this.handle = new HandleRef (this, native); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_free (HandleRef port); protected override void Cleanup () @@ -155,7 +155,7 @@ namespace LibGPhoto2 Error.CheckError (gp_port_free (this.handle)); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_set_info (HandleRef port, ref _PortInfo info); public void SetInfo (PortInfo info) @@ -163,7 +163,7 @@ namespace LibGPhoto2 Error.CheckError (gp_port_set_info (this.Handle, ref info.Handle)); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_get_info (HandleRef port, out _PortInfo info); public PortInfo GetInfo () @@ -175,7 +175,7 @@ namespace LibGPhoto2 return info; } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_open (HandleRef port); public void Open () @@ -183,7 +183,7 @@ namespace LibGPhoto2 Error.CheckError (gp_port_open (this.Handle)); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_close (HandleRef port); public void Close () @@ -191,7 +191,7 @@ namespace LibGPhoto2 Error.CheckError (gp_port_close (this.Handle)); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_read (HandleRef port, [MarshalAs(UnmanagedType.LPTStr)] byte[] data, int size); public byte[] Read (int size) @@ -203,7 +203,7 @@ namespace LibGPhoto2 return data; } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_write (HandleRef port, [MarshalAs(UnmanagedType.LPTStr)] byte[] data, int size); public void Write (byte[] data) @@ -212,7 +212,7 @@ namespace LibGPhoto2 } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_set_settings (HandleRef port, PortSettings settings); public void SetSettings (PortSettings settings) @@ -220,7 +220,7 @@ namespace LibGPhoto2 Error.CheckError (gp_port_set_settings (this.Handle, settings)); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_get_settings (HandleRef port, out PortSettings settings); public PortSettings GetSettings () @@ -232,10 +232,10 @@ namespace LibGPhoto2 return settings; } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_get_timeout (HandleRef port, out int timeout); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_set_timeout (HandleRef port, int timeout); public int Timeout @@ -252,13 +252,13 @@ namespace LibGPhoto2 } } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_get_pin (HandleRef port, Pin pin, out Level level); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_set_pin (HandleRef port, Pin pin, Level level); - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern string gp_port_get_error (HandleRef port); } } diff --git a/bindings/csharp/PortInfoList.cs b/bindings/csharp/PortInfoList.cs index 36e20106a..0be0a35d4 100644 --- a/bindings/csharp/PortInfoList.cs +++ b/bindings/csharp/PortInfoList.cs @@ -5,7 +5,7 @@ namespace LibGPhoto2 { public class PortInfoList : Object { - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_info_list_new (out IntPtr handle); public PortInfoList() @@ -17,7 +17,7 @@ namespace LibGPhoto2 this.handle = new HandleRef (this, native); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_info_list_free (HandleRef handle); protected override void Cleanup () @@ -25,7 +25,7 @@ namespace LibGPhoto2 Error.CheckError (gp_port_info_list_free (this.Handle)); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_info_list_load (HandleRef handle); public void Load () @@ -36,7 +36,7 @@ namespace LibGPhoto2 throw Error.ErrorException (result); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_info_list_count (HandleRef handle); public int Count() @@ -44,7 +44,7 @@ namespace LibGPhoto2 return (int) Error.CheckError (gp_port_info_list_count (this.Handle)); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal unsafe static extern ErrorCode gp_port_info_list_get_info (HandleRef handle, int n, out _PortInfo info); public PortInfo GetInfo (int n) @@ -56,7 +56,7 @@ namespace LibGPhoto2 return info; } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_info_list_lookup_path (HandleRef handle, [MarshalAs(UnmanagedType.LPTStr)]string path); public int LookupPath (string path) @@ -64,7 +64,7 @@ namespace LibGPhoto2 return (int) Error.CheckError (gp_port_info_list_lookup_path(this.handle, path)); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal static extern ErrorCode gp_port_info_list_lookup_name (HandleRef handle, string name); public int LookupName(string name) @@ -72,7 +72,7 @@ namespace LibGPhoto2 return (int) Error.CheckError (gp_port_info_list_lookup_name (this.Handle, name)); } - [DllImport ("libgphoto2.so")] + [DllImport ("libgphoto2_port.so")] internal unsafe static extern ErrorCode gp_port_info_list_append (HandleRef handle, _PortInfo info); public int Append (PortInfo info)