Merge pull request #270 from dennisgranasen/master

VlcOptions as List instead of array
devkanro · Jun 4, 2018 · 0084bfa · 0084bfa
2 parents ca8c1b5 + e28590c
commit 0084bfa
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 24 deletions.
diff --git a/Meta.Vlc.Wpf/ApiManager.cs b/Meta.Vlc.Wpf/ApiManager.cs
@@ -3,6 +3,7 @@
 // Version: 20160214
 
 using System;
+using System.Linq;
 using System.Collections.Generic;
 
 namespace Meta.Vlc.Wpf
@@ -45,7 +46,7 @@ public static void ReleaseAll()
         /// <summary>
         ///     The options when initialize LibVlc.
         /// </summary>
-        public static String[] VlcOption { get; private set; }
+        public static IList<String> VlcOption { get; private set; }
 
         /// <summary>
         ///     The list of VLC.
@@ -61,7 +62,7 @@ public static Vlc DefaultVlc
             {
                 if (_defaultVlc == null)
                 {
-                    Vlcs.Add(_defaultVlc = new Vlc(VlcOption));
+                    Vlcs.Add(_defaultVlc = new Vlc(VlcOption.ToArray()));
                 }
 
                 return _defaultVlc;

diff --git a/Meta.Vlc.Wpf/ThreadSeparatedImage.cs b/Meta.Vlc.Wpf/ThreadSeparatedImage.cs
@@ -15,31 +15,34 @@ namespace Meta.Vlc.Wpf
     public sealed class ThreadSeparatedImage : ThreadSeparatedControlHost
     {
         private static Dispatcher _commonDispatcher;
+        private static object _staticLock = new object();
         public static Dispatcher CommonDispatcher
         {
             get
             {
-                if (_commonDispatcher == null)
+                lock (_staticLock)
                 {
-                    Thread separateThread = new Thread(() =>
+                    if (_commonDispatcher == null)
                     {
-                        Dispatcher.Run();
-                    })
-                    {
-                        IsBackground = true
-                    };
-                    separateThread.SetApartmentState(ApartmentState.STA);
-                    separateThread.Priority = ThreadPriority.Highest;
-
-                    separateThread.Start();
-
-                    while (Dispatcher.FromThread(separateThread) == null)
-                    {
-                        Thread.Sleep(50);
+                        Thread separateThread = new Thread(() =>
+                        {
+                            Dispatcher.Run();
+                        })
+                        {
+                            IsBackground = true
+                        };
+                        separateThread.SetApartmentState(ApartmentState.STA);
+                        separateThread.Priority = ThreadPriority.Highest;
+
+                        separateThread.Start();
+
+                        while (Dispatcher.FromThread(separateThread) == null)
+                        {
+                            Thread.Sleep(50);
+                        }
+                        _commonDispatcher = Dispatcher.FromThread(separateThread);
                     }
-                    _commonDispatcher = Dispatcher.FromThread(separateThread);
                 }
-
                 return _commonDispatcher;
             }
         }

diff --git a/Meta.Vlc.Wpf/VlcPlayer.DependencyProperties.cs b/Meta.Vlc.Wpf/VlcPlayer.DependencyProperties.cs
@@ -3,6 +3,7 @@
 // Version: 20160327
 
 using System;
+using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -32,14 +33,14 @@ public String LibVlcPath
         /// <summary>
         ///     The options of LibVlc, it is a DependencyProperty.
         /// </summary>
-        public String[] VlcOption
+        public IList<String> VlcOption
         {
-            get { return (String[]) GetValue(VlcOptionProperty); }
+            get { return (IList<String>) GetValue(VlcOptionProperty); }
             set { SetValue(VlcOptionProperty, value); }
         }
 
         public static readonly DependencyProperty VlcOptionProperty =
-            DependencyProperty.Register("VlcOption", typeof (String[]), typeof (VlcPlayer), null);
+            DependencyProperty.Register("VlcOption", typeof (IList<String>), typeof (VlcPlayer), new PropertyMetadata(new List<string>()));
 
         #endregion VlcOption
 

diff --git a/Meta.Vlc.Wpf/VlcPlayer.cs b/Meta.Vlc.Wpf/VlcPlayer.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -178,7 +179,7 @@ protected override void OnInitialized(EventArgs e)
                     }
                     else
                     {
-                        Initialize(libVlcPath, libVlcOption);
+                        Initialize(libVlcPath, libVlcOption.ToArray());
                     }
                 }
                 else
@@ -204,7 +205,7 @@ protected override void OnInitialized(EventArgs e)
                             libVlcOption = vlcSettingsAttribute.VlcOption;
                     }
 
-                    Initialize(libVlcPath, libVlcOption);
+                    Initialize(libVlcPath, libVlcOption.ToArray());
                 }
             }