lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tim Hobbs 2014-03-28 16:15:17 -07:00
commit 40d07e89ad
56 changed files with 252 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Api/DisplayPreferencesService.cs
View File

@ -12,8 +12,7 @@ namespace MediaBrowser.Api
/// <summary>
/// Class UpdateDisplayPreferences
/// </summary>
[Route("/DisplayPreferences/{DisplayPreferencesId}", "POST")]
[Api(("Updates a user's display preferences for an item"))]
[Route("/DisplayPreferences/{DisplayPreferencesId}", "POST", Summary = "Updates a user's display preferences for an item")]
public class UpdateDisplayPreferences : DisplayPreferences, IReturnVoid
{
/// <summary>
@ -30,8 +29,7 @@ namespace MediaBrowser.Api
public string Client { get; set; }
}
[Route("/DisplayPreferences/{Id}", "GET")]
[Api(("Gets a user's display preferences for an item"))]
[Route("/DisplayPreferences/{Id}", "GET", Summary = "Gets a user's display preferences for an item")]
public class GetDisplayPreferences : IReturn<DisplayPreferences>
{
/// <summary>

15
MediaBrowser.Api/EnvironmentService.cs
View File

@ -13,8 +13,7 @@ namespace MediaBrowser.Api
/// <summary>
/// Class GetDirectoryContents
/// </summary>
[Route("/Environment/DirectoryContents", "GET")]
[Api(Description = "Gets the contents of a given directory in the file system")]
[Route("/Environment/DirectoryContents", "GET", Summary = "Gets the contents of a given directory in the file system")]
public class GetDirectoryContents : IReturn<List<FileSystemEntryInfo>>
{
/// <summary>
@ -46,8 +45,7 @@ namespace MediaBrowser.Api
public bool IncludeHidden { get; set; }
}
[Route("/Environment/NetworkShares", "GET")]
[Api(Description = "Gets shares from a network device")]
[Route("/Environment/NetworkShares", "GET", Summary = "Gets shares from a network device")]
public class GetNetworkShares : IReturn<List<FileSystemEntryInfo>>
{
/// <summary>
@ -61,8 +59,7 @@ namespace MediaBrowser.Api
/// <summary>
/// Class GetDrives
/// </summary>
[Route("/Environment/Drives", "GET")]
[Api(Description = "Gets available drives from the server's file system")]
[Route("/Environment/Drives", "GET", Summary = "Gets available drives from the server's file system")]
public class GetDrives : IReturn<List<FileSystemEntryInfo>>
{
}
@ -70,14 +67,12 @@ namespace MediaBrowser.Api
/// <summary>
/// Class GetNetworkComputers
/// </summary>
[Route("/Environment/NetworkDevices", "GET")]
[Api(Description = "Gets a list of devices on the network")]
[Route("/Environment/NetworkDevices", "GET", Summary = "Gets a list of devices on the network")]
public class GetNetworkDevices : IReturn<List<FileSystemEntryInfo>>
{
}
[Route("/Environment/ParentPath", "GET")]
[Api(Description = "Gets the parent path of a given path")]
[Route("/Environment/ParentPath", "GET", Summary = "Gets the parent path of a given path")]
public class GetParentPath : IReturn<string>
{
/// <summary>

13
MediaBrowser.Api/GamesService.cs
View File

@ -1,5 +1,4 @@
using System.Globalization;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Persistence;
@ -7,6 +6,7 @@ using MediaBrowser.Model.Dto;
using ServiceStack;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
@ -15,8 +15,7 @@ namespace MediaBrowser.Api
/// <summary>
/// Class GetSimilarGames
/// </summary>
[Route("/Games/{Id}/Similar", "GET")]
[Api(Description = "Finds games similar to a given game.")]
[Route("/Games/{Id}/Similar", "GET", Summary = "Finds games similar to a given game.")]
public class GetSimilarGames : BaseGetSimilarItemsFromItem
{
}
@ -24,8 +23,7 @@ namespace MediaBrowser.Api
/// <summary>
/// Class GetGameSystemSummaries
/// </summary>
[Route("/Games/SystemSummaries", "GET")]
[Api(Description = "Finds games similar to a given game.")]
[Route("/Games/SystemSummaries", "GET", Summary = "Finds games similar to a given game.")]
public class GetGameSystemSummaries : IReturn<List<GameSystemSummary>>
{
/// <summary>
@ -39,8 +37,7 @@ namespace MediaBrowser.Api
/// <summary>
/// Class GetGameSystemSummaries
/// </summary>
[Route("/Games/PlayerIndex", "GET")]
[Api(Description = "Gets an index of players (1-x) and the number of games listed under each")]
[Route("/Games/PlayerIndex", "GET", Summary = "Gets an index of players (1-x) and the number of games listed under each")]
public class GetPlayerIndex : IReturn<List<ItemIndex>>
{
/// <summary>

36
MediaBrowser.Api/Playback/Progressive/AudioService.cs
View File

@ -17,23 +17,22 @@ namespace MediaBrowser.Api.Playback.Progressive
/// <summary>
/// Class GetAudioStream
/// </summary>
[Route("/Audio/{Id}/stream.mp3", "GET")]
[Route("/Audio/{Id}/stream.wma", "GET")]
[Route("/Audio/{Id}/stream.aac", "GET")]
[Route("/Audio/{Id}/stream.flac", "GET")]
[Route("/Audio/{Id}/stream.ogg", "GET")]
[Route("/Audio/{Id}/stream.oga", "GET")]
[Route("/Audio/{Id}/stream.webm", "GET")]
[Route("/Audio/{Id}/stream", "GET")]
[Route("/Audio/{Id}/stream.mp3", "HEAD")]
[Route("/Audio/{Id}/stream.wma", "HEAD")]
[Route("/Audio/{Id}/stream.aac", "HEAD")]
[Route("/Audio/{Id}/stream.flac", "HEAD")]
[Route("/Audio/{Id}/stream.ogg", "HEAD")]
[Route("/Audio/{Id}/stream.oga", "HEAD")]
[Route("/Audio/{Id}/stream.webm", "HEAD")]
[Route("/Audio/{Id}/stream", "HEAD")]
[Api(Description = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.mp3", "GET", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.wma", "GET", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.aac", "GET", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.flac", "GET", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.ogg", "GET", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.oga", "GET", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.webm", "GET", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream", "GET", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.mp3", "HEAD", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.wma", "HEAD", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.aac", "HEAD", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.flac", "HEAD", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.ogg", "HEAD", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.oga", "HEAD", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream.webm", "HEAD", Summary = "Gets an audio stream")]
[Route("/Audio/{Id}/stream", "HEAD", Summary = "Gets an audio stream")]
public class GetAudioStream : StreamRequest
{
@ -44,7 +43,8 @@ namespace MediaBrowser.Api.Playback.Progressive
/// </summary>
public class AudioService : BaseProgressiveStreamingService
{
public AudioService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IDtoService dtoService, IFileSystem fileSystem, IItemRepository itemRepository, ILiveTvManager liveTvManager, IEncodingManager encodingManager, IDlnaManager dlnaManager, IHttpClient httpClient, IImageProcessor imageProcessor) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, dtoService, fileSystem, itemRepository, liveTvManager, encodingManager, dlnaManager, httpClient, imageProcessor)
public AudioService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IDtoService dtoService, IFileSystem fileSystem, IItemRepository itemRepository, ILiveTvManager liveTvManager, IEncodingManager encodingManager, IDlnaManager dlnaManager, IHttpClient httpClient, IImageProcessor imageProcessor)
: base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, dtoService, fileSystem, itemRepository, liveTvManager, encodingManager, dlnaManager, httpClient, imageProcessor)
{
}

5
MediaBrowser.Api/UserLibrary/ItemsService.cs
View File

@ -20,9 +20,8 @@ namespace MediaBrowser.Api.UserLibrary
/// <summary>
/// Class GetItems
/// </summary>
[Route("/Items", "GET")]
[Route("/Users/{UserId}/Items", "GET")]
[Api(Description = "Gets items based on a query.")]
[Route("/Items", "GET", Summary = "Gets items based on a query.")]
[Route("/Users/{UserId}/Items", "GET", Summary = "Gets items based on a query.")]
public class GetItems : BaseItemsRequest, IReturn<ItemsResult>
{
/// <summary>

1
MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
View File

@ -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>

6
MediaBrowser.Controller/Dlna/CodecProfile.cs
View File

@ -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

1
MediaBrowser.Controller/Dlna/DeviceProfile.cs
View File

@ -3,7 +3,6 @@ using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Xml.Serialization;
namespace MediaBrowser.Controller.Dlna

3
MediaBrowser.Controller/Dlna/TranscodingProfile.cs
View File

@ -18,6 +18,9 @@ namespace MediaBrowser.Controller.Dlna
[XmlAttribute("audioCodec")]
public string AudioCodec { get; set; }
[XmlAttribute("protocol")]
public string Protocol { get; set; }
[XmlAttribute("estimateContentLength")]
public bool EstimateContentLength { get; set; }

8
MediaBrowser.Controller/Session/ISessionController.cs
View File

@ -59,6 +59,14 @@ namespace MediaBrowser.Controller.Session
/// <returns>Task.</returns>
Task SendPlaystateCommand(PlaystateRequest command, CancellationToken cancellationToken);
/// <summary>
/// Sends the generic command.
/// </summary>
/// <param name="command">The command.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken);
/// <summary>
/// Sends the library update info.
/// </summary>

8
MediaBrowser.Dlna/PlayTo/DidlBuilder.cs
View File

@ -40,7 +40,7 @@ namespace MediaBrowser.Dlna.PlayTo
/// <param name="streamUrl">The stream URL.</param>
/// <param name="streams">The streams.</param>
/// <returns>System.String.</returns>
public static string Build(BaseItem dto, string userId, string serverAddress, string streamUrl, IEnumerable<MediaStream> streams)
public static string Build(BaseItem dto, string userId, string serverAddress, string streamUrl, IEnumerable<MediaStream> streams, bool includeImageRes)
{
string response = string.Format(DIDL_START, dto.Id, userId);
response += string.Format(DIDL_TITLE, dto.Name.Replace("&", "and"));
@ -51,7 +51,7 @@ namespace MediaBrowser.Dlna.PlayTo
var imageUrl = GetImageUrl(dto, serverAddress);
if (!string.IsNullOrEmpty(imageUrl))
if (!string.IsNullOrWhiteSpace(imageUrl))
{
response += string.Format(DIDL_IMAGE, imageUrl);
}
@ -65,7 +65,7 @@ namespace MediaBrowser.Dlna.PlayTo
response += string.Format(DESCRIPTION, UNKNOWN);
response += GetVideoDIDL(dto, streamUrl, streams);
if (!string.IsNullOrEmpty(imageUrl))
if (includeImageRes && !string.IsNullOrWhiteSpace(imageUrl))
{
response += string.Format(DIDL_IMAGE_RES, imageUrl);
}
@ -84,7 +84,7 @@ namespace MediaBrowser.Dlna.PlayTo
response += GetAudioDIDL(dto, streamUrl, streams);
if (!string.IsNullOrEmpty(imageUrl))
if (includeImageRes && !string.IsNullOrWhiteSpace(imageUrl))
{
response += string.Format(DIDL_ALBUMIMAGE_RES, imageUrl);
}

7
MediaBrowser.Dlna/PlayTo/DlnaController.cs
View File

@ -435,7 +435,7 @@ namespace MediaBrowser.Dlna.PlayTo
playlistItem.StreamUrl = StreamHelper.GetVideoUrl(_device.Properties, playlistItem, streams, serverAddress);
}
playlistItem.Didl = DidlBuilder.Build(item, _session.UserId.ToString(), serverAddress, playlistItem.StreamUrl, streams);
playlistItem.Didl = DidlBuilder.Build(item, _session.UserId.ToString(), serverAddress, playlistItem.StreamUrl, streams, profile.EnableAlbumArtInDidl);
return playlistItem;
}
@ -619,5 +619,10 @@ namespace MediaBrowser.Dlna.PlayTo
_logger.Log(LogSeverity.Debug, "Controller disposed");
}
}
public Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken)
{
throw new NotImplementedException();
}
}
}

12
MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs
View File

@ -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);

6
MediaBrowser.Dlna/Profiles/LgTvProfile.cs
View File

@ -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[]

2
MediaBrowser.Dlna/Profiles/PanasonicVieraProfile.cs
View File

@ -157,7 +157,7 @@ namespace MediaBrowser.Dlna.Profiles
{
new CodecProfile
{
Type = CodecType.VideoCodec,
Type = CodecType.Video,
Conditions = new[]
{

10
MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs
View File

@ -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[]

4
MediaBrowser.Dlna/Profiles/SonyBlurayPlayer2013Profile.cs
View File

@ -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 []
{

6
MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs
View File

@ -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 []
{

10
MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs
View File

@ -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 []

10
MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs
View File

@ -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[]

4
MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs
View File

@ -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[]

2
MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs
View File

@ -231,7 +231,7 @@ namespace MediaBrowser.Dlna.Profiles
{
new CodecProfile
{
Type = CodecType.VideoCodec,
Type = CodecType.Video,
Conditions = new []
{

10
MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs
View File

@ -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 []

4
MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs
View File

@ -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 []

10
MediaBrowser.Dlna/Profiles/Xbox360Profile.cs
View File

@ -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 []
{

1
MediaBrowser.Dlna/Profiles/Xml/Default.xml
View File

@ -30,5 +30,6 @@
</TranscodingProfile>
</TranscodingProfiles>
<ContainerProfiles />
<CodecProfiles />
<MediaProfiles />
</Profile>

1
MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml
View File

@ -34,5 +34,6 @@
</TranscodingProfile>
</TranscodingProfiles>
<ContainerProfiles />
<CodecProfiles />
<MediaProfiles />
</Profile>

6
MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml
View File

@ -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>

1
MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml
View File

@ -34,5 +34,6 @@
</TranscodingProfile>
</TranscodingProfiles>
<ContainerProfiles />
<CodecProfiles />
<MediaProfiles />
</Profile>

2
MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml
View File

@ -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" />

10
MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml
View File

@ -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>

4
MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml
View File

@ -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>

6
MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
View File

@ -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>

10
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml
View File

@ -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" />

10
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml
View File

@ -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" />

4
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml
View File

@ -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>

2
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml
View File

@ -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" />

10
MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml
View File

@ -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" />

4
MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml
View File

@ -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>

10
MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
View File

@ -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" />

1
MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
View File

@ -32,6 +32,7 @@
</TranscodingProfile>
</TranscodingProfiles>
<ContainerProfiles />
<CodecProfiles />
<MediaProfiles>
<MediaProfile container="avi" type="Video" mimeType="video/x-msvideo">
<Conditions />

1
MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
View File

@ -36,5 +36,6 @@
</TranscodingProfile>
</TranscodingProfiles>
<ContainerProfiles />
<CodecProfiles />
<MediaProfiles />
</Profile>

3
MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
View File

@ -428,6 +428,9 @@
<Compile Include="..\MediaBrowser.Model\Session\BrowseRequest.cs">
<Link>Session\BrowseRequest.cs</Link>
</Compile>
<Compile Include="..\MediaBrowser.Model\Session\GenericCommand.cs">
<Link>Session\GenericCommand.cs</Link>
</Compile>
<Compile Include="..\MediaBrowser.Model\Session\MessageCommand.cs">
<Link>Session\MessageCommand.cs</Link>
</Compile>

3
MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
View File

@ -415,6 +415,9 @@
<Compile Include="..\MediaBrowser.Model\Session\BrowseRequest.cs">
<Link>Session\BrowseRequest.cs</Link>
</Compile>
<Compile Include="..\MediaBrowser.Model\Session\GenericCommand.cs">
<Link>Session\GenericCommand.cs</Link>
</Compile>
<Compile Include="..\MediaBrowser.Model\Session\MessageCommand.cs">
<Link>Session\MessageCommand.cs</Link>
</Compile>

8
MediaBrowser.Model/ApiClient/IApiClient.cs
View File

@ -589,6 +589,14 @@ namespace MediaBrowser.Model.ApiClient
/// request</exception>
Task SendPlayCommandAsync(string sessionId, PlayRequest request);
/// <summary>
/// Sends the command asynchronous.
/// </summary>
/// <param name="sessionId">The session identifier.</param>
/// <param name="request">The request.</param>
/// <returns>Task.</returns>
Task SendCommandAsync(string sessionId, GenericCommand request);
/// <summary>
/// Sends a system command to the client
/// </summary>

1
MediaBrowser.Model/MediaBrowser.Model.csproj
View File

@ -132,6 +132,7 @@
<Compile Include="Querying\UserQuery.cs" />
<Compile Include="Search\SearchQuery.cs" />
<Compile Include="Session\BrowseRequest.cs" />
<Compile Include="Session\GenericCommand.cs" />
<Compile Include="Session\MessageCommand.cs" />
<Compile Include="Session\PlaybackReports.cs" />
<Compile Include="Session\PlayRequest.cs" />

48
MediaBrowser.Model/Session/GenericCommand.cs Normal file
View File

@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
namespace MediaBrowser.Model.Session
{
public class GenericCommand
{
public string Name { get; set; }
public string ControllingUserId { get; set; }
public Dictionary<string, string> Arguments { get; set; }
public GenericCommand()
{
Arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
}
}
/// <summary>
/// This exists simply to identify a set of known commands.
/// </summary>
public enum CoreGenericCommand
{
MoveUp = 0,
MoveDown = 1,
MoveLeft = 2,
MoveRight = 3,
PageUp = 4,
PageDown = 5,
PreviousLetter = 6,
NextLetter = 7,
ToggleOsd = 8,
ToggleContextMenu = 9,
Select = 10,
Back = 11,
TakeScreenshot = 12,
SendKey = 13,
SendString = 14,
GoHome = 15,
GoToSettings = 16,
VolumeUp = 17,
VolumeDown = 18,
Mute = 19,
Unmute = 20,
ToggleMute = 21
}
}

10
MediaBrowser.Model/Session/PlaystateCommand.cs
View File

@ -33,7 +33,15 @@ namespace MediaBrowser.Model.Session
/// <summary>
/// The fullscreen
/// </summary>
Fullscreen
Fullscreen,
/// <summary>
/// The rewind
/// </summary>
Rewind,
/// <summary>
/// The fast forward
/// </summary>
FastForward
}
public class PlaystateRequest

11
MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
View File

@ -146,5 +146,16 @@ namespace MediaBrowser.Server.Implementations.Roku
RequestContentType = "application/json"
});
}
public Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken)
{
return SendCommand(new WebSocketMessage<GenericCommand>
{
MessageType = "Command",
Data = command
}, cancellationToken);
}
}
}

12
MediaBrowser.Server.Implementations/Session/WebSocketController.cs
View File

@ -198,5 +198,17 @@ namespace MediaBrowser.Server.Implementations.Session
}, cancellationToken);
}
public Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken)
{
var socket = GetActiveSocket();
return socket.SendAsync(new WebSocketMessage<GenericCommand>
{
MessageType = "Command",
Data = command
}, cancellationToken);
}
}
}

5
MediaBrowser.ServerApplication/MainStartup.cs
View File

@ -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;

1
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@ -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" />

12
MediaBrowser.Common.Implementations/Updates/ApplicationUpdater.cs → MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs
View File

@ -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);

4
Nuget/MediaBrowser.Common.Internal.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common.Internal</id>
<version>3.0.345</version>
<version>3.0.346</version>
<title>MediaBrowser.Common.Internal</title>
<authors>Luke</authors>
<owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
<copyright>Copyright © Media Browser 2013</copyright>
<dependencies>
<dependency id="MediaBrowser.Common" version="3.0.345" />
<dependency id="MediaBrowser.Common" version="3.0.346" />
<dependency id="NLog" version="2.1.0" />
<dependency id="SimpleInjector" version="2.4.1" />
<dependency id="sharpcompress" version="0.10.2" />

2
Nuget/MediaBrowser.Common.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>MediaBrowser.Common</id>
<version>3.0.345</version>
<version>3.0.346</version>
<title>MediaBrowser.Common</title>
<authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners>

4
Nuget/MediaBrowser.Server.Core.nuspec
View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>MediaBrowser.Server.Core</id>
<version>3.0.345</version>
<version>3.0.346</version>
<title>Media Browser.Server.Core</title>
<authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains core components required to build plugins for Media Browser Server.</description>
<copyright>Copyright © Media Browser 2013</copyright>
<dependencies>
<dependency id="MediaBrowser.Common" version="3.0.345" />
<dependency id="MediaBrowser.Common" version="3.0.346" />
</dependencies>
</metadata>
<files>