Commit 42618957 authored by Julien Wadel's avatar Julien Wadel
Browse files

Use liblinphone for LIB_NAME on Windows only

Reorder freeing memory when Marshalling on Native Windows ID
Add import grammar for CS
parent 4b5ec0bd
1 merge request!850Use liblinphone for LIB_NAME on Windows only
Showing with 11 additions and 4 deletions
...@@ -50,6 +50,5 @@ ...@@ -50,6 +50,5 @@
#cmakedefine HAVE_ADVANCED_IM #cmakedefine HAVE_ADVANCED_IM
#cmakedefine HAVE_DB_STORAGE #cmakedefine HAVE_DB_STORAGE
#cmakedefine ENABLE_UPDATE_CHECK 1 #cmakedefine ENABLE_UPDATE_CHECK 1
#cmakedefine ENABLE_MICROSOFT_STORE_APP
#cmakedefine HAVE_GETIFADDRS #cmakedefine HAVE_GETIFADDRS
...@@ -35,6 +35,8 @@ namespace Linphone ...@@ -35,6 +35,8 @@ namespace Linphone
public const string VERSION = "{{version}}"; public const string VERSION = "{{version}}";
#if __IOS__ #if __IOS__
public const string LIB_NAME = "linphone.framework/linphone"; public const string LIB_NAME = "linphone.framework/linphone";
#elif WINDOWS_UWP
public const string LIB_NAME = "liblinphone"; // With this, it automatically finds liblinphone.dll
#else #else
public const string LIB_NAME = "linphone"; // With this, it automatically finds liblinphone.so public const string LIB_NAME = "linphone"; // With this, it automatically finds liblinphone.so
#endif #endif
...@@ -448,9 +450,11 @@ namespace Linphone ...@@ -448,9 +450,11 @@ namespace Linphone
} }
set set
{ {
IntPtr string_ptr_to_remove = linphone_call_get_native_video_window_id(nativePtr);
IntPtr string_ptr = Marshal.StringToHGlobalUni(value); IntPtr string_ptr = Marshal.StringToHGlobalUni(value);
linphone_call_set_native_video_window_id(nativePtr, string_ptr); linphone_call_set_native_video_window_id(nativePtr, string_ptr);
Marshal.FreeHGlobal(string_ptr); if(string_ptr_to_remove != IntPtr.Zero)
Marshal.FreeHGlobal(string_ptr_to_remove);
} }
} }
{{/isLinphoneCall}} {{/isLinphoneCall}}
...@@ -477,9 +481,11 @@ namespace Linphone ...@@ -477,9 +481,11 @@ namespace Linphone
} }
set set
{ {
IntPtr string_ptr_to_remove = linphone_core_get_native_video_window_id(nativePtr);
if(string_ptr_to_remove != IntPtr.Zero)
Marshal.FreeHGlobal(string_ptr_to_remove);
IntPtr string_ptr = Marshal.StringToHGlobalUni(value); IntPtr string_ptr = Marshal.StringToHGlobalUni(value);
linphone_core_set_native_video_window_id(nativePtr, string_ptr); linphone_core_set_native_video_window_id(nativePtr, string_ptr);
Marshal.FreeHGlobal(string_ptr);
} }
} }
...@@ -492,9 +498,11 @@ namespace Linphone ...@@ -492,9 +498,11 @@ namespace Linphone
} }
set set
{ {
IntPtr string_ptr_to_remove = linphone_core_get_native_preview_window_id(nativePtr);
if(string_ptr_to_remove != IntPtr.Zero)
Marshal.FreeHGlobal(string_ptr_to_remove);
IntPtr string_ptr = Marshal.StringToHGlobalUni(value); IntPtr string_ptr = Marshal.StringToHGlobalUni(value);
linphone_core_set_native_preview_window_id(nativePtr, string_ptr); linphone_core_set_native_preview_window_id(nativePtr, string_ptr);
Marshal.FreeHGlobal(string_ptr);
} }
} }
{{/isLinphoneCore}} {{/isLinphoneCore}}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment