Merge pull request #3032 from MediaBrowser/beta

Beta
MediaBrowser · Nov 20, 2017 · 57623a2 · 57623a2
2 parents e63840d + 21db7ac
commit 57623a2
Show file tree

Hide file tree

Showing 324 changed files with 4,085 additions and 4,067 deletions.
diff --git a/Emby.Dlna/ContentDirectory/ControlHandler.cs b/Emby.Dlna/ContentDirectory/ControlHandler.cs
@@ -491,18 +491,27 @@ private QueryResult<ServerItem> GetUserItems(BaseItem item, StubType? stubType,
                 return GetGenreItems(item, null, user, sort, startIndex, limit);
             }
 
-            var collectionFolder = item as ICollectionFolder;
-            if (collectionFolder != null && string.Equals(CollectionType.Music, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
+            if (!stubType.HasValue || stubType.Value != StubType.Folder)
             {
-                return GetMusicFolders(item, user, stubType, sort, startIndex, limit);
-            }
-            if (collectionFolder != null && string.Equals(CollectionType.Movies, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
-            {
-                return GetMovieFolders(item, user, stubType, sort, startIndex, limit);
-            }
-            if (collectionFolder != null && string.Equals(CollectionType.TvShows, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
-            {
-                return GetTvFolders(item, user, stubType, sort, startIndex, limit);
+                var collectionFolder = item as ICollectionFolder;
+                if (collectionFolder != null && string.Equals(CollectionType.Music, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
+                {
+                    return GetMusicFolders(item, user, stubType, sort, startIndex, limit);
+                }
+                if (collectionFolder != null && string.Equals(CollectionType.Movies, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
+                {
+                    return GetMovieFolders(item, user, stubType, sort, startIndex, limit);
+                }
+                if (collectionFolder != null && string.Equals(CollectionType.TvShows, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
+                {
+                    return GetTvFolders(item, user, stubType, sort, startIndex, limit);
+                }
+
+                var userView = item as UserView;
+                if (userView != null && string.Equals(CollectionType.Folders, userView.ViewType, StringComparison.OrdinalIgnoreCase))
+                {
+                    return GetFolders(item, user, stubType, sort, startIndex, limit);
+                }
             }
 
             if (stubType.HasValue)
@@ -513,7 +522,10 @@ private QueryResult<ServerItem> GetUserItems(BaseItem item, StubType? stubType,
                     return GetItemsFromPerson(person, user, startIndex, limit);
                 }
 
-                return ApplyPaging(new QueryResult<ServerItem>(), startIndex, limit);
+                if (stubType.Value != StubType.Folder)
+                {
+                    return ApplyPaging(new QueryResult<ServerItem>(), startIndex, limit);
+                }
             }
 
             var folder = (Folder)item;
@@ -733,6 +745,23 @@ private QueryResult<ServerItem> GetMovieFolders(BaseItem item, User user, StubTy
             };
         }
 
+        private QueryResult<ServerItem> GetFolders(BaseItem item, User user, StubType? stubType, SortCriteria sort, int? startIndex, int? limit)
+        {
+            var folders = user.RootFolder.GetChildren(user, true)
+                .OrderBy(i => i.SortName)
+                .Select(i => new ServerItem(i)
+                {
+                    StubType = StubType.Folder
+                })
+                .ToArray();
+
+            return new QueryResult<ServerItem>
+            {
+                Items = folders,
+                TotalRecordCount = folders.Length
+            };
+        }
+
         private QueryResult<ServerItem> GetTvFolders(BaseItem item, User user, StubType? stubType, SortCriteria sort, int? startIndex, int? limit)
         {
             var query = new InternalItemsQuery(user)

diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
@@ -554,7 +554,6 @@ private void DumpProfiles()
             var list = new List<DeviceProfile>
             {
                 new SamsungSmartTvProfile(),
-                new Xbox360Profile(),
                 new XboxOneProfile(),
                 new SonyPs3Profile(),
                 new SonyPs4Profile(),

diff --git a/Emby.Dlna/Emby.Dlna.csproj b/Emby.Dlna/Emby.Dlna.csproj
@@ -105,7 +105,6 @@
     <Compile Include="Profiles\SonyPs3Profile.cs" />
     <Compile Include="Profiles\SonyPs4Profile.cs" />
     <Compile Include="Profiles\WdtvLiveProfile.cs" />
-    <Compile Include="Profiles\Xbox360Profile.cs" />
     <Compile Include="Profiles\XboxOneProfile.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Server\DescriptionXmlBuilder.cs" />
@@ -175,7 +174,6 @@
     <EmbeddedResource Include="Profiles\Xml\Sony PlayStation 3.xml" />
     <EmbeddedResource Include="Profiles\Xml\Sony PlayStation 4.xml" />
     <EmbeddedResource Include="Profiles\Xml\WDTV Live.xml" />
-    <EmbeddedResource Include="Profiles\Xml\Xbox 360.xml" />
     <EmbeddedResource Include="Profiles\Xml\Xbox One.xml" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -328,7 +328,7 @@ public async Task SendPlayCommand(PlayRequest command, CancellationToken cancell
             {
                 if (isFirst && command.StartPositionTicks.HasValue)
                 {
-                    playlist.Add(CreatePlaylistItem(item, user, command.StartPositionTicks.Value, null, null, null));
+                    playlist.Add(CreatePlaylistItem(item, user, command.StartPositionTicks.Value, command.MediaSourceId, command.AudioStreamIndex, command.SubtitleStreamIndex));
                     isFirst = false;
                 }
                 else

diff --git a/Emby.Dlna/Profiles/DefaultProfile.cs b/Emby.Dlna/Profiles/DefaultProfile.cs
@@ -65,13 +65,15 @@ public DefaultProfile()
             {
                 new DirectPlayProfile
                 {
-                    Container = "m4v,mpegts,ts,3gp,mov,xvid,vob,mkv,wmv,asf,ogm,ogv,m2v,avi,mpg,mpeg,mp4,webm,wtv,m2ts,dvr-ms",
+                    // play all
+                    Container = "",
                     Type = DlnaProfileType.Video
                 },
 
                 new DirectPlayProfile
                 {
-                    Container = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus,flac,m4a",
+                    // play all
+                    Container = "",
                     Type = DlnaProfileType.Audio
                 }
             };

diff --git a/Emby.Dlna/Profiles/WdtvLiveProfile.cs b/Emby.Dlna/Profiles/WdtvLiveProfile.cs
@@ -58,39 +58,39 @@ public WdtvLiveProfile()
                     Container = "avi",
                     Type = DlnaProfileType.Video,
                     VideoCodec = "mpeg1video,mpeg2video,mpeg4,h264,vc1",
-                    AudioCodec = "ac3,dca,mp2,mp3,pcm,dts"
+                    AudioCodec = "ac3,eac3,dca,mp2,mp3,pcm,dts"
                 },
 
                 new DirectPlayProfile
                 {
                     Container = "mpeg",
                     Type = DlnaProfileType.Video,
                     VideoCodec = "mpeg1video,mpeg2video",
-                    AudioCodec = "ac3,dca,mp2,mp3,pcm,dts"
+                    AudioCodec = "ac3,eac3,dca,mp2,mp3,pcm,dts"
                 },
 
                 new DirectPlayProfile
                 {
                     Container = "mkv",
                     Type = DlnaProfileType.Video,
                     VideoCodec = "mpeg1video,mpeg2video,mpeg4,h264,vc1",
-                    AudioCodec = "ac3,dca,aac,mp2,mp3,pcm,dts"
+                    AudioCodec = "ac3,eac3,dca,aac,mp2,mp3,pcm,dts"
                 },
 
                 new DirectPlayProfile
                 {
                     Container = "ts,m2ts",
                     Type = DlnaProfileType.Video,
                     VideoCodec = "mpeg1video,mpeg2video,h264,vc1",
-                    AudioCodec = "ac3,dca,mp2,mp3,aac,dts"
+                    AudioCodec = "ac3,eac3,dca,mp2,mp3,aac,dts"
                 },
 
                 new DirectPlayProfile
                 {
                     Container = "mp4,mov,m4v",
                     Type = DlnaProfileType.Video,
                     VideoCodec = "h264,mpeg4",
-                    AudioCodec = "ac3,aac,mp2,mp3,dca,dts"
+                    AudioCodec = "ac3,eac3,aac,mp2,mp3,dca,dts"
                 },
 
                 new DirectPlayProfile