pt/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-09-05 21:37:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

import shared media info component

Browse Source
This commit is contained in:
Luke Pulverenti 2016-05-11 18:08:19 -04:00
parent 761a476ea0
commit c4e3bbaf4a
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
View File

@ -61,11 +61,31 @@ namespace MediaBrowser.Controller.Entities.Audio
if (query.User != null)
{
return query.User.RootFolder
.GetRecursiveChildren(query.User, i => !i.IsFolder && itemByNameFilter(i));
.GetRecursiveChildren(query.User, i =>
{
if (query.IsFolder.HasValue)
{
if (query.IsFolder.Value != i.IsFolder)
{
return false;
}
}
return itemByNameFilter(i);
});
}
return LibraryManager.RootFolder
.GetRecursiveChildren(i => !i.IsFolder && itemByNameFilter(i));
.GetRecursiveChildren(i =>
{
if (query.IsFolder.HasValue)
{
if (query.IsFolder.Value != i.IsFolder)
{
return false;
}
}
return itemByNameFilter(i);
});
}
protected override IEnumerable<BaseItem> ActualChildren

7
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
View File

@ -46,7 +46,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
{
if (_liveTvOptions.EnableOriginalAudioWithEncodedRecordings)
{
return Path.ChangeExtension(targetFile, ".mkv");
// if the audio is aac_latm, stream copying to mp4 will fail
var streams = mediaSource.MediaStreams ?? new List<MediaStream>();
if (streams.Any(i => i.Type == MediaStreamType.Audio && (i.Codec ?? string.Empty).IndexOf("aac", StringComparison.OrdinalIgnoreCase) != -1))
{
return Path.ChangeExtension(targetFile, ".mkv");
}
}
return Path.ChangeExtension(targetFile, ".mp4");

3
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -135,7 +135,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var channels = _libraryManager.GetItemList(new InternalItemsQuery
{
IncludeItemTypes = new[] { typeof(LiveTvChannel).Name }
IncludeItemTypes = new[] { typeof(LiveTvChannel).Name },
SortBy = new[] { ItemSortBy.SortName }
}).Cast<LiveTvChannel>();