cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-17 19:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2404 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-01-19 02:33:05 -05:00 committed by GitHub
commit 55f14fea6a
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Dlna/Profiles/DefaultProfile.cs
View File

@ -64,7 +64,7 @@ namespace Emby.Dlna.Profiles
{ {
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "m4v,ts,mkv,avi,mpg,mpeg,mp4", Container = "m4v,ts,mpegts,mkv,avi,mpg,mpeg,mp4,mov",
VideoCodec = "h264", VideoCodec = "h264",
AudioCodec = "aac,mp3,ac3", AudioCodec = "aac,mp3,ac3",
Type = DlnaProfileType.Video Type = DlnaProfileType.Video
@ -72,7 +72,7 @@ namespace Emby.Dlna.Profiles
new DirectPlayProfile new DirectPlayProfile
{ {
Container = "mp3,wma,aac,wav", Container = "mp3,wma,aac,wav,flac",
Type = DlnaProfileType.Audio Type = DlnaProfileType.Audio
} }
}; };

4
Emby.Dlna/Profiles/Xml/Default.xml
View File

@ -29,8 +29,8 @@
<IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests> <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
<XmlRootAttributes /> <XmlRootAttributes />
<DirectPlayProfiles> <DirectPlayProfiles>
<DirectPlayProfile container="m4v,ts,mkv,avi,mpg,mpeg,mp4" audioCodec="aac,mp3,ac3" videoCodec="h264" type="Video" /> <DirectPlayProfile container="m4v,ts,mpegts,mkv,avi,mpg,mpeg,mp4,mov" audioCodec="aac,mp3,ac3" videoCodec="h264" type="Video" />
<DirectPlayProfile container="mp3,wma,aac,wav" type="Audio" /> <DirectPlayProfile container="mp3,wma,aac,wav,flac" type="Audio" />
</DirectPlayProfiles> </DirectPlayProfiles>
<TranscodingProfiles> <TranscodingProfiles>
<TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" /> <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />

2
Emby.Server.Implementations/Channels/ChannelManager.cs
View File

@ -343,7 +343,7 @@ namespace Emby.Server.Implementations.Channels
private MediaSourceInfo GetMediaSource(BaseItem item, ChannelMediaInfo info) private MediaSourceInfo GetMediaSource(BaseItem item, ChannelMediaInfo info)
{ {
var source = info.ToMediaSource(); var source = info.ToMediaSource(item.Id);
source.RunTimeTicks = source.RunTimeTicks ?? item.RunTimeTicks; source.RunTimeTicks = source.RunTimeTicks ?? item.RunTimeTicks;

6
MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
View File

@ -49,9 +49,11 @@ namespace MediaBrowser.Controller.Channels
SupportsDirectPlay = true; SupportsDirectPlay = true;
} }
public MediaSourceInfo ToMediaSource() public MediaSourceInfo ToMediaSource(Guid itemId)
{ {
var id = Path.GetMD5().ToString("N"); var id = string.IsNullOrWhiteSpace(Path) ?
itemId.ToString("N") :
Path.GetMD5().ToString("N");
var source = new MediaSourceInfo var source = new MediaSourceInfo
{ {

3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -156,9 +156,6 @@
<Content Include="dashboard-ui\components\navdrawer\navdrawer.js"> <Content Include="dashboard-ui\components\navdrawer\navdrawer.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\components\playerselection.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\components\remotecontrol.js"> <Content Include="dashboard-ui\components\remotecontrol.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>