Merge branch 'hotfix/Video_not_loading'

PatrickHollweck · May 10, 2017 · fb8c299 · fb8c299
2 parents 2eaeb1c + 34669a6
commit fb8c299
Show file tree

Hide file tree

Showing 5 changed files with 129 additions and 73 deletions.
diff --git a/AstroSoundBoard.sln b/AstroSoundBoard.sln
@@ -8,19 +8,25 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x86.Build.0 = Debug|Any CPU
+		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x64.ActiveCfg = Debug|x64
+		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x64.Build.0 = Debug|x64
+		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x86.ActiveCfg = Debug|x86
+		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Debug|x86.Build.0 = Debug|x86
 		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x86.ActiveCfg = Release|Any CPU
-		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x86.Build.0 = Release|Any CPU
+		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x64.ActiveCfg = Release|Any CPU
+		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x64.Build.0 = Release|Any CPU
+		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x86.ActiveCfg = Release|x86
+		{24C2FAA4-3A55-49A3-AA2D-BE8EA58F876C}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/AstroSoundBoard/AstroSoundBoard.csproj b/src/AstroSoundBoard/AstroSoundBoard.csproj
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.props" Condition="Exists('..\..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.props')" />
+  <Import Project="..\..\packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props" Condition="Exists('..\..\packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -61,6 +63,46 @@
   <PropertyGroup>
     <NoWin32Manifest>true</NoWin32Manifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="AutoUpdater.NET, Version=1.4.0.0, Culture=neutral, PublicKeyToken=942f95247e354701, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Autoupdater.NET.Official.1.4\lib\net40\AutoUpdater.NET.dll</HintPath>
@@ -92,8 +134,9 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple">
+      <HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
@@ -469,8 +512,18 @@
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Fody.2.0.6\build\netstandard1.4\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.2.0.6\build\netstandard1.4\Fody.targets'))" />
+    <Error Condition="!Exists('..\..\packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets'))" />
+    <Error Condition="!Exists('..\..\packages\cef.redist.x86.3.2987.1601\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x86.3.2987.1601\build\cef.redist.x86.targets'))" />
+    <Error Condition="!Exists('..\..\packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.57.0.0\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('..\..\packages\CefSharp.Common.57.0.0\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.57.0.0\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('..\..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.props'))" />
+    <Error Condition="!Exists('..\..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets'))" />
   </Target>
   <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
-  <Import Project="..\..\packages\Fody.2.0.6\build\netstandard1.4\Fody.targets" Condition="Exists('..\..\packages\Fody.2.0.6\build\netstandard1.4\Fody.targets')" />
+  <Import Project="..\..\packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets" Condition="Exists('..\..\packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets')" />
+  <Import Project="..\..\packages\cef.redist.x86.3.2987.1601\build\cef.redist.x86.targets" Condition="Exists('..\..\packages\cef.redist.x86.3.2987.1601\build\cef.redist.x86.targets')" />
+  <Import Project="..\..\packages\CefSharp.Common.57.0.0\build\CefSharp.Common.targets" Condition="Exists('..\..\packages\CefSharp.Common.57.0.0\build\CefSharp.Common.targets')" />
+  <Import Project="..\..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.targets" Condition="Exists('..\..\packages\CefSharp.Wpf.57.0.0\build\CefSharp.Wpf.targets')" />
+  <Import Project="..\..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets" Condition="Exists('..\..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets')" />
 </Project>
diff --git a/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml b/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml
@@ -1,23 +1,23 @@
 <Window
-	x:Class="AstroSoundBoard.WPF.Windows.InfoWindow"
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	Title="Sound Info"
-	Width="800"
-	Height="470"
-	MinWidth="800"
-	MinHeight="470"
-	Background="{DynamicResource MaterialDesignPaper}"
-	Closing="Window_Closing"
-	FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
-	ResizeMode="NoResize"
-	TextElement.FontSize="14"
-	TextElement.FontWeight="Medium"
-	TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-	mc:Ignorable="d">
+    x:Class="AstroSoundBoard.WPF.Windows.InfoWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:wpf="clr-namespace:CefSharp.Wpf;assembly=CefSharp.Wpf"
+    Title="Sound Info"
+    Width="800"
+    Height="470"
+    MinWidth="800"
+    MinHeight="470"
+    Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
+    ResizeMode="NoResize"
+    TextElement.FontSize="14"
+    TextElement.FontWeight="Medium"
+    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+    mc:Ignorable="d">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -32,65 +32,65 @@
         </Grid.ColumnDefinitions>
 
         <GroupBox
-			Grid.Row="0"
-			Grid.Column="1"
-			Grid.ColumnSpan="2"
-			Margin="16,16,16,0"
-			BorderThickness="0"
-			Header="{Binding LocalSound.Name, FallbackValue=SoundName}"
-			Style="{DynamicResource MaterialDesignGroupBox}" />
+            Grid.Row="0"
+            Grid.Column="1"
+            Grid.ColumnSpan="2"
+            Margin="16,16,16,0"
+            BorderThickness="0"
+            Header="{Binding LocalSound.Name, FallbackValue=SoundName}"
+            Style="{DynamicResource MaterialDesignGroupBox}" />
 
         <GroupBox
-			Grid.Row="1"
-			Grid.Column="1"
-			Margin="16,0,16,16"
-			Header="Informations"
-			Style="{DynamicResource MaterialDesignCardGroupBox}">
+            Grid.Row="1"
+            Grid.Column="1"
+            Margin="16,0,16,16"
+            Header="Informations"
+            Style="{DynamicResource MaterialDesignCardGroupBox}">
             <GroupBox.HeaderTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon
-							Width="32"
-							Height="32"
-							VerticalAlignment="Center"
-							Kind="Information" />
+                            Width="32"
+                            Height="32"
+                            VerticalAlignment="Center"
+                            Kind="Information" />
                         <TextBlock
-							Margin="8,0,0,0"
-							VerticalAlignment="Center"
-							Style="{StaticResource MaterialDesignSubheadingTextBlock}"
-							Text="{Binding}" />
+                            Margin="8,0,0,0"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource MaterialDesignSubheadingTextBlock}"
+                            Text="{Binding}" />
                     </StackPanel>
                 </DataTemplate>
             </GroupBox.HeaderTemplate>
             <TextBlock
-				Margin="4"
-				Text="{Binding LocalSound.Description}"
-				TextWrapping="Wrap" />
+                Margin="4"
+                Text="{Binding LocalSound.Description}"
+                TextWrapping="Wrap" />
         </GroupBox>
 
         <GroupBox
-			Grid.Row="1"
-			Grid.Column="2"
-			Margin="16,0,16,16"
-			Header="Video Source"
-			Style="{DynamicResource MaterialDesignCardGroupBox}">
+            Grid.Row="1"
+            Grid.Column="2"
+            Margin="16,0,16,16"
+            Header="Video Source"
+            Style="{DynamicResource MaterialDesignCardGroupBox}">
             <GroupBox.HeaderTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal">
                         <materialDesign:PackIcon
-							Width="32"
-							Height="32"
-							VerticalAlignment="Center"
-							Kind="Filmstrip" />
+                            Width="32"
+                            Height="32"
+                            VerticalAlignment="Center"
+                            Kind="Filmstrip" />
                         <TextBlock
-							Margin="8,0,0,0"
-							VerticalAlignment="Center"
-							Style="{StaticResource MaterialDesignSubheadingTextBlock}"
-							Text="{Binding}" />
+                            Margin="8,0,0,0"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource MaterialDesignSubheadingTextBlock}"
+                            Text="{Binding}" />
                     </StackPanel>
                 </DataTemplate>
             </GroupBox.HeaderTemplate>
-            <WebBrowser Name="Browser" />
+            <wpf:ChromiumWebBrowser Address="{Binding LocalSound.VideoLink}" />
         </GroupBox>
 
     </Grid>

diff --git a/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml.cs b/src/AstroSoundBoard/WPF/Windows/InfoWindow.xaml.cs
@@ -26,13 +26,6 @@ public InfoWindow(Sound def)
             InitializeComponent();
             DataContext = this;
 
-            Browser.Navigate(LocalSound.VideoLink);
-        }
-
-        private void Window_Closing(object sender, CancelEventArgs e)
-        {
-            // Needed to stop the Video if it is playing!
-            Browser.Dispose();
         }
     }
 }
diff --git a/src/AstroSoundBoard/packages.config b/src/AstroSoundBoard/packages.config
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autoupdater.NET.Official" version="1.4" targetFramework="net462" />
+  <package id="cef.redist.x64" version="3.2987.1601" targetFramework="net462" />
+  <package id="cef.redist.x86" version="3.2987.1601" targetFramework="net462" />
+  <package id="CefSharp.Common" version="57.0.0" targetFramework="net462" />
+  <package id="CefSharp.Wpf" version="57.0.0" targetFramework="net462" />
   <package id="Costura.Fody" version="1.4.1" targetFramework="net462" developmentDependency="true" />
-  <package id="Fody" version="2.0.6" targetFramework="net462" developmentDependency="true" />
+  <package id="Fody" version="2.0.7" targetFramework="net462" developmentDependency="true" />
   <package id="log4net" version="2.0.8" targetFramework="net452" />
   <package id="MaterialDesignColors" version="1.1.3" targetFramework="net462" />
   <package id="MaterialDesignThemes" version="2.3.0.823" targetFramework="net452" />
@@ -15,5 +19,5 @@
   <package id="NHotkey.Wpf" version="1.2.1" targetFramework="net462" />
   <package id="PropertyChanged.Fody" version="1.53.0" targetFramework="net462" developmentDependency="true" />
   <package id="SharpRaven" version="2.2.0" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.3.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.3.1" targetFramework="net462" />
 </packages>