fix case sensitive file names

9 files changed, 30 insertions, 14 deletions

diff --git a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
index 94d9ebabc..bd20713de 100644
--- a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
@@ -14,9 +14,12 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableIntrosFromUpcomingDvdMovies { get; set; }
         public bool EnableIntrosFromUpcomingStreamingMovies { get; set; }
 
+        public int TrailerLimit { get; set; }
+        
         public CinemaModeConfiguration()
         {
             EnableIntrosParentalControl = true;
+            TrailerLimit = 2;
         }
     }
 }
diff --git a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
new file mode 100644
index 000000000..082c61c97
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Model.Configuration
+{
+    public class MetadataConfiguration
+    {
+        public bool UseFileCreationTimeForDateAdded { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 27818e5ed..1325a1833 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,6 +1,4 @@
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.FileOrganization;
-using MediaBrowser.Model.LiveTv;
 
 namespace MediaBrowser.Model.Configuration
 {
@@ -16,6 +14,12 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableUPnP { get; set; }
 
         /// <summary>
+        /// Gets or sets the public mapped port.
+        /// </summary>
+        /// <value>The public mapped port.</value>
+        public int PublicPort { get; set; }
+
+        /// <summary>
         /// Gets or sets the HTTP server port number.
         /// </summary>
         /// <value>The HTTP server port number.</value>
@@ -167,20 +171,15 @@ namespace MediaBrowser.Model.Configuration
 
         public string UICulture { get; set; }
 
-        public DlnaOptions DlnaOptions { get; set; }
-
         public double DownMixAudioBoost { get; set; }
 
-        public bool DefaultMetadataSettingsApplied { get; set; }
-
         public PeopleMetadataOptions PeopleMetadataOptions { get; set; }
+        public bool FindInternetTrailers { get; set; }
 
         public string[] InsecureApps { get; set; }
 
         public bool SaveMetadataHidden { get; set; }
 
-        public bool FindInternetTrailers { get; set; }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -189,6 +188,7 @@ namespace MediaBrowser.Model.Configuration
         {
             MediaEncodingQuality = EncodingQuality.Auto;
             ImageSavingConvention = ImageSavingConvention.Compatible;
+            PublicPort = 8096;
             HttpServerPortNumber = 8096;
             EnableDashboardResponseCaching = true;
 
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index dd9a49ec4..4fedb36d6 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -145,8 +145,10 @@ namespace MediaBrowser.Model.Dlna
 
             switch (condition.Condition)
             {
-                case ProfileConditionType.SubstringOf:
-                    return StringHelper.IndexOfIgnoreCase(currentValue, expected) != -1;
+                case ProfileConditionType.EqualsAny:
+                {
+                    return ListHelper.ContainsIgnoreCase(expected.Split('|'), currentValue);
+                }
                 case ProfileConditionType.Equals:
                     return StringHelper.EqualsIgnoreCase(currentValue, expected);
                 case ProfileConditionType.NotEquals:
diff --git a/MediaBrowser.Model/Dlna/ProfileConditionType.cs b/MediaBrowser.Model/Dlna/ProfileConditionType.cs
index bfbd31f02..b0a94c5b3 100644
--- a/MediaBrowser.Model/Dlna/ProfileConditionType.cs
+++ b/MediaBrowser.Model/Dlna/ProfileConditionType.cs
@@ -6,6 +6,6 @@
         NotEquals = 1,
         LessThanEqual = 2,
         GreaterThanEqual = 3,
-        SubstringOf = 4
+        EqualsAny = 4
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/Profiles/AndroidProfile.cs b/MediaBrowser.Model/Dlna/Profiles/AndroidProfile.cs
index 1f0b9a262..dfe14f1c7 100644
--- a/MediaBrowser.Model/Dlna/Profiles/AndroidProfile.cs
+++ b/MediaBrowser.Model/Dlna/Profiles/AndroidProfile.cs
@@ -32,7 +32,7 @@ namespace MediaBrowser.Model.Dlna.Profiles
                     VideoCodec = "h264",
                     AudioCodec = "aac",
                     Type = DlnaProfileType.Video,
-                    VideoProfile = "Baseline",
+                    VideoProfile = "baseline",
                     Context = EncodingContext.Streaming
                 });
             }
@@ -42,7 +42,7 @@ namespace MediaBrowser.Model.Dlna.Profiles
                 VideoCodec = "h264",
                 AudioCodec = "aac",
                 Type = DlnaProfileType.Video,
-                VideoProfile = "Baseline",
+                VideoProfile = "baseline",
                 Context = EncodingContext.Static
             });
 
@@ -102,7 +102,7 @@ namespace MediaBrowser.Model.Dlna.Profiles
 
                     Conditions = new []
                     {
-                        new ProfileCondition(ProfileConditionType.SubstringOf, ProfileConditionValue.VideoProfile, "baseline"),
+                        new ProfileCondition(ProfileConditionType.EqualsAny, ProfileConditionValue.VideoProfile, "baseline|constrained baseline"),
                         new ProfileCondition(ProfileConditionType.LessThanEqual, ProfileConditionValue.Width, "1920"),
                         new ProfileCondition(ProfileConditionType.LessThanEqual, ProfileConditionValue.Height, "1080"),
                         new ProfileCondition(ProfileConditionType.LessThanEqual, ProfileConditionValue.VideoBitDepth, "8"),
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 8debb4edb..2c49198b7 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -291,6 +291,7 @@ namespace MediaBrowser.Model.Dlna
                 playlistItem.VideoCodec = transcodingProfile.VideoCodec;
                 playlistItem.Protocol = transcodingProfile.Protocol;
                 playlistItem.AudioStreamIndex = audioStreamIndex;
+                playlistItem.VideoProfile = transcodingProfile.VideoProfile;
 
                 List<ProfileCondition> videoTranscodingConditions = new List<ProfileCondition>();
                 foreach (CodecProfile i in options.Profile.CodecProfiles)
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 6231d99a4..9abf44616 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -142,6 +142,7 @@ namespace MediaBrowser.Model.Dlna
             list.Add(item.IsDirectStream ? string.Empty : DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture));
             list.Add(item.MaxRefFrames.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxRefFrames.Value) : string.Empty);
             list.Add(item.MaxVideoBitDepth.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxVideoBitDepth.Value) : string.Empty);
+            list.Add(item.VideoProfile ?? string.Empty);
 
             return string.Format("Params={0}", string.Join(";", list.ToArray()));
         }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index dc8b3d519..ae71f2987 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -90,6 +90,7 @@
     <Compile Include="Configuration\ChannelOptions.cs" />
     <Compile Include="Configuration\ChapterOptions.cs" />
     <Compile Include="Configuration\CinemaModeConfiguration.cs" />
+    <Compile Include="Configuration\MetadataConfiguration.cs" />
     <Compile Include="Configuration\PeopleMetadataOptions.cs" />
     <Compile Include="Configuration\XbmcMetadataOptions.cs" />
     <Compile Include="Configuration\SubtitlePlaybackMode.cs" />