Merge pull request from dev branch.

- Fix can't stop in statechanged event.
devkanro · Apr 4, 2016 · e935afe · e935afe
2 parents b985a94 + 78511c5
commit e935afe
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 16 deletions.
diff --git a/xZune.Vlc.Wpf.Sample/MainWindow.xaml b/xZune.Vlc.Wpf.Sample/MainWindow.xaml
@@ -23,7 +23,7 @@ Version: 20160109
 
     <Grid x:Name="LayoutParent">
 
-        <wpf:VlcPlayer x:Name="Player" EndBehavior="Repeat"/>
+        <wpf:VlcPlayer x:Name="Player" EndBehavior="Nothing" Stretch="Fill"/>
         <!-- can comment this if adding the player dynamically -->
 
         <StackPanel Opacity="0.8">

diff --git a/xZune.Vlc.Wpf.Sample/MainWindow.xaml.cs b/xZune.Vlc.Wpf.Sample/MainWindow.xaml.cs
@@ -1,6 +1,6 @@
 // Project: xZune.Vlc (https://github.com/higankanshi/xZune.Vlc)
 // Filename: MainWindow.xaml.cs
-// Version: 20160312
+// Version: 20160404
 
 using System;
 using System.ComponentModel;

diff --git a/xZune.Vlc.Wpf/Themes/Generic.xaml b/xZune.Vlc.Wpf/Themes/Generic.xaml
@@ -1,7 +1,7 @@
 <!--
 Project: xZune.Vlc (https://github.com/higankanshi/xZune.Vlc)
 Filename: Themes/Generic.xaml
-Version: 20160327
+Version: 20160404
 -->
 
 <ResourceDictionary
@@ -10,7 +10,7 @@ Version: 20160327
   xmlns:local="clr-namespace:xZune.Vlc.Wpf">
 
     <Style TargetType="{x:Type local:VlcPlayer}">
-
+        <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Stretch" Value="Uniform" />
         <Setter Property="StretchDirection" Value="Both" />
 
@@ -24,7 +24,7 @@ Version: 20160327
             Background="{TemplateBinding Background}"
             BorderBrush="{TemplateBinding BorderBrush}"
             BorderThickness="{TemplateBinding BorderThickness}">
-                        <local:ThreadSeparatedImage x:Name="Image" />
+                        <local:ThreadSeparatedImage x:Name="Image"/>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>

diff --git a/xZune.Vlc.Wpf/VlcPlayer.Events.cs b/xZune.Vlc.Wpf/VlcPlayer.Events.cs
@@ -1,6 +1,6 @@
 // Project: xZune.Vlc (https://github.com/higankanshi/xZune.Vlc)
 // Filename: VlcPlayer.Events.cs
-// Version: 20160327
+// Version: 20160404
 
 using System;
 using System.Diagnostics;
@@ -213,8 +213,11 @@ private void MediaStateChanged(object sender, ObjectEventArgs<Interop.Core.Event
 
             Debug.WriteLine(String.Format("StateChanged : {0}", e.Value.NewState));
 
-            if (StateChanged != null)
-                StateChanged(this, new ObjectEventArgs<MediaState>(e.Value.NewState));
+            Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+             {
+                 if (StateChanged != null)
+                     StateChanged(this, new ObjectEventArgs<MediaState>(e.Value.NewState));
+             }));
         }
 
         #endregion VlcMediaPlayer event handlers

diff --git a/xZune.Vlc.Wpf/xZune.Vlc.Wpf - .Net 3.5.csproj b/xZune.Vlc.Wpf/xZune.Vlc.Wpf - .Net 3.5.csproj
@@ -72,7 +72,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>higan.pfx</AssemblyOriginatorKeyFile>

diff --git a/xZune.Vlc.Wpf/xZune.Vlc.Wpf - .Net 4.0.csproj b/xZune.Vlc.Wpf/xZune.Vlc.Wpf - .Net 4.0.csproj
@@ -73,7 +73,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>higan.pfx</AssemblyOriginatorKeyFile>

diff --git a/xZune.Vlc.Wpf/xZune.Vlc.Wpf - .Net 4.5.csproj b/xZune.Vlc.Wpf/xZune.Vlc.Wpf - .Net 4.5.csproj
@@ -74,7 +74,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>higan.pfx</AssemblyOriginatorKeyFile>

diff --git a/xZune.Vlc/xZune.Vlc - .Net 2.0.csproj b/xZune.Vlc/xZune.Vlc - .Net 2.0.csproj
@@ -70,7 +70,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>higan.pfx</AssemblyOriginatorKeyFile>

diff --git a/xZune.Vlc/xZune.Vlc - .Net 3.0.csproj b/xZune.Vlc/xZune.Vlc - .Net 3.0.csproj
@@ -70,7 +70,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>higan.pfx</AssemblyOriginatorKeyFile>

diff --git a/xZune.Vlc/xZune.Vlc - .Net 3.5.csproj b/xZune.Vlc/xZune.Vlc - .Net 3.5.csproj
@@ -70,7 +70,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>higan.pfx</AssemblyOriginatorKeyFile>

diff --git a/xZune.Vlc/xZune.Vlc - .Net 4.0.csproj b/xZune.Vlc/xZune.Vlc - .Net 4.0.csproj
@@ -72,7 +72,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>higan.pfx</AssemblyOriginatorKeyFile>

diff --git a/xZune.Vlc/xZune.Vlc - .Net 4.5.csproj b/xZune.Vlc/xZune.Vlc - .Net 4.5.csproj
@@ -72,7 +72,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>higan.pfx</AssemblyOriginatorKeyFile>