Pushing missing changes

MediaBrowser.UI/Configuration/PlayerConfiguration.cs

@@ -0,0 +1,52 @@
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.UI.Configuration
+{
+    /// <summary>
+    /// Class PlayerConfiguration
+    /// </summary>
+    public class PlayerConfiguration
+    {
+        /// <summary>
+        /// Gets or sets the name of the player.
+        /// </summary>
+        /// <value>The name of the player.</value>
+        public string PlayerName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the item types.
+        /// </summary>
+        /// <value>The item types.</value>
+        public string[] ItemTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the file extensions.
+        /// </summary>
+        /// <value>The file extensions.</value>
+        public string[] FileExtensions { get; set; }
+
+        /// <summary>
+        /// Gets or sets the video types.
+        /// </summary>
+        /// <value>The video types.</value>
+        public VideoType[] VideoTypes { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the video formats.
+        /// </summary>
+        /// <value>The video formats.</value>
+        public VideoFormat[] VideoFormats { get; set; }
+
+        /// <summary>
+        /// Gets or sets the command.
+        /// </summary>
+        /// <value>The command.</value>
+        public string Command { get; set; }
+
+        /// <summary>
+        /// Gets or sets the args.
+        /// </summary>
+        /// <value>The args.</value>
+        public string Args { get; set; }
+    }
+}

MediaBrowser.UI/Configuration/UIApplicationConfiguration.cs

@@ -1,27 +1,72 @@
-using MediaBrowser.Model.Configuration;
-
-namespace MediaBrowser.UI.Configuration
-{
-    /// <summary>
-    /// This is the UI's device configuration that applies regardless of which user is logged in.
-    /// </summary>
-    public class UIApplicationConfiguration : BaseApplicationConfiguration
-    {
-        /// <summary>
-        /// Gets or sets the server host name (myserver or 192.168.x.x)
-        /// </summary>
-        public string ServerHostName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the port number used by the API
-        /// </summary>
-        public int ServerApiPort { get; set; }
-
-        public UIApplicationConfiguration()
-            : base()
-        {
-            ServerHostName = "localhost";
-            ServerApiPort = 8096;
-        }
-    }
-}
+using MediaBrowser.Model.Configuration;
+using System.Windows;
+
+namespace MediaBrowser.UI.Configuration
+{
+    /// <summary>
+    /// This is the UI's device configuration that applies regardless of which user is logged in.
+    /// </summary>
+    public class UIApplicationConfiguration : BaseApplicationConfiguration
+    {
+        /// <summary>
+        /// Gets or sets the server host name (myserver or 192.168.x.x)
+        /// </summary>
+        /// <value>The name of the server host.</value>
+        public string ServerHostName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the port number used by the API
+        /// </summary>
+        /// <value>The server API port.</value>
+        public int ServerApiPort { get; set; }
+
+        /// <summary>
+        /// Gets or sets the player configurations.
+        /// </summary>
+        /// <value>The player configurations.</value>
+        public PlayerConfiguration[] MediaPlayers { get; set; }
+
+        /// <summary>
+        /// Gets or sets the state of the window.
+        /// </summary>
+        /// <value>The state of the window.</value>
+        public WindowState? WindowState { get; set; }
+
+        /// <summary>
+        /// Gets or sets the window top.
+        /// </summary>
+        /// <value>The window top.</value>
+        public double? WindowTop { get; set; }
+
+        /// <summary>
+        /// Gets or sets the window left.
+        /// </summary>
+        /// <value>The window left.</value>
+        public double? WindowLeft { get; set; }
+
+        /// <summary>
+        /// Gets or sets the width of the window.
+        /// </summary>
+        /// <value>The width of the window.</value>
+        public double? WindowWidth { get; set; }
+
+        /// <summary>
+        /// Gets or sets the height of the window.
+        /// </summary>
+        /// <value>The height of the window.</value>
+        public double? WindowHeight { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UIApplicationConfiguration" /> class.
+        /// </summary>
+        public UIApplicationConfiguration()
+            : base()
+        {
+            ServerHostName = "localhost";
+            ServerApiPort = 8096;
+
+            // Need a different default than the server
+            LegacyWebSocketPortNumber = 8946;
+        }
+    }
+}

MediaBrowser.UI/Configuration/UIApplicationPaths.cs

@@ -1,8 +1,37 @@
-using MediaBrowser.Common.Kernel;
-
-namespace MediaBrowser.UI.Configuration
-{
-    public class UIApplicationPaths : BaseApplicationPaths
-    {
-    }
-}
+using MediaBrowser.Common.Kernel;
+using System.IO;
+
+namespace MediaBrowser.UI.Configuration
+{
+    /// <summary>
+    /// Class UIApplicationPaths
+    /// </summary>
+    public class UIApplicationPaths : BaseApplicationPaths
+    {
+        /// <summary>
+        /// The _remote image cache path
+        /// </summary>
+        private string _remoteImageCachePath;
+        /// <summary>
+        /// Gets the remote image cache path.
+        /// </summary>
+        /// <value>The remote image cache path.</value>
+        public string RemoteImageCachePath
+        {
+            get
+            {
+                if (_remoteImageCachePath == null)
+                {
+                    _remoteImageCachePath = Path.Combine(CachePath, "remote-images");
+
+                    if (!Directory.Exists(_remoteImageCachePath))
+                    {
+                        Directory.CreateDirectory(_remoteImageCachePath);
+                    }
+                }
+
+                return _remoteImageCachePath;
+            }
+        }
+    }
+}