diff options
35 files changed, 98 insertions, 100 deletions
diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index 04b8865c1..f6f800f4a 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -102,7 +102,6 @@ <Compile Include="Security\PluginSecurityManager.cs" /> <Compile Include="Serialization\JsonSerializer.cs" /> <Compile Include="Serialization\XmlSerializer.cs" /> - <Compile Include="Updates\ApplicationUpdater.cs" /> <Compile Include="Updates\InstallationManager.cs" /> <Compile Include="Security\UsageReporter.cs" /> </ItemGroup> diff --git a/MediaBrowser.Controller/Dlna/CodecProfile.cs b/MediaBrowser.Controller/Dlna/CodecProfile.cs index 75f80ed3b..e2eb60d9a 100644 --- a/MediaBrowser.Controller/Dlna/CodecProfile.cs +++ b/MediaBrowser.Controller/Dlna/CodecProfile.cs @@ -35,9 +35,9 @@ namespace MediaBrowser.Controller.Dlna public enum CodecType { - VideoCodec = 0, - VideoAudioCodec = 1, - AudioCodec = 2 + Video = 0, + VideoAudio = 1, + Audio = 2 } public class ProfileCondition diff --git a/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs b/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs index f79dc1e5f..c14a851ca 100644 --- a/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs +++ b/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs @@ -32,7 +32,7 @@ namespace MediaBrowser.Dlna.PlayTo var audioCodec = audioStream == null ? null : audioStream.Codec; // Make sure audio codec profiles are satisfied - if (!string.IsNullOrEmpty(audioCodec) && profile.CodecProfiles.Where(i => i.Type == CodecType.AudioCodec && i.ContainsCodec(audioCodec)) + if (!string.IsNullOrEmpty(audioCodec) && profile.CodecProfiles.Where(i => i.Type == CodecType.Audio && i.ContainsCodec(audioCodec)) .All(i => AreConditionsSatisfied(i.Conditions, item.Path, null, audioStream))) { playlistItem.Transcode = false; @@ -53,7 +53,7 @@ namespace MediaBrowser.Dlna.PlayTo playlistItem.AudioCodec = transcodingProfile.AudioCodec; var audioTranscodingConditions = profile.CodecProfiles - .Where(i => i.Type == CodecType.AudioCodec && i.ContainsCodec(transcodingProfile.AudioCodec)) + .Where(i => i.Type == CodecType.Audio && i.ContainsCodec(transcodingProfile.AudioCodec)) .Take(1) .SelectMany(i => i.Conditions); @@ -114,13 +114,13 @@ namespace MediaBrowser.Dlna.PlayTo var videoCodec = videoStream == null ? null : videoStream.Codec; // Make sure video codec profiles are satisfied - if (!string.IsNullOrEmpty(videoCodec) && profile.CodecProfiles.Where(i => i.Type == CodecType.VideoCodec && i.ContainsCodec(videoCodec)) + if (!string.IsNullOrEmpty(videoCodec) && profile.CodecProfiles.Where(i => i.Type == CodecType.Video && i.ContainsCodec(videoCodec)) .All(i => AreConditionsSatisfied(i.Conditions, item.Path, videoStream, audioStream))) { var audioCodec = audioStream == null ? null : audioStream.Codec; // Make sure audio codec profiles are satisfied - if (string.IsNullOrEmpty(audioCodec) || profile.CodecProfiles.Where(i => i.Type == CodecType.VideoAudioCodec && i.ContainsCodec(audioCodec)) + if (string.IsNullOrEmpty(audioCodec) || profile.CodecProfiles.Where(i => i.Type == CodecType.VideoAudio && i.ContainsCodec(audioCodec)) .All(i => AreConditionsSatisfied(i.Conditions, item.Path, videoStream, audioStream))) { playlistItem.Transcode = false; @@ -143,14 +143,14 @@ namespace MediaBrowser.Dlna.PlayTo playlistItem.VideoCodec = transcodingProfile.VideoCodec; var videoTranscodingConditions = profile.CodecProfiles - .Where(i => i.Type == CodecType.VideoCodec && i.ContainsCodec(transcodingProfile.VideoCodec)) + .Where(i => i.Type == CodecType.Video && i.ContainsCodec(transcodingProfile.VideoCodec)) .Take(1) .SelectMany(i => i.Conditions); ApplyTranscodingConditions(playlistItem, videoTranscodingConditions); var audioTranscodingConditions = profile.CodecProfiles - .Where(i => i.Type == CodecType.VideoAudioCodec && i.ContainsCodec(transcodingProfile.AudioCodec)) + .Where(i => i.Type == CodecType.VideoAudio && i.ContainsCodec(transcodingProfile.AudioCodec)) .Take(1) .SelectMany(i => i.Conditions); diff --git a/MediaBrowser.Dlna/Profiles/LgTvProfile.cs b/MediaBrowser.Dlna/Profiles/LgTvProfile.cs index 7ca8069da..ccf36e844 100644 --- a/MediaBrowser.Dlna/Profiles/LgTvProfile.cs +++ b/MediaBrowser.Dlna/Profiles/LgTvProfile.cs @@ -113,7 +113,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "mpeg4", Conditions = new[] @@ -141,7 +141,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "h264", Conditions = new[] @@ -175,7 +175,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "ac3,aac,mp3", Conditions = new[] diff --git a/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs b/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs index 64747776c..ced9a7c61 100644 --- a/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs +++ b/MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs @@ -157,7 +157,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Conditions = new[] { diff --git a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs index 259d8e9ff..122bde875 100644 --- a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs +++ b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs @@ -145,7 +145,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "mpeg2video", Conditions = new[] @@ -179,7 +179,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "mpeg4", Conditions = new[] @@ -213,7 +213,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "h264", Conditions = new[] @@ -253,7 +253,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "wmv2,wmv3,vc1", Conditions = new[] @@ -287,7 +287,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "ac3,wmav2,dca,aac,mp3", Conditions = new[] diff --git a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013Profile.cs index 04309d55f..b64d4f6ca 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013Profile.cs @@ -113,7 +113,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "h264", Conditions = new [] { @@ -141,7 +141,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "ac3", Conditions = new [] { diff --git a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs index d9dfc1caf..c5025edbb 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs @@ -109,7 +109,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "h264", Conditions = new [] { @@ -151,7 +151,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "ac3", Conditions = new [] { @@ -167,7 +167,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "aac", Conditions = new [] { diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs index cb91de4a0..8f29ad76e 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs @@ -168,7 +168,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Conditions = new [] { new ProfileCondition @@ -188,7 +188,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "h264", Conditions = new [] { @@ -215,7 +215,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "mpeg2video", Conditions = new [] { @@ -236,7 +236,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "ac3", Conditions = new [] @@ -252,7 +252,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "aac", Conditions = new [] diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs index 626a91a73..eaf6979a6 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs @@ -186,7 +186,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Conditions = new [] { new ProfileCondition @@ -206,7 +206,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "h264", Conditions = new [] { @@ -233,7 +233,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "mpeg2video", Conditions = new [] { @@ -254,7 +254,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "ac3", Conditions = new [] @@ -270,7 +270,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "aac", Conditions = new[] diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs index 82b6b6d5f..41d057ef8 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs @@ -198,7 +198,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Conditions = new[] { new ProfileCondition @@ -218,7 +218,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "ac3", Conditions = new[] diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs index aec65e98e..386a36ae0 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs @@ -231,7 +231,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Conditions = new [] { diff --git a/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs b/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs index 7502201ea..351a13f00 100644 --- a/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs @@ -85,7 +85,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "h264", Conditions = new [] @@ -128,7 +128,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "ac3", Conditions = new [] @@ -153,7 +153,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "wmapro", Conditions = new [] @@ -169,7 +169,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "aac", Conditions = new [] @@ -186,7 +186,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "aac", Conditions = new [] diff --git a/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs b/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs index af5d9b295..f0b95d4e8 100644 --- a/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs +++ b/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs @@ -195,7 +195,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "h264", Conditions = new [] @@ -223,7 +223,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "aac", Conditions = new [] diff --git a/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs b/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs index ed9edeb27..38d08adef 100644 --- a/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs +++ b/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs @@ -165,7 +165,7 @@ namespace MediaBrowser.Dlna.Profiles { new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "mpeg4", Conditions = new [] { @@ -200,7 +200,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "h264", Conditions = new [] { @@ -235,7 +235,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoCodec, + Type = CodecType.Video, Codec = "wmv2,wmv3,vc1", Conditions = new [] { @@ -270,7 +270,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "ac3,wmav2,wmapro", Conditions = new [] { @@ -286,7 +286,7 @@ namespace MediaBrowser.Dlna.Profiles new CodecProfile { - Type = CodecType.VideoAudioCodec, + Type = CodecType.VideoAudio, Codec = "aac", Conditions = new [] { diff --git a/MediaBrowser.Dlna/Profiles/Xml/Default.xml b/MediaBrowser.Dlna/Profiles/Xml/Default.xml index 60f22a64a..895cb99d3 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Default.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Default.xml @@ -30,5 +30,6 @@ </TranscodingProfile> </TranscodingProfiles> <ContainerProfiles /> + <CodecProfiles /> <MediaProfiles /> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml index 28bb3289e..58c5cefbc 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml @@ -34,5 +34,6 @@ </TranscodingProfile> </TranscodingProfiles> <ContainerProfiles /> + <CodecProfiles /> <MediaProfiles /> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml index cc8b40430..53781ad32 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml @@ -48,14 +48,14 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec" codec="mpeg4"> + <CodecProfile type="Video" codec="mpeg4"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoCodec" codec="h264"> + <CodecProfile type="Video" codec="h264"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> @@ -63,7 +63,7 @@ <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="ac3,aac,mp3"> + <CodecProfile type="VideoAudio" codec="ac3,aac,mp3"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" /> </Conditions> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml index 477fee2dd..fc833b918 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml @@ -34,5 +34,6 @@ </TranscodingProfile> </TranscodingProfiles> <ContainerProfiles /> + <CodecProfiles /> <MediaProfiles /> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml index 71e240313..49fd05b1e 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml @@ -54,7 +54,7 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec"> + <CodecProfile type="Video"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml index 77648147f..75c50aae3 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml @@ -52,7 +52,7 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec" codec="mpeg2video"> + <CodecProfile type="Video" codec="mpeg2video"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> @@ -60,7 +60,7 @@ <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="30720000" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoCodec" codec="mpeg4"> + <CodecProfile type="Video" codec="mpeg4"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> @@ -68,7 +68,7 @@ <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="8192000" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoCodec" codec="h264"> + <CodecProfile type="Video" codec="h264"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> @@ -77,7 +77,7 @@ <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoCodec" codec="wmv2,wmv3,vc1"> + <CodecProfile type="Video" codec="wmv2,wmv3,vc1"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> @@ -85,7 +85,7 @@ <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="25600000" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="ac3,wmav2,dca,aac,mp3"> + <CodecProfile type="VideoAudio" codec="ac3,wmav2,dca,aac,mp3"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" /> </Conditions> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml index 942812295..5bd27c771 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml @@ -52,14 +52,14 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec" codec="h264"> + <CodecProfile type="Video" codec="h264"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="false" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="ac3"> + <CodecProfile type="VideoAudio" codec="ac3"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" /> </Conditions> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml index 519304576..f5502ca14 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml @@ -51,7 +51,7 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec" codec="h264"> + <CodecProfile type="Video" codec="h264"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> @@ -60,12 +60,12 @@ <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="ac3"> + <CodecProfile type="VideoAudio" codec="ac3"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="aac"> + <CodecProfile type="VideoAudio" codec="aac"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" /> </Conditions> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml index d240e1d34..1337b5936 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml @@ -49,31 +49,31 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec"> + <CodecProfile type="Video"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoCodec" codec="h264"> + <CodecProfile type="Video" codec="h264"> <Conditions> <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoCodec" codec="mpeg2video"> + <CodecProfile type="Video" codec="mpeg2video"> <Conditions> <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="ac3"> + <CodecProfile type="VideoAudio" codec="ac3"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="aac"> + <CodecProfile type="VideoAudio" codec="aac"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" /> <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="true" /> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml index 2372aa5ad..b022c10a5 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml @@ -52,31 +52,31 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec"> + <CodecProfile type="Video"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoCodec" codec="h264"> + <CodecProfile type="Video" codec="h264"> <Conditions> <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoCodec" codec="mpeg2video"> + <CodecProfile type="Video" codec="mpeg2video"> <Conditions> <ProfileCondition condition="LessThanEqual" property="VideoFramerate" value="30" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="20000000" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="ac3"> + <CodecProfile type="VideoAudio" codec="ac3"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="aac"> + <CodecProfile type="VideoAudio" codec="aac"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" /> <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="true" /> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml index 7edf09134..cbef70b37 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml @@ -54,13 +54,13 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec"> + <CodecProfile type="Video"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="ac3"> + <CodecProfile type="VideoAudio" codec="ac3"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="true" /> </Conditions> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml index ec624cd8e..47db46ce1 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml @@ -59,7 +59,7 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec"> + <CodecProfile type="Video"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml index eeaf2d819..d9aa441bb 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml @@ -48,7 +48,7 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec" codec="h264"> + <CodecProfile type="Video" codec="h264"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> @@ -57,23 +57,23 @@ <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="false" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="ac3"> + <CodecProfile type="VideoAudio" codec="ac3"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" /> <ProfileCondition condition="LessThanEqual" property="AudioBitrate" value="640000" isRequired="false" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="wmapro"> + <CodecProfile type="VideoAudio" codec="wmapro"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="aac"> + <CodecProfile type="VideoAudio" codec="aac"> <Conditions> <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="false" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="aac"> + <CodecProfile type="VideoAudio" codec="aac"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" /> <ProfileCondition condition="NotEquals" property="AudioProfile" value="he-aac" isRequired="true" /> diff --git a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml index ffa39c26d..0f4ad54a7 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml @@ -59,14 +59,14 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec" codec="h264"> + <CodecProfile type="Video" codec="h264"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="VideoLevel" value="41" isRequired="true" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="aac"> + <CodecProfile type="VideoAudio" codec="aac"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="true" /> </Conditions> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml index ea2539197..1e8d8164c 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml @@ -59,7 +59,7 @@ </ContainerProfile> </ContainerProfiles> <CodecProfiles> - <CodecProfile type="VideoCodec" codec="mpeg4"> + <CodecProfile type="Video" codec="mpeg4"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1280" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="720" isRequired="true" /> @@ -67,7 +67,7 @@ <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="5120000" isRequired="false" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoCodec" codec="h264"> + <CodecProfile type="Video" codec="h264"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> @@ -75,7 +75,7 @@ <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="10240000" isRequired="false" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoCodec" codec="wmv2,wmv3,vc1"> + <CodecProfile type="Video" codec="wmv2,wmv3,vc1"> <Conditions> <ProfileCondition condition="LessThanEqual" property="Width" value="1920" isRequired="true" /> <ProfileCondition condition="LessThanEqual" property="Height" value="1080" isRequired="true" /> @@ -83,12 +83,12 @@ <ProfileCondition condition="LessThanEqual" property="VideoBitrate" value="15360000" isRequired="false" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="ac3,wmav2,wmapro"> + <CodecProfile type="VideoAudio" codec="ac3,wmav2,wmapro"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="6" isRequired="false" /> </Conditions> </CodecProfile> - <CodecProfile type="VideoAudioCodec" codec="aac"> + <CodecProfile type="VideoAudio" codec="aac"> <Conditions> <ProfileCondition condition="LessThanEqual" property="AudioChannels" value="2" isRequired="false" /> <ProfileCondition condition="Equals" property="AudioProfile" value="lc" isRequired="false" /> diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml index ef4fec99a..f6c338b2f 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml @@ -32,6 +32,7 @@ </TranscodingProfile> </TranscodingProfiles> <ContainerProfiles /> + <CodecProfiles /> <MediaProfiles> <MediaProfile container="avi" type="Video" mimeType="video/x-msvideo"> <Conditions /> diff --git a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml index 3e6623ac4..f682e4c42 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml @@ -36,5 +36,6 @@ </TranscodingProfile> </TranscodingProfiles> <ContainerProfiles /> + <CodecProfiles /> <MediaProfiles /> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index 6afe9367e..3d490a1f8 100644 --- a/MediaBrowser.ServerApplication/MainStartup.cs +++ b/MediaBrowser.ServerApplication/MainStartup.cs @@ -1,12 +1,11 @@ using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Constants; using MediaBrowser.Common.Implementations.Logging; -using MediaBrowser.Common.Implementations.Updates; -using MediaBrowser.Controller; using MediaBrowser.Model.Logging; using MediaBrowser.Server.Implementations; using MediaBrowser.ServerApplication.Native; using MediaBrowser.ServerApplication.Splash; +using MediaBrowser.ServerApplication.Updates; using Microsoft.Win32; using System; using System.Configuration.Install; @@ -490,7 +489,7 @@ namespace MediaBrowser.ServerApplication try { var serviceName = _isRunningAsService ? BackgroundService.Name : string.Empty; - new ApplicationUpdater().UpdateApplication(MBApplication.MBServer, appPaths, updateArchive, logger, serviceName); + new ApplicationUpdater().UpdateApplication(appPaths, updateArchive, logger, serviceName); // And just let the app exit so it can update return true; diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index d999841ca..b49e100ab 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -145,6 +145,7 @@ <Compile Include="Splash\SplashForm.Designer.cs"> <DependentUpon>SplashForm.cs</DependentUpon> </Compile> + <Compile Include="Updates\ApplicationUpdater.cs" /> </ItemGroup> <ItemGroup> <None Include="App.config" /> diff --git a/MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs b/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs index e24ff3064..9f3e44cb0 100644 --- a/MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs +++ b/MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs @@ -3,14 +3,8 @@ using MediaBrowser.Model.Logging; using System.Diagnostics; using System.IO; -namespace MediaBrowser.Common.Implementations.Updates +namespace MediaBrowser.ServerApplication.Updates { - public enum MBApplication - { - MBServer, - MBTheater - } - /// <summary> /// Update the specified application using the specified archive /// </summary> @@ -18,7 +12,7 @@ namespace MediaBrowser.Common.Implementations.Updates { private const string UpdaterExe = "Mediabrowser.Updater.exe"; private const string UpdaterDll = "Mediabrowser.InstallUtil.dll"; - public void UpdateApplication(MBApplication app, IApplicationPaths appPaths, string archive, ILogger logger, string restartServiceName) + public void UpdateApplication(IApplicationPaths appPaths, string archive, ILogger logger, string restartServiceName) { // First see if there is a version file and read that in var version = "Unknown"; @@ -39,7 +33,7 @@ namespace MediaBrowser.Common.Implementations.Updates logger.Info("Copying updater dependencies to temporary location"); File.Copy(source, tempUpdaterDll, true); - var product = app == MBApplication.MBTheater ? "mbt" : "server"; + const string product = "server"; // Our updater needs SS and ionic source = Path.Combine(appPaths.ProgramSystemPath, "ServiceStack.Text.dll"); File.Copy(source, Path.Combine(Path.GetTempPath(), "ServiceStack.Text.dll"), true); |