Commit 81c820e2 authored by Martin Finkel's avatar Martin Finkel
Browse files

Update LibVLCSharp ref to 0.7.0 and adapt API change

parent ba72137b
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibVLCSharp"> <PackageReference Include="LibVLCSharp">
<Version>0.6.0</Version> <Version>0.7.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="VideoLAN.LibVLC.Android"> <PackageReference Include="VideoLAN.LibVLC.Android">
<Version>3.0.0</Version> <Version>3.0.0</Version>
......
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibVLCSharp"> <PackageReference Include="LibVLCSharp">
<Version>0.6.0</Version> <Version>0.7.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="VideoLAN.LibVLC.iOS"> <PackageReference Include="VideoLAN.LibVLC.iOS">
<Version>3.1.5-alpha</Version> <Version>3.1.5-alpha</Version>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibVLCSharp" Version="0.6.0" /> <PackageReference Include="LibVLCSharp" Version="0.7.0" />
<PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" /> <PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibVLCSharp.Forms"> <PackageReference Include="LibVLCSharp.Forms">
<Version>0.6.0</Version> <Version>0.7.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="VideoLAN.LibVLC.Android"> <PackageReference Include="VideoLAN.LibVLC.Android">
<Version>3.0.0</Version> <Version>3.0.0</Version>
......
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibVLCSharp.Forms"> <PackageReference Include="LibVLCSharp.Forms">
<Version>0.6.0</Version> <Version>0.7.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="VideoLAN.LibVLC.iOS"> <PackageReference Include="VideoLAN.LibVLC.iOS">
<Version>3.1.5-alpha</Version> <Version>3.1.5-alpha</Version>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibVLCSharp.Forms" Version="0.6.0" /> <PackageReference Include="LibVLCSharp.Forms" Version="0.7.0" />
<PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" /> <PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
...@@ -18,7 +18,7 @@ namespace ForegroundBackground ...@@ -18,7 +18,7 @@ namespace ForegroundBackground
MessagingCenter.Subscribe<string>(this, "OnPause", app => MessagingCenter.Subscribe<string>(this, "OnPause", app =>
{ {
VideoView.Loaded -= VideoView_Loaded; VideoView.MediaPlayerChanged -= MediaPlayerChanged;
_mediaPlayer.Pause(); _mediaPlayer.Pause();
_position = _mediaPlayer.Position; _position = _mediaPlayer.Position;
_mediaPlayer.Stop(); _mediaPlayer.Stop();
...@@ -31,7 +31,7 @@ namespace ForegroundBackground ...@@ -31,7 +31,7 @@ namespace ForegroundBackground
_videoView = new VideoView { HorizontalOptions = LayoutOptions.FillAndExpand, VerticalOptions = LayoutOptions.FillAndExpand }; _videoView = new VideoView { HorizontalOptions = LayoutOptions.FillAndExpand, VerticalOptions = LayoutOptions.FillAndExpand };
MainGrid.Children.Add(_videoView); MainGrid.Children.Add(_videoView);
_videoView.Loaded += VideoView_Loaded; _videoView.MediaPlayerChanged += MediaPlayerChanged;
_videoView.MediaPlayer = _mediaPlayer; _videoView.MediaPlayer = _mediaPlayer;
_videoView.MediaPlayer.Position = _position; _videoView.MediaPlayer.Position = _position;
...@@ -43,7 +43,7 @@ namespace ForegroundBackground ...@@ -43,7 +43,7 @@ namespace ForegroundBackground
{ {
base.OnAppearing(); base.OnAppearing();
VideoView.Loaded += VideoView_Loaded; VideoView.MediaPlayerChanged += MediaPlayerChanged;
Core.Initialize(); Core.Initialize();
...@@ -58,7 +58,7 @@ namespace ForegroundBackground ...@@ -58,7 +58,7 @@ namespace ForegroundBackground
VideoView.MediaPlayer = _mediaPlayer; VideoView.MediaPlayer = _mediaPlayer;
} }
private void VideoView_Loaded(object sender, System.EventArgs e) private void MediaPlayerChanged(object sender, System.EventArgs e)
{ {
_mediaPlayer.Play(); _mediaPlayer.Play();
} }
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibVLCSharp.Forms"> <PackageReference Include="LibVLCSharp.Forms">
<Version>0.6.0</Version> <Version>0.7.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="VideoLAN.LibVLC.Android"> <PackageReference Include="VideoLAN.LibVLC.Android">
<Version>3.0.0</Version> <Version>3.0.0</Version>
......
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibVLCSharp.Forms"> <PackageReference Include="LibVLCSharp.Forms">
<Version>0.6.0</Version> <Version>0.7.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="VideoLAN.LibVLC.iOS"> <PackageReference Include="VideoLAN.LibVLC.iOS">
<Version>3.1.5-alpha</Version> <Version>3.1.5-alpha</Version>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibVLCSharp.Forms" Version="0.6.0" /> <PackageReference Include="LibVLCSharp.Forms" Version="0.7.0" />
<PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" /> <PackageReference Include="Xamarin.Forms" Version="3.6.0.264807" />
</ItemGroup> </ItemGroup>
......
...@@ -15,7 +15,7 @@ namespace Gestures ...@@ -15,7 +15,7 @@ namespace Gestures
{ {
base.OnAppearing(); base.OnAppearing();
videoView.Loaded += VideoView_Loaded; videoView.MediaPlayerChanged += MediaPlayerChanged;
_vm = BindingContext as MainViewModel; _vm = BindingContext as MainViewModel;
_vm.Initialize(); _vm.Initialize();
...@@ -25,13 +25,13 @@ namespace Gestures ...@@ -25,13 +25,13 @@ namespace Gestures
{ {
base.OnDisappearing(); base.OnDisappearing();
videoView.Loaded -= VideoView_Loaded; videoView.MediaPlayerChanged -= MediaPlayerChanged;
_vm = BindingContext as MainViewModel; _vm = BindingContext as MainViewModel;
_vm.Stop(); _vm.Stop();
} }
private void VideoView_Loaded(object sender, System.EventArgs e) private void MediaPlayerChanged(object sender, System.EventArgs e)
{ {
_vm.MediaPlayer.Play(); _vm.MediaPlayer.Play();
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<Compile Include="**/*.php" /> <Compile Include="**/*.php" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibVLCSharp" Version="0.6.0" /> <PackageReference Include="LibVLCSharp" Version="0.7.0" />
<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.6" /> <PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.6" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.6" /> <PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.6" />
<PackageReference Include="LibVLCSharp" Version="0.6.0" /> <PackageReference Include="LibVLCSharp" Version="0.7.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibVLCSharp"> <PackageReference Include="LibVLCSharp">
<Version>0.6.0</Version> <Version>0.7.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="VideoLAN.LibVLC.Android"> <PackageReference Include="VideoLAN.LibVLC.Android">
<Version>3.0.0</Version> <Version>3.0.0</Version>
......
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="LibVLCSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="LibVLCSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\LibVLCSharp.0.6.0\lib\net40\LibVLCSharp.dll</HintPath> <HintPath>..\..\packages\LibVLCSharp.0.7.0\lib\net40\LibVLCSharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="LibVLCSharp.WPF, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="LibVLCSharp.WPF, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\LibVLCSharp.WPF.0.6.0\lib\net461\LibVLCSharp.WPF.dll</HintPath> <HintPath>..\..\packages\LibVLCSharp.WPF.0.7.0\lib\net461\LibVLCSharp.WPF.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath> <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="LibVLCSharp" version="0.6.0" targetFramework="net47" /> <package id="LibVLCSharp" version="0.7.0" targetFramework="net47" />
<package id="LibVLCSharp.WPF" version="0.6.0" targetFramework="net47" /> <package id="LibVLCSharp.WPF" version="0.7.0" targetFramework="net47" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net47" /> <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net47" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net47" /> <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net47" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net47" /> <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net47" />
......
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