Merge pull request #8 from jellyfin/master

rebase to latest master

17 files changed, 17 insertions, 33 deletions

diff --git a/MediaBrowser.Model/Configuration/AccessSchedule.cs b/MediaBrowser.Model/Configuration/AccessSchedule.cs
index 3a66cf5bb..d34e27383 100644
--- a/MediaBrowser.Model/Configuration/AccessSchedule.cs
+++ b/MediaBrowser.Model/Configuration/AccessSchedule.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public class AccessSchedule
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index f84735bed..ce4ef1cfe 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -1,5 +1,3 @@
-using MediaBrowser.Model.Updates;
-
 namespace MediaBrowser.Model.Configuration
 {
     /// <summary>
@@ -30,12 +28,6 @@ namespace MediaBrowser.Model.Configuration
         public int LogFileRetentionDays { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether [run at startup].
-        /// </summary>
-        /// <value><c>true</c> if [run at startup]; otherwise, <c>false</c>.</value>
-        public bool RunAtStartup { get; set; }
-
-        /// <summary>
         /// Gets or sets a value indicating whether this instance is first run.
         /// </summary>
         /// <value><c>true</c> if this instance is first run; otherwise, <c>false</c>.</value>
@@ -46,7 +38,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value>The cache path.</value>
         public string CachePath { get; set; }
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.
         /// </summary>
diff --git a/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs b/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
index 1c7de11fd..73dda5a77 100644
--- a/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
+++ b/MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public enum DynamicDayOfWeek
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index fbc5e1b37..8584bd3dd 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public class EncodingOptions
diff --git a/MediaBrowser.Model/Configuration/FanartOptions.cs b/MediaBrowser.Model/Configuration/FanartOptions.cs
index 6924b25d7..9c8be39be 100644
--- a/MediaBrowser.Model/Configuration/FanartOptions.cs
+++ b/MediaBrowser.Model/Configuration/FanartOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public class FanartOptions
diff --git a/MediaBrowser.Model/Configuration/ImageOption.cs b/MediaBrowser.Model/Configuration/ImageOption.cs
index ade0af83e..3b985bb1b 100644
--- a/MediaBrowser.Model/Configuration/ImageOption.cs
+++ b/MediaBrowser.Model/Configuration/ImageOption.cs
@@ -26,4 +26,4 @@ namespace MediaBrowser.Model.Configuration
             Limit = 1;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Configuration/ImageSavingConvention.cs b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
index 611678e67..7206fa5fc 100644
--- a/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
+++ b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs
@@ -1,8 +1,8 @@
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Configuration
 {
     public enum ImageSavingConvention
     {
         Legacy,
         Compatible
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index cc70cc888..ba33bee87 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -1,6 +1,6 @@
-using System;
-using MediaBrowser.Model.Entities;
+using System;
 using System.Collections.Generic;
+using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Configuration
 {
@@ -100,7 +100,7 @@ namespace MediaBrowser.Model.Configuration
 
         public ImageOption GetImageOptions(ImageType type)
         {
-            foreach (ImageOption i in ImageOptions)
+            foreach (var i in ImageOptions)
             {
                 if (i.Type == type)
                 {
@@ -108,10 +108,9 @@ namespace MediaBrowser.Model.Configuration
                 }
             }
 
-            ImageOption[] options;
-            if (DefaultImageOptions.TryGetValue(Type, out options))
+            if (DefaultImageOptions.TryGetValue(Type, out ImageOption[] options))
             {
-                foreach (ImageOption i in options)
+                foreach (var i in options)
                 {
                     if (i.Type == type)
                     {
diff --git a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
index d1658e5d6..87e02d054 100644
--- a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public class MetadataConfiguration
diff --git a/MediaBrowser.Model/Configuration/MetadataOptions.cs b/MediaBrowser.Model/Configuration/MetadataOptions.cs
index dde2bd090..c095b8cdd 100644
--- a/MediaBrowser.Model/Configuration/MetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/MetadataOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/MetadataPlugin.cs b/MediaBrowser.Model/Configuration/MetadataPlugin.cs
index f3e0ce106..d6f863e55 100644
--- a/MediaBrowser.Model/Configuration/MetadataPlugin.cs
+++ b/MediaBrowser.Model/Configuration/MetadataPlugin.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Configuration
 {
     public class MetadataPlugin
     {
diff --git a/MediaBrowser.Model/Configuration/MetadataPluginType.cs b/MediaBrowser.Model/Configuration/MetadataPluginType.cs
index 5ba0b395e..985107ac9 100644
--- a/MediaBrowser.Model/Configuration/MetadataPluginType.cs
+++ b/MediaBrowser.Model/Configuration/MetadataPluginType.cs
@@ -13,4 +13,4 @@ namespace MediaBrowser.Model.Configuration
         MetadataSaver,
         SubtitleFetcher
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 565d5f74b..ed5800329 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,6 +1,5 @@
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
 using System;
+using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs b/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs
index fbee912d9..fc429934f 100644
--- a/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs
+++ b/MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Configuration
 {
     public enum SubtitlePlaybackMode
     {
@@ -8,4 +8,4 @@
         None = 3,
         Smart = 4
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Configuration/UnratedItem.cs b/MediaBrowser.Model/Configuration/UnratedItem.cs
index 1082d684b..2d0bce47f 100644
--- a/MediaBrowser.Model/Configuration/UnratedItem.cs
+++ b/MediaBrowser.Model/Configuration/UnratedItem.cs
@@ -13,4 +13,4 @@ namespace MediaBrowser.Model.Configuration
         ChannelContent,
         Other
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 39b956138..689459eba 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace MediaBrowser.Model.Configuration
 {
diff --git a/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs b/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
index de8a59a3d..19e6be166 100644
--- a/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
@@ -1,4 +1,3 @@
-
 namespace MediaBrowser.Model.Configuration
 {
     public class XbmcMetadataOptions