From 631442883085b10e36675fca5117fa3a49a608e0 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 12 May 2014 14:04:25 -0400 Subject: Add remote control chapter menu --- .../Dto/DtoService.cs | 10 ++ .../Localization/Server/server.json | 10 +- .../MediaBrowser.Server.Implementations.csproj | 3 +- .../Roku/RokuControllerFactory.cs | 36 ----- .../Roku/RokuSessionController.cs | 144 -------------------- .../Session/HttpSessionController.cs | 151 +++++++++++++++++++++ 6 files changed, 169 insertions(+), 185 deletions(-) delete mode 100644 MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs delete mode 100644 MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs create mode 100644 MediaBrowser.Server.Implementations/Session/HttpSessionController.cs (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 4bcbfaf95..38d6034e4 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -12,6 +12,7 @@ using MediaBrowser.Controller.LiveTv; using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Session; +using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Drawing; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; @@ -110,6 +111,15 @@ namespace MediaBrowser.Server.Implementations.Dto AttachBasicFields(dto, item, owner, fields); + if (user != null && dto.MediaSources != null && item is Video) + { + foreach (var source in dto.MediaSources) + { + //source.DefaultAudioStreamIndex = GetDefaultAudioStreamIndex(source, user.Configuration); + //source.DefaultSubtitleStreamIndex = GetDefaultSubtitleStreamIndex(source, user.Configuration); + } + } + if (fields.Contains(ItemFields.SoundtrackIds)) { var hasSoundtracks = item as IHasSoundtracks; diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index 258d7bff2..9e1943131 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -63,7 +63,7 @@ "HeaderPlaybackSettings": "Playback Settings", "LabelAudioLanguagePreference": "Audio language preference:", "LabelSubtitleLanguagePreference": "Subtitle language preference:", - "LabelDisplayForcedSubtitlesOnly": "Display only forced subtitles", + "OptionDefaultSubtitles": "Default", "TabProfiles": "Profiles", "TabSecurity": "Security", "ButtonAddUser": "Add User", @@ -228,6 +228,8 @@ "ButtonSearch": "Search", "ButtonGroupVersions": "Group Versions", "PismoMessage": "Utilizing Pismo File Mount through a donated license.", + "TangibleSoftwareMessage": "Utilizing Tangible Solutions Java/C# converters through a donated license.", + "HeaderCredits": "Credits", "PleaseSupportOtherProduces": "Please support other free products we utilize:", "VersionNumber": "Version {0}", "TabPaths": "Paths", @@ -327,7 +329,7 @@ "OptionAutomatic": "Auto", "LiveTvPluginRequired": "A Live TV service provider plugin is required in order to continue.", "LiveTvPluginRequiredHelp": "Please install one of our available plugins, such as Next Pvr or ServerWmc.", - "HeaderCustomizeOptionsPerMediaType": "Customize options per media type", + "LabelCustomizeOptionsPerMediaType": "Customize for media type:", "OptionDownloadThumbImage": "Thumb", "OptionDownloadMenuImage": "Menu", "OptionDownloadLogoImage": "Logo", @@ -339,6 +341,7 @@ "OptionDownloadPrimaryImage": "Primary", "HeaderFetchImages": "Fetch Images:", "HeaderImageSettings": "Image Settings", + "TabCustomizations": "Customizations", "LabelMaxBackdropsPerItem": "Maximum number of backdrops per item:", "LabelMaxScreenshotsPerItem": "Maximum number of screenshots per item:", "LabelMinBackdropDownloadWidth": "Minimum backdrop download width:", @@ -721,7 +724,8 @@ "TabSubtitles": "Subtitles", "LabelOpenSubtitlesUsername": "Open Subtitles username:", "LabelOpenSubtitlesPassword": "Open Subtitles password:", - "LabelAudioLanguagePreferenceHelp": "If empty, the default audio track will be selected, regardless of language.", + "LabelPlayDefaultAudioTrack": "Play default audio track regardless of language", + "LabelSubtitlePlaybackMode": "Subtitle mode:", "LabelDownloadLanguages": "Download languages:", "ButtonRegister": "Register", "LabelSkipIfAudioTrackPresent": "Skip if the default audio track matches the download language", diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 21fcd736f..78d8da70d 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -200,7 +200,6 @@ - @@ -209,7 +208,7 @@ - + Code diff --git a/MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs b/MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs deleted file mode 100644 index 3ec2f53ec..000000000 --- a/MediaBrowser.Server.Implementations/Roku/RokuControllerFactory.cs +++ /dev/null @@ -1,36 +0,0 @@ -using MediaBrowser.Common.Net; -using MediaBrowser.Controller; -using MediaBrowser.Controller.Session; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Serialization; -using System; -using System.Collections.Generic; - -namespace MediaBrowser.Server.Implementations.Roku -{ - public class RokuControllerFactory : ISessionControllerFactory - { - private readonly IHttpClient _httpClient; - private readonly IJsonSerializer _json; - private readonly IServerApplicationHost _appHost; - - public RokuControllerFactory(IHttpClient httpClient, IJsonSerializer json, IServerApplicationHost appHost) - { - _httpClient = httpClient; - _json = json; - _appHost = appHost; - } - - public ISessionController GetSessionController(SessionInfo session) - { - if (string.Equals(session.Client, "roku", StringComparison.OrdinalIgnoreCase)) - { - session.PlayableMediaTypes = new List { MediaType.Video, MediaType.Audio }; - - return new RokuSessionController(_httpClient, _json, _appHost, session); - } - - return null; - } - } -} diff --git a/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs deleted file mode 100644 index ad9db947a..000000000 --- a/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs +++ /dev/null @@ -1,144 +0,0 @@ -using MediaBrowser.Common.Net; -using MediaBrowser.Controller; -using MediaBrowser.Controller.Session; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Net; -using MediaBrowser.Model.Serialization; -using MediaBrowser.Model.Session; -using MediaBrowser.Model.System; -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace MediaBrowser.Server.Implementations.Roku -{ - public class RokuSessionController : ISessionController - { - private readonly IHttpClient _httpClient; - private readonly IJsonSerializer _json; - private readonly IServerApplicationHost _appHost; - - public SessionInfo Session { get; private set; } - - public RokuSessionController(IHttpClient httpClient, IJsonSerializer json, IServerApplicationHost appHost, SessionInfo session) - { - _httpClient = httpClient; - _json = json; - _appHost = appHost; - Session = session; - } - - public bool SupportsMediaRemoteControl - { - get { return false; } - } - - public bool IsSessionActive - { - get - { - return (DateTime.UtcNow - Session.LastActivityDate).TotalMinutes <= 10; - } - } - - public Task SendSessionEndedNotification(SessionInfoDto sessionInfo, CancellationToken cancellationToken) - { - return Task.FromResult(true); - } - - public Task SendPlaybackStartNotification(SessionInfoDto sessionInfo, CancellationToken cancellationToken) - { - return Task.FromResult(true); - } - - public Task SendPlaybackStoppedNotification(SessionInfoDto sessionInfo, CancellationToken cancellationToken) - { - return Task.FromResult(true); - } - - public Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "Play", - Data = command - - }, cancellationToken); - } - - public Task SendPlaystateCommand(PlaystateRequest command, CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "Playstate", - Data = command - - }, cancellationToken); - } - - public Task SendLibraryUpdateInfo(LibraryUpdateInfo info, CancellationToken cancellationToken) - { - // Roku probably won't care about this - return Task.FromResult(true); - } - - public Task SendRestartRequiredNotification(CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "RestartRequired", - Data = _appHost.GetSystemInfo() - - }, cancellationToken); - } - - public Task SendUserDataChangeInfo(UserDataChangeInfo info, CancellationToken cancellationToken) - { - // Roku probably won't care about this - return Task.FromResult(true); - } - - public Task SendServerShutdownNotification(CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "ServerShuttingDown", - Data = string.Empty - - }, cancellationToken); - } - - public Task SendServerRestartNotification(CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "ServerRestarting", - Data = string.Empty - - }, cancellationToken); - } - - private Task SendCommand(object obj, CancellationToken cancellationToken) - { - var json = _json.SerializeToString(obj); - - return _httpClient.Post(new HttpRequestOptions - { - Url = "http://" + Session.RemoteEndPoint + "/mb/remotecontrol", - CancellationToken = cancellationToken, - RequestContent = json, - RequestContentType = "application/json" - }); - } - - public Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken) - { - return SendCommand(new WebSocketMessage - { - MessageType = "Command", - Data = command - - }, cancellationToken); - } - } -} diff --git a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs new file mode 100644 index 000000000..024b0ec90 --- /dev/null +++ b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs @@ -0,0 +1,151 @@ +using MediaBrowser.Common.Net; +using MediaBrowser.Controller; +using MediaBrowser.Controller.Session; +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Net; +using MediaBrowser.Model.Serialization; +using MediaBrowser.Model.Session; +using MediaBrowser.Model.System; +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace MediaBrowser.Server.Implementations.Session +{ + public class HttpSessionController : ISessionController + { + private readonly IHttpClient _httpClient; + private readonly IJsonSerializer _json; + private readonly IServerApplicationHost _appHost; + + public SessionInfo Session { get; private set; } + + //var postUrl = string.Format("http://{0}/mediabrowser/message", session.RemoteEndPoint); + + private readonly string _postUrl; + + public HttpSessionController(IHttpClient httpClient, + IJsonSerializer json, + IServerApplicationHost appHost, + SessionInfo session, + string postUrl) + { + _httpClient = httpClient; + _json = json; + _appHost = appHost; + Session = session; + _postUrl = postUrl; + } + + public bool SupportsMediaRemoteControl + { + get { return false; } + } + + public bool IsSessionActive + { + get + { + return (DateTime.UtcNow - Session.LastActivityDate).TotalMinutes <= 10; + } + } + + private Task SendMessage(object obj, CancellationToken cancellationToken) + { + var json = _json.SerializeToString(obj); + + return _httpClient.Post(new HttpRequestOptions + { + Url = _postUrl, + CancellationToken = cancellationToken, + RequestContent = json, + RequestContentType = "application/json" + }); + } + + public Task SendSessionEndedNotification(SessionInfoDto sessionInfo, CancellationToken cancellationToken) + { + return Task.FromResult(true); + } + + public Task SendPlaybackStartNotification(SessionInfoDto sessionInfo, CancellationToken cancellationToken) + { + return Task.FromResult(true); + } + + public Task SendPlaybackStoppedNotification(SessionInfoDto sessionInfo, CancellationToken cancellationToken) + { + return Task.FromResult(true); + } + + public Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken) + { + return SendMessage(new WebSocketMessage + { + MessageType = "Play", + Data = command + + }, cancellationToken); + } + + public Task SendPlaystateCommand(PlaystateRequest command, CancellationToken cancellationToken) + { + return SendMessage(new WebSocketMessage + { + MessageType = "Playstate", + Data = command + + }, cancellationToken); + } + + public Task SendLibraryUpdateInfo(LibraryUpdateInfo info, CancellationToken cancellationToken) + { + return Task.FromResult(true); + } + + public Task SendRestartRequiredNotification(CancellationToken cancellationToken) + { + return SendMessage(new WebSocketMessage + { + MessageType = "RestartRequired", + Data = _appHost.GetSystemInfo() + + }, cancellationToken); + } + + public Task SendUserDataChangeInfo(UserDataChangeInfo info, CancellationToken cancellationToken) + { + return Task.FromResult(true); + } + + public Task SendServerShutdownNotification(CancellationToken cancellationToken) + { + return SendMessage(new WebSocketMessage + { + MessageType = "ServerShuttingDown", + Data = string.Empty + + }, cancellationToken); + } + + public Task SendServerRestartNotification(CancellationToken cancellationToken) + { + return SendMessage(new WebSocketMessage + { + MessageType = "ServerRestarting", + Data = string.Empty + + }, cancellationToken); + } + + public Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken) + { + return SendMessage(new WebSocketMessage + { + MessageType = "GeneralCommand", + Data = command + + }, cancellationToken); + } + } +} -- cgit v1.2.3