Commit e72a5acb authored by Martin Finkel's avatar Martin Finkel

Merge branch 'android' of https://github.com/mfkl/LibVLCSharp into android

# Conflicts:
#	LibVLCSharp.Android.Sample/AWindow.cs
#	LibVLCSharp.Android.Sample/LibVLCSharp.Android.Sample.csproj
#	LibVLCSharp.Android.Sample/MainActivity.cs
#	LibVLCSharp.sln
#	LibVLCSharp/MediaPlayer.cs
parents 165baeed e55327cd

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2010
VisualStudioVersion = 15.0.27130.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "Sample\Sample.csproj", "{FA6CFA75-231B-4643-B82A-F88A08F0F3F9}"
EndProject
......
......@@ -1583,6 +1583,12 @@ namespace VideoLAN.LibVLC
/// <param name="aWindow">See LibVLCSharp.Android</param>
public void SetAndroidContext(IntPtr aWindow) => Native.LibVLCMediaPlayerSetAndroidContext(NativeReference, aWindow);
/// <summary>
/// Set the android context.
/// </summary>
/// <param name="aWindow">See LibVLCSharp.Android</param>
public void SetAndroidContext(IntPtr aWindow) => Native.LibVLCMediaPlayerSetAndroidContext(NativeReference, aWindow);
/// <summary>
/// Add a slave to the current media player.
/// note If the player is playing, the slave will be added directly. This call
......
Markdown is supported
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