Merge remote-tracking branch 'upstream/master' into ribbons

MediaBrowser.Model/Configuration/AutoOrganize.cs

@@ -19,6 +19,8 @@ namespace MediaBrowser.Model.Configuration
 
         public bool DeleteEmptyFolders { get; set; }
 
+        public bool CopyOriginalFile { get; set; }
+
         public TvFileOrganizationOptions()
         {
             MinFileSizeMb = 50;
@@ -31,6 +33,8 @@ namespace MediaBrowser.Model.Configuration
             MultiEpisodeNamePattern = "%sn - %sx%0e-x%0ed - %en.%ext";
             SeasonFolderPattern = "Season %s";
             SeasonZeroFolderName = "Season 0";
+
+            CopyOriginalFile = false;
         }
     }
 }

MediaBrowser.Model/Configuration/DlnaOptions.cs

@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Model.Configuration
+{
+    public class DlnaOptions
+    {
+        public bool EnablePlayTo { get; set; }
+    }
+}

MediaBrowser.Model/Configuration/ServerConfiguration.cs

@@ -212,6 +212,8 @@ namespace MediaBrowser.Model.Configuration
         public string ServerName { get; set; }
         public string WanDdns { get; set; }
 
+        public DlnaOptions DlnaOptions { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -271,6 +273,8 @@ namespace MediaBrowser.Model.Configuration
             };
 
             MetadataOptions = options.ToArray();
+
+            DlnaOptions = new DlnaOptions();
         }
     }