back port model changes

5 files changed, 11 insertions, 16 deletions

diff --git a/MediaBrowser.Model/Configuration/ChapterOptions.cs b/MediaBrowser.Model/Configuration/ChapterOptions.cs
index fd3930704..f9ff6b4f9 100644
--- a/MediaBrowser.Model/Configuration/ChapterOptions.cs
+++ b/MediaBrowser.Model/Configuration/ChapterOptions.cs
@@ -13,11 +13,10 @@
         public string[] DisabledFetchers { get; set; }
 
         public bool ExtractDuringLibraryScan { get; set; }
-        
+      
         public ChapterOptions()
         {
             DownloadMovieChapters = true;
-            ExtractDuringLibraryScan = true;
 
             DisabledFetchers = new string[] { };
             FetcherOrder = new string[] { };
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 1834e24fe..d451fe8a0 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -525,6 +525,15 @@ namespace MediaBrowser.Model.Dlna
             bool isEligibleForDirectPlay,
             bool isEligibleForDirectStream)
         {
+            if (videoStream == null)
+            {
+                _logger.Info("Profile: {0}, Cannot direct stream with no known video stream. Path: {1}",
+                    profile.Name ?? "Unknown Profile",
+                    mediaSource.Path ?? "Unknown path");
+
+                return null;
+            }
+
             // See if it can be direct played
             DirectPlayProfile directPlay = null;
             foreach (DirectPlayProfile i in profile.DirectPlayProfiles)
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 50d1cdfc8..979472948 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -216,17 +216,6 @@ namespace MediaBrowser.Model.Dlna
 
             list.Add(new NameValuePair("Level", item.VideoLevel.HasValue ? StringHelper.ToStringCultureInvariant(item.VideoLevel.Value) : string.Empty));
 
-            if (isDlna)
-            {
-                // The player may see it as separate resources due to url differences
-                // And then try to request more than one at playback
-                list.Add(new NameValuePair("ClientTime", string.Empty));
-            }
-            else
-            {
-                list.Add(new NameValuePair("ClientTime", item.IsDirectStream ? string.Empty : DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture)));
-            }
-
             list.Add(new NameValuePair("MaxRefFrames", item.MaxRefFrames.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxRefFrames.Value) : string.Empty));
             list.Add(new NameValuePair("MaxVideoBitDepth", item.MaxVideoBitDepth.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxVideoBitDepth.Value) : string.Empty));
             list.Add(new NameValuePair("Profile", item.VideoProfile ?? string.Empty));
diff --git a/MediaBrowser.Model/Entities/CollectionType.cs b/MediaBrowser.Model/Entities/CollectionType.cs
index a259f4c07..187334c71 100644
--- a/MediaBrowser.Model/Entities/CollectionType.cs
+++ b/MediaBrowser.Model/Entities/CollectionType.cs
@@ -68,4 +68,4 @@
         public const string MusicFavoriteAlbums = "MusicFavoriteAlbums";
         public const string MusicFavoriteSongs = "MusicFavoriteSongs";
     }
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/MetadataProviders.cs b/MediaBrowser.Model/Entities/MetadataProviders.cs
index 7644b150a..f5ab0c1d4 100644
--- a/MediaBrowser.Model/Entities/MetadataProviders.cs
+++ b/MediaBrowser.Model/Entities/MetadataProviders.cs
@@ -36,8 +36,6 @@ namespace MediaBrowser.Model.Entities
         MusicBrainzArtist = 10,
         MusicBrainzReleaseGroup = 11,
         Zap2It = 12,
-        NesBox = 13,
-        NesBoxRom = 14,
         TvRage = 15,
         AudioDbArtist = 16,
         AudioDbAlbum = 17,