Merge pull request #2404 from MediaBrowser/dev

Dev
8 years ago · 55f14fea6a
parent eb2f8c4510 fe1630aec4
commit 55f14fea6a
5 changed files with 9 additions and 10 deletions
--- a/Emby.Dlna/Profiles/DefaultProfile.cs
+++ b/Emby.Dlna/Profiles/DefaultProfile.cs
@ -64,7 +64,7 @@ namespace Emby.Dlna.Profiles
            {
                new DirectPlayProfile
                {
-                    Container = "m4v,ts,mkv,avi,mpg,mpeg,mp4",
+                    Container = "m4v,ts,mpegts,mkv,avi,mpg,mpeg,mp4,mov",
                    VideoCodec = "h264",
                    AudioCodec = "aac,mp3,ac3",
                    Type = DlnaProfileType.Video
@ -72,7 +72,7 @@ namespace Emby.Dlna.Profiles

                new DirectPlayProfile
                {
-                    Container = "mp3,wma,aac,wav",
+                    Container = "mp3,wma,aac,wav,flac",
                    Type = DlnaProfileType.Audio
                }
            };
--- a/Emby.Dlna/Profiles/Xml/Default.xml
+++ b/Emby.Dlna/Profiles/Xml/Default.xml
@ -29,8 +29,8 @@
  <IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
  <XmlRootAttributes />
  <DirectPlayProfiles>
-    <DirectPlayProfile container="m4v,ts,mkv,avi,mpg,mpeg,mp4" audioCodec="aac,mp3,ac3" videoCodec="h264" type="Video" />
-    <DirectPlayProfile container="mp3,wma,aac,wav" type="Audio" />
+    <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,flac" type="Audio" />
  </DirectPlayProfiles>
  <TranscodingProfiles>
    <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" />
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@ -343,7 +343,7 @@ namespace Emby.Server.Implementations.Channels

        private MediaSourceInfo GetMediaSource(BaseItem item, ChannelMediaInfo info)
        {
-            var source = info.ToMediaSource();
+            var source = info.ToMediaSource(item.Id);

            source.RunTimeTicks = source.RunTimeTicks ?? item.RunTimeTicks;

--- a/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
+++ b/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
@ -49,9 +49,11 @@ namespace MediaBrowser.Controller.Channels
            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
            {
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@ -156,9 +156,6 @@
    <Content Include="dashboard-ui\components\navdrawer\navdrawer.js">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
-    <Content Include="dashboard-ui\components\playerselection.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
    <Content Include="dashboard-ui\components\remotecontrol.js">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>