...
 
Commits (15)
......@@ -26,4 +26,7 @@
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
<DefineConstants>$(DefineConstants);UWP;NET</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
<DefineConstants>$(DefineConstants);UWP10_0</DefineConstants>
</PropertyGroup>
</Project>
\ No newline at end of file
......@@ -27,7 +27,7 @@ Features:
</Description>
<TargetFramework>net47</TargetFramework>
<RootNamespace>LibVLCSharp.Forms.Platforms.GTK</RootNamespace>
<PackageVersion>0.8.1</PackageVersion>
<Version>3.0.1</Version>
<PackageId>LibVLCSharp.Forms.GTK</PackageId>
<Authors>VideoLAN</Authors>
<Owners>VideoLAN</Owners>
......
......@@ -27,7 +27,7 @@ Features:
</Description>
<TargetFramework>net47</TargetFramework>
<RootNamespace>LibVLCSharp.Forms.Platforms.WPF</RootNamespace>
<PackageVersion>0.8.1</PackageVersion>
<Version>3.0.1</Version>
<PackageId>LibVLCSharp.Forms.WPF</PackageId>
<Authors>VideoLAN</Authors>
<Owners>VideoLAN</Owners>
......
......@@ -26,11 +26,11 @@ Features:
- DVD playback and menu navigation.
</Description>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsPlatform('Linux'))">$(TargetFrameworks);MonoAndroid81;Xamarin.iOS10;Xamarin.Mac20</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsPlatform('Linux'))">$(TargetFrameworks);MonoAndroid90;Xamarin.iOS10;Xamarin.Mac20</TargetFrameworks>
<RootNamespace>LibVLCSharp.Forms</RootNamespace>
<NeutralLanguage>en</NeutralLanguage>
<LangVersion>7.3</LangVersion>
<Version>0.8.1</Version>
<Version>3.0.1</Version>
<PackageId>LibVLCSharp.Forms</PackageId>
<Authors>VideoLAN</Authors>
<Owners>VideoLAN</Owners>
......
......@@ -20,24 +20,24 @@ namespace LibVLCSharp.Forms.Platforms.Android
{
base.OnElementChanged(e);
if (Control == null)
if (e.NewElement != null)
{
SetNativeControl(new LibVLCSharp.Platforms.Android.VideoView(Context));
if (Control == null)
{
SetNativeControl(new LibVLCSharp.Platforms.Android.VideoView(Context));
e.NewElement.MediaPlayerChanging += OnMediaPlayerChanging;
if (Control.MediaPlayer != e.NewElement.MediaPlayer)
{
OnMediaPlayerChanging(this, new MediaPlayerChangingEventArgs(Control.MediaPlayer, e.NewElement.MediaPlayer));
}
}
}
if (e.OldElement != null)
{
e.OldElement.MediaPlayerChanging -= OnMediaPlayerChanging;
}
if (e.NewElement != null)
{
e.NewElement.MediaPlayerChanging += OnMediaPlayerChanging;
if (Control.MediaPlayer != e.NewElement.MediaPlayer)
{
OnMediaPlayerChanging(this, new MediaPlayerChangingEventArgs(Control.MediaPlayer, e.NewElement.MediaPlayer));
}
}
}
}
private void OnMediaPlayerChanging(object sender, MediaPlayerChangingEventArgs e)
......
......@@ -15,24 +15,24 @@ namespace LibVLCSharp.Forms.Platforms.Mac
{
base.OnElementChanged(e);
if (Control == null)
if (e.NewElement != null)
{
SetNativeControl(new LibVLCSharp.Platforms.Mac.VideoView());
if (Control == null)
{
SetNativeControl(new LibVLCSharp.Platforms.Mac.VideoView());
e.NewElement.MediaPlayerChanging += OnMediaPlayerChanging;
if (Control.MediaPlayer != e.NewElement.MediaPlayer)
{
OnMediaPlayerChanging(this, new MediaPlayerChangingEventArgs(Control.MediaPlayer, e.NewElement.MediaPlayer));
}
}
}
if (e.OldElement != null)
{
e.OldElement.MediaPlayerChanging -= OnMediaPlayerChanging;
}
if (e.NewElement != null)
{
e.NewElement.MediaPlayerChanging += OnMediaPlayerChanging;
if (Control.MediaPlayer != e.NewElement.MediaPlayer)
{
OnMediaPlayerChanging(this, new MediaPlayerChangingEventArgs(Control.MediaPlayer, e.NewElement.MediaPlayer));
}
}
}
private void OnMediaPlayerChanging(object sender, MediaPlayerChangingEventArgs e)
......
......@@ -17,24 +17,24 @@ namespace LibVLCSharp.Forms.Platforms.iOS
{
base.OnElementChanged(e);
if(Control == null)
if (e.NewElement != null)
{
SetNativeControl(new LibVLCSharp.Forms.Platforms.iOS.VideoView());
if (Control == null)
{
SetNativeControl(new LibVLCSharp.Platforms.iOS.VideoView());
e.NewElement.MediaPlayerChanging += OnMediaPlayerChanging;
if (Control.MediaPlayer != e.NewElement.MediaPlayer)
{
OnMediaPlayerChanging(this, new MediaPlayerChangingEventArgs(Control.MediaPlayer, e.NewElement.MediaPlayer));
}
}
}
if (e.OldElement != null)
{
e.OldElement.MediaPlayerChanging -= OnMediaPlayerChanging;
}
if (e.NewElement != null)
{
e.NewElement.MediaPlayerChanging += OnMediaPlayerChanging;
if (Control.MediaPlayer != e.NewElement.MediaPlayer)
{
OnMediaPlayerChanging(this, new MediaPlayerChangingEventArgs(Control.MediaPlayer, e.NewElement.MediaPlayer));
}
}
}
private void OnMediaPlayerChanging(object sender, MediaPlayerChangingEventArgs e)
......@@ -42,26 +42,4 @@ namespace LibVLCSharp.Forms.Platforms.iOS
Control.MediaPlayer = e.NewMediaPlayer;
}
}
public class VideoView : LibVLCSharp.Platforms.iOS.VideoView, IVisualElementRenderer
{
public VisualElement Element { get; private set; }
public UIView NativeView => this;
public UIViewController ViewController => ViewController;
public event EventHandler<VisualElementChangedEventArgs> ElementChanged;
public SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint) => this.GetSizeRequest(widthConstraint, heightConstraint);
public void SetElement(VisualElement element)
{
Element = element;
ElementChanged?.Invoke(this, new VisualElementChangedEventArgs(null, Element));
}
public void SetElementSize(Size size) => Element.Layout(new Rectangle(Element.X, Element.Y, size.Width, size.Height));
}
}
\ No newline at end of file
......@@ -15,7 +15,7 @@ libvlc needs to be installed separately.
</Description>
<TargetFramework>net47</TargetFramework>
<RootNamespace>LibVLCSharp.GTK</RootNamespace>
<Version>0.8.1</Version>
<Version>3.0.1</Version>
<PackageId>LibVLCSharp.GTK</PackageId>
<Authors>VideoLAN</Authors>
<Owners>VideoLAN</Owners>
......
......@@ -29,7 +29,7 @@ Features:
<RootNamespace>LibVLCSharp.WPF</RootNamespace>
<NeutralLanguage>en</NeutralLanguage>
<LangVersion>7.3</LangVersion>
<Version>0.8.1</Version>
<Version>3.0.1</Version>
<PackageId>LibVLCSharp.WPF</PackageId>
<UseWPF>true</UseWPF>
<Authors>VideoLAN</Authors>
......
......@@ -21,7 +21,7 @@
</Description>
<TargetFrameworks>net40</TargetFrameworks>
<RootNamespace>LibVLCSharp.WinForms</RootNamespace>
<Version>0.8.1</Version>
<Version>3.0.1</Version>
<PackageId>LibVLCSharp.WinForms</PackageId>
<Authors>VideoLAN</Authors>
<Owners>VideoLAN</Owners>
......
......@@ -20,13 +20,13 @@
libvlc needs to be installed separately. See VideoLAN.LibVLC.* packages.
</Description>
<TargetFrameworks>netstandard2.0;netstandard1.1;net40;net471</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsPlatform('Linux'))">$(TargetFrameworks);MonoAndroid81;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);uap10.0</TargetFrameworks>
<TargetFrameworks Condition="!$([MSBuild]::IsOsPlatform('Linux'))">$(TargetFrameworks);MonoAndroid90;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);uap10.0;uap10.0.16299</TargetFrameworks>
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeAWindow</TargetsForTfmSpecificBuildOutput>
<RootNamespace>LibVLCSharp</RootNamespace>
<NeutralLanguage>en</NeutralLanguage>
<LangVersion>7.3</LangVersion>
<PackageVersion>0.8.1</PackageVersion>
<Version>3.0.1</Version>
<PackageId>LibVLCSharp</PackageId>
<Authors>VideoLAN</Authors>
<Owners>VideoLAN</Owners>
......
using System;
using LibVLCSharp.Shared.Helpers;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
......@@ -37,6 +38,9 @@ namespace LibVLCSharp.Shared
[DllImport(Constants.LibraryName, EntryPoint = "JNI_OnLoad")]
internal static extern int JniOnLoad(IntPtr javaVm, IntPtr reserved = default(IntPtr));
#endif
[DllImport(Constants.LibraryName, CallingConvention = CallingConvention.Cdecl,
EntryPoint = "libvlc_get_version")]
internal static extern IntPtr LibVLCVersion();
}
#if NET || NETSTANDARD
......@@ -50,6 +54,8 @@ namespace LibVLCSharp.Shared
/// Load the native libvlc library (if necessary, depending on platform)
/// <para/> Ensure that you installed the VideoLAN.LibVLC.[YourPlatform] package in your target project
/// <para/> This will throw a <see cref="VLCException"/> if the native libvlc libraries cannot be found or loaded.
/// <para/> It may also throw a <see cref="VLCException"/> if the LibVLC and LibVLCSharp major versions do not match.
/// See https://code.videolan.org/videolan/LibVLCSharp/blob/master/VERSIONING.md for more info about the versioning strategy.
/// </summary>
/// <param name="libvlcDirectoryPath">The path to the directory that contains libvlc and libvlccore
/// No need to specify unless running netstandard 1.1, or using custom location for libvlc
......@@ -63,9 +69,26 @@ namespace LibVLCSharp.Shared
InitializeUWP();
#elif NET || NETSTANDARD
InitializeDesktop(libvlcDirectoryPath);
#endif
#if !UWP10_0 && !NETSTANDARD1_1
EnsureVersionsMatch();
#endif
}
#if !UWP10_0 && !NETSTANDARD1_1
/// <summary>
/// Checks whether the major version of LibVLC and LibVLCSharp match <para/>
/// Throws an NotSupportedException if the major versions mismatch
/// </summary>
static void EnsureVersionsMatch()
{
var libvlcMajorVersion = int.Parse(Native.LibVLCVersion().FromUtf8().Split('.').First());
var libvlcsharpMajorVersion = Assembly.GetExecutingAssembly().GetName().Version.Major;
if(libvlcMajorVersion != libvlcsharpMajorVersion)
throw new VLCException($"Version mismatch between LibVLC {libvlcMajorVersion} and LibVLCSharp {libvlcsharpMajorVersion}. " +
$"They must share the same major version number");
}
#endif
#if ANDROID
static void InitializeAndroid()
{
......
LibVLCSharp version 3.0.1
=========================
* Add libvlc/libvlcsharp version check
* Add Xamarin.Forms 4.0 support for LibVLCSharp.Forms
LibVLCSharp version 3.0.0
=========================
* First stable release: https://mfkl.github.io/libvlc/crossplatform/xamarin/forms/release/2019/05/13/LibVLCSharp-goes-stable.html
* VS2019 support
LibVLCSharp version 0.8.1
=========================
* Fix ARM debug support for UWP.
......
......@@ -124,8 +124,8 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\Xamarin.Forms.3.2.0.871581\build\netstandard2.0\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Xamarin.Forms.3.2.0.871581\build\netstandard2.0\Xamarin.Forms.props'))" />
<Error Condition="!Exists('..\..\..\packages\Xamarin.Forms.3.2.0.871581\build\netstandard2.0\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Xamarin.Forms.3.2.0.871581\build\netstandard2.0\Xamarin.Forms.targets'))" />
<Error Condition="!Exists('..\..\..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets'))" />
<Error Condition="!Exists('..\..\..\packages\VideoLAN.LibVLC.Mac.3.1.3\build\VideoLAN.LibVLC.Mac.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\VideoLAN.LibVLC.Mac.3.1.3\build\VideoLAN.LibVLC.Mac.targets'))" />
</Target>
<Import Project="..\..\..\packages\Xamarin.Forms.3.2.0.871581\build\netstandard2.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\packages\Xamarin.Forms.3.2.0.871581\build\netstandard2.0\Xamarin.Forms.targets')" />
<Import Project="..\..\..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets" Condition="Exists('..\..\..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets')" />
<Import Project="..\..\..\packages\VideoLAN.LibVLC.Mac.3.1.3\build\VideoLAN.LibVLC.Mac.targets" Condition="Exists('..\..\..\packages\VideoLAN.LibVLC.Mac.3.1.3\build\VideoLAN.LibVLC.Mac.targets')" />
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="VideoLAN.LibVLC.Mac" version="3.1.2" targetFramework="xamarinmac20" />
<package id="VideoLAN.LibVLC.Mac" version="3.1.3" targetFramework="xamarinmac20" />
<package id="Xamarin.Forms" version="3.2.0.871581" targetFramework="xamarinmac20" />
</packages>
\ No newline at end of file
......@@ -43,7 +43,7 @@ namespace LibVLCSharp.Forms.Sample
MediaPlayer = new MediaPlayer(LibVLC)
{
Media = new Media(LibVLC,
"http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4",
"https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4",
FromType.FromLocation)
};
}
......
......@@ -3,6 +3,7 @@ using Android.OS;
using Android.Views;
using Android.Widget;
using LibVLCSharp.Shared;
using System.Threading.Tasks;
using VideoView = LibVLCSharp.Platforms.Android.VideoView;
namespace LibVLCSharp.Android.Sample
......@@ -22,7 +23,7 @@ namespace LibVLCSharp.Android.Sample
SetContentView(Resource.Layout.Main);
}
protected override void OnResume()
protected override async void OnResume()
{
base.OnResume();
......@@ -30,14 +31,20 @@ namespace LibVLCSharp.Android.Sample
_libVLC = new LibVLC();
_mediaPlayer = new MediaPlayer(_libVLC);
_mediaPlayer.Vout += _mediaPlayer_Vout;
_videoView = new VideoView(this) { MediaPlayer = _mediaPlayer };
AddContentView(_videoView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WrapContent, ViewGroup.LayoutParams.WrapContent));
var media = new Media(_libVLC, "http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", FromType.FromLocation);
var media = new Media(_libVLC, "https://streams.videolan.org/samples/Matroska/Mushishi24-head.mkv", FromType.FromLocation);
var configuration = new MediaConfiguration();
configuration.EnableHardwareDecoding();
media.AddOption(configuration);
_videoView.MediaPlayer.Play(media);
// await Task.Delay(3000);
// _mediaPlayer.Stop();
}
private void _mediaPlayer_Vout(object sender, MediaPlayerVoutEventArgs e)
{
}
protected override void OnPause()
......
This diff is collapsed.
......@@ -7,6 +7,6 @@ let main argv =
Core.Initialize()
let libVLC = new LibVLC()
let mp = new MediaPlayer(libVLC)
mp.Play(new Media(libVLC, "http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", FromType.FromLocation)) |> ignore
mp.Play(new Media(libVLC, "https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4", FromType.FromLocation)) |> ignore
let result = Console.ReadKey()
0
\ No newline at end of file
......@@ -28,7 +28,7 @@ namespace LibVLCSharp.GTK.Sample
//Starts playing
using (var media = new Media(libvlc,
"http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4",
"https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4",
FromType.FromLocation))
{
mediaPlayer.Play(media);
......
......@@ -99,5 +99,11 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="..\..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets" Condition="Exists('..\..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets')" />
<Import Project="..\..\packages\VideoLAN.LibVLC.Mac.3.1.3\build\VideoLAN.LibVLC.Mac.targets" Condition="Exists('..\..\packages\VideoLAN.LibVLC.Mac.3.1.3\build\VideoLAN.LibVLC.Mac.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\VideoLAN.LibVLC.Mac.3.1.3\build\VideoLAN.LibVLC.Mac.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\VideoLAN.LibVLC.Mac.3.1.3\build\VideoLAN.LibVLC.Mac.targets'))" />
</Target>
</Project>
\ No newline at end of file
......@@ -31,7 +31,7 @@ namespace LibVLCSharp.Mac.Sample
View = _videoView;
_videoView.MediaPlayer.Play(new Media(_libVLC, "http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", FromType.FromLocation));
_videoView.MediaPlayer.Play(new Media(_libVLC, "https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4", FromType.FromLocation));
}
public override NSObject RepresentedObject
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="VideoLAN.LibVLC.Mac" version="3.1.2" targetFramework="xamarinmac20" />
<package id="VideoLAN.LibVLC.Mac" version="3.1.3" targetFramework="xamarinmac20" />
</packages>
\ No newline at end of file
......@@ -7,8 +7,8 @@
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.4" />
<PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.2" />
<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.6" />
<PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\LibVLCSharp\LibVLCSharp.csproj" />
......
......@@ -11,7 +11,7 @@ namespace LibVLCSharp.NetCore.Sample
using(var libVLC = new LibVLC())
{
var media = new Media(libVLC, "http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", FromType.FromLocation);
var media = new Media(libVLC, "https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4", FromType.FromLocation);
using(var mp = new MediaPlayer(media))
{
media.Dispose();
......
......@@ -20,7 +20,7 @@ namespace LibVLCSharp.UWP.Sample
_libVLC = new LibVLC(VideoView.SwapChainOptions);
_mediaPlayer = new MediaPlayer(_libVLC);
VideoView.MediaPlayer = _mediaPlayer;
this._mediaPlayer.Play(new Media(_libVLC, "http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", FromType.FromLocation));
this._mediaPlayer.Play(new Media(_libVLC, "https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4", FromType.FromLocation));
};
Unloaded += (s, e) =>
......
......@@ -44,7 +44,7 @@ namespace LibVLCSharp.WPF.Sample
if (!parent.VideoView.MediaPlayer.IsPlaying)
{
parent.VideoView.MediaPlayer.Play(new Media(_libVLC,
"http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", FromType.FromLocation));
"https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4", FromType.FromLocation));
}
}
}
......
......@@ -45,7 +45,7 @@ namespace LibVLCSharp.WPF.Sample
if (!VideoView.MediaPlayer.IsPlaying)
{
VideoView.MediaPlayer.Play(new Media(_libVLC,
"http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", FromType.FromLocation));
"https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4", FromType.FromLocation));
}
}
}
......
......@@ -25,7 +25,7 @@ namespace LibVLCSharp.WinForms.Sample
private void Form1_Load(object sender, EventArgs e)
{
_mp.Play(new Media(_libVLC, "http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", FromType.FromLocation));
_mp.Play(new Media(_libVLC, "https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4", FromType.FromLocation));
}
}
}
\ No newline at end of file
......@@ -10,7 +10,7 @@ namespace LibVLCSharp.Windows.Net40.Sample
Core.Initialize();
var libVLC = new LibVLC();
var media = new Media(libVLC, "http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", FromType.FromLocation);
var media = new Media(libVLC, "https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4", FromType.FromLocation);
var mp = new MediaPlayer(media);
mp.Play();
Console.ReadKey();
......
......@@ -83,5 +83,11 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\packages\VideoLAN.LibVLC.iOS.3.1.5-alpha\build\VideoLAN.LibVLC.iOS.targets" Condition="Exists('..\..\packages\VideoLAN.LibVLC.iOS.3.1.5-alpha\build\VideoLAN.LibVLC.iOS.targets')" />
<Import Project="..\..\packages\VideoLAN.LibVLC.iOS.3.3.1\build\VideoLAN.LibVLC.iOS.targets" Condition="Exists('..\..\packages\VideoLAN.LibVLC.iOS.3.3.1\build\VideoLAN.LibVLC.iOS.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\VideoLAN.LibVLC.iOS.3.3.1\build\VideoLAN.LibVLC.iOS.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\VideoLAN.LibVLC.iOS.3.3.1\build\VideoLAN.LibVLC.iOS.targets'))" />
</Target>
</Project>
\ No newline at end of file
......@@ -22,7 +22,7 @@ namespace LibVLCSharp.iOS.Sample
View = _videoView;
_videoView.MediaPlayer.Play(new Media(_libVLC, "http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", FromType.FromLocation));
_videoView.MediaPlayer.Play(new Media(_libVLC, "https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4", FromType.FromLocation));
}
}
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="VideoLAN.LibVLC.iOS" version="3.1.5-alpha" targetFramework="xamarinios10" />
<package id="VideoLAN.LibVLC.iOS" version="3.3.1" targetFramework="xamarinios10" />
</packages>
\ No newline at end of file
......@@ -177,11 +177,11 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.CSharp.targets" />
<Import Project="..\..\packages\VideoLAN.LibVLC.tvOS.3.2.0-alpha1\build\VideoLAN.LibVLC.tvOS.targets" Condition="Exists('..\..\packages\VideoLAN.LibVLC.tvOS.3.2.0-alpha1\build\VideoLAN.LibVLC.tvOS.targets')" />
<Import Project="..\..\packages\VideoLAN.LibVLC.tvOS.3.2.0\build\VideoLAN.LibVLC.tvOS.targets" Condition="Exists('..\..\packages\VideoLAN.LibVLC.tvOS.3.2.0\build\VideoLAN.LibVLC.tvOS.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\VideoLAN.LibVLC.tvOS.3.2.0-alpha1\build\VideoLAN.LibVLC.tvOS.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\VideoLAN.LibVLC.tvOS.3.2.0-alpha1\build\VideoLAN.LibVLC.tvOS.targets'))" />
<Error Condition="!Exists('..\..\packages\VideoLAN.LibVLC.tvOS.3.2.0\build\VideoLAN.LibVLC.tvOS.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\VideoLAN.LibVLC.tvOS.3.2.0\build\VideoLAN.LibVLC.tvOS.targets'))" />
</Target>
</Project>
\ No newline at end of file
......@@ -22,7 +22,7 @@ namespace LibVLCSharp.tvOS.Sample
View = _videoView;
_videoView.MediaPlayer.Play(new Media(_libVLC, "http://www.quirksmode.org/html5/videos/big_buck_bunny.mp4", FromType.FromLocation));
_videoView.MediaPlayer.Play(new Media(_libVLC, "https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4", FromType.FromLocation));
}
}
}
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="VideoLAN.LibVLC.tvOS" version="3.2.0-alpha1" targetFramework="xamarintvos10" />
<package id="VideoLAN.LibVLC.tvOS" version="3.2.0" targetFramework="xamarintvos10" />
</packages>
\ No newline at end of file
trigger:
- master
- 3.x
pr:
- master
- 3.x
jobs:
- job: Linux
......
......@@ -7,7 +7,7 @@ steps:
- bash: |
#!/bin/bash
set -ex
MONO_MACOS_PKG_DOWNLOAD_URL='https://download.mono-project.com/archive/6.0.0/macos-10-universal/MonoFramework-MDK-6.0.0.macos10.xamarin.universal.pkg'
MONO_MACOS_PKG_DOWNLOAD_URL='https://download.mono-project.com/archive/mdk-latest-vs.pkg'
mkdir -p /tmp/mono-install
cd /tmp/mono-install
mono --version
......