diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json index 71626caf66..2b62013c80 100644 --- a/dashboard-ui/bower_components/emby-apiclient/.bower.json +++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.0.48", - "_release": "1.0.48", + "version": "1.0.49", + "_release": "1.0.49", "_resolution": { "type": "version", - "tag": "1.0.48", - "commit": "f9732e1b9084dad2f84a351dbae5a4772afab8b5" + "tag": "1.0.49", + "commit": "961b40aa65f6171f25603c924bc1ee8d6e0214ab" }, "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_target": "~1.0.3", diff --git a/dashboard-ui/bower_components/emby-apiclient/LICENSE.md b/dashboard-ui/bower_components/emby-apiclient/LICENSE.md index 4522ba0659..8f5a547ed2 100644 --- a/dashboard-ui/bower_components/emby-apiclient/LICENSE.md +++ b/dashboard-ui/bower_components/emby-apiclient/LICENSE.md @@ -1,339 +1,22 @@ -GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +The MIT License - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +Copyright (c) Emby https://emby.media - Preamble +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {{description}} - Copyright (C) {{year}} {{fullname}} - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - {signature of Ty Coon}, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js index 4dbaecc756..f07041c577 100644 --- a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js +++ b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js @@ -557,53 +557,51 @@ function validateAuthentication(server, connectionMode) { - return new Promise(function (resolve, reject) { + var url = ServerInfo.getServerAddress(server, connectionMode); - var url = ServerInfo.getServerAddress(server, connectionMode); + return ajax({ - ajax({ + type: "GET", + url: getEmbyServerUrl(url, "System/Info"), + dataType: "json", + headers: { + "X-MediaBrowser-Token": server.AccessToken + } - type: "GET", - url: getEmbyServerUrl(url, "System/Info"), - dataType: "json", - headers: { - "X-MediaBrowser-Token": server.AccessToken - } + }).then(function (systemInfo) { - }).then(function (systemInfo) { + updateServerInfo(server, systemInfo); - updateServerInfo(server, systemInfo); + if (server.UserId) { - if (server.UserId) { + return ajax({ + type: "GET", + url: getEmbyServerUrl(url, "users/" + server.UserId), + dataType: "json", + headers: { + "X-MediaBrowser-Token": server.AccessToken + } - ajax({ + }).then(function(user) { - type: "GET", - url: getEmbyServerUrl(url, "users/" + server.UserId), - dataType: "json", - headers: { - "X-MediaBrowser-Token": server.AccessToken - } + onLocalUserSignIn(server, connectionMode, user); + return Promise.resolve(); - }).then(function (user) { + }, function() { - onLocalUserSignIn(server, connectionMode, user); - resolve(); + server.UserId = null; + server.AccessToken = null; + return Promise.resolve(); + }); + } else { + return Promise.resolve(); + } - }, function () { + }, function () { - server.UserId = null; - server.AccessToken = null; - resolve(); - }); - } - - }, function () { - - server.UserId = null; - server.AccessToken = null; - resolve(); - }); + server.UserId = null; + server.AccessToken = null; + return Promise.resolve(); }); } @@ -1522,7 +1520,7 @@ } updateDevicePromise = ajax({ - url: 'http://mb3admin.com/admin/service/registration/updateDevice?' + paramsToString({ + url: 'https://mb3admin.com/admin/service/registration/updateDevice?' + paramsToString({ serverId: params.serverId, oldDeviceId: regInfo.deviceId, newDeviceId: params.deviceId @@ -1541,7 +1539,7 @@ params.embyUserName = user.Name; return ajax({ - url: 'http://mb3admin.com/admin/service/registration/validateDevice?' + paramsToString(params), + url: 'https://mb3admin.com/admin/service/registration/validateDevice?' + paramsToString(params), type: 'POST' }).then(function (response) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index ac27d3f0d7..d08487a40b 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -16,14 +16,15 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.1.99", - "_release": "1.1.99", + "version": "1.2.0", + "_release": "1.2.0", "_resolution": { "type": "version", - "tag": "1.1.99", - "commit": "dd95a9e2d720c1ec148b46389b9ba513d72af231" + "tag": "1.2.0", + "commit": "7bd7723824e9724b1caf23f4b73509084eae4e46" }, "_source": "git://github.com/MediaBrowser/emby-webcomponents.git", - "_target": "~1.1.5", - "_originalSource": "emby-webcomponents" + "_target": "^1.2.0", + "_originalSource": "emby-webcomponents", + "_direct": true } \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js index 1d088bcfac..bc5516ada6 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js @@ -317,7 +317,8 @@ define(['browser'], function (browser) { AudioCodec: hlsVideoAudioCodecs.join(','), VideoCodec: 'h264', Context: 'Streaming', - Protocol: 'hls' + Protocol: 'hls', + ForceLiveStream: true }); } diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index 66d7d54b0f..c6b481c2cb 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -36,7 +36,7 @@ "tag": "v1.3.0", "commit": "1662093611cda3fd29125cdab94a61d3d88093da" }, - "_source": "git://github.com/PolymerElements/iron-selector.git", + "_source": "git://github.com/polymerelements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-selector" + "_originalSource": "polymerelements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index a6b333d335..2b04bf9f8a 100644 --- a/dashboard-ui/bower_components/paper-behaviors/.bower.json +++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json @@ -45,7 +45,7 @@ "tag": "v1.0.11", "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5" }, - "_source": "git://github.com/polymerelements/paper-behaviors.git", + "_source": "git://github.com/PolymerElements/paper-behaviors.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/paper-behaviors" + "_originalSource": "PolymerElements/paper-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index 2f654d71c6..157225ee71 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -32,14 +32,14 @@ "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" }, "ignore": [], - "homepage": "https://github.com/polymerelements/paper-ripple", + "homepage": "https://github.com/PolymerElements/paper-ripple", "_release": "1.0.5", "_resolution": { "type": "version", "tag": "v1.0.5", "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" }, - "_source": "git://github.com/polymerelements/paper-ripple.git", + "_source": "git://github.com/PolymerElements/paper-ripple.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/paper-ripple" + "_originalSource": "PolymerElements/paper-ripple" } \ No newline at end of file diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css index 1e02891828..7580463d64 100644 --- a/dashboard-ui/css/mediaplayer-video.css +++ b/dashboard-ui/css/mediaplayer-video.css @@ -364,4 +364,24 @@ video::-webkit-media-text-track-background { #videoPlayer:not(.idlePlayer) video:not([controls])::-webkit-media-text-track-display { /*Style the text itself*/ margin-top: -2.5em; -} \ No newline at end of file +} + + +.videoSubtitles { + position: fixed; + bottom: 10%; + text-align: center; + left: 0; + right: 0; + color: #fff; + font-size: 200%; + z-index: 9999999; +} + +.videoSubtitlesInner { + max-width: 70%; + background-color: rgba(0,0,0,.8); + padding: .25em; + margin: auto; + display: inline-block; +} diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js index b863a48393..3d9b45cdda 100644 --- a/dashboard-ui/scripts/htmlmediarenderer.js +++ b/dashboard-ui/scripts/htmlmediarenderer.js @@ -5,6 +5,7 @@ var requiresSettingStartTimeOnStart; var subtitleTrackIndexToSetOnPlaying; var currentTrackList; + var currentPlayOptions; function htmlMediaRenderer(options) { @@ -32,6 +33,13 @@ // } // } //} + + if (options.type == 'video') { + // Get the player position + the transcoding offset + var timeMs = this.currentTime * 1000; + timeMs += ((currentPlayOptions.startTimeTicksOffset || 0) / 10000); + updateSubtitleText(timeMs); + } Events.trigger(self, 'timeupdate'); } @@ -325,9 +333,12 @@ if (!elem) { currentSrc = null; + currentPlayOptions = null; return; } + currentPlayOptions = streamInfo; + if (!streamInfo) { currentSrc = null; elem.src = null; @@ -517,6 +528,10 @@ return false; } + if (browserInfo.edge || browserInfo.msie) { + return false; + } + if (browserInfo.firefox) { if ((currentSrc || '').toLowerCase().indexOf('.m3u8') != -1) { return false; @@ -528,6 +543,13 @@ function destroyCustomTrack(isPlaying) { + //window.removeEventListener('resize', onVideoResize); + + var videoSubtitlesElem = document.querySelector('.videoSubtitles'); + if (videoSubtitlesElem) { + videoSubtitlesElem.parentNode.removeChild(videoSubtitlesElem); + } + if (isPlaying) { var allTracks = mediaElement.textTracks; // get list of tracks @@ -542,6 +564,15 @@ } customTrackIndex = -1; + currentSubtitlesElement = null; + currentTrackEvents = null; + currentClock = null; + + var renderer = currentAssRenderer; + if (renderer) { + renderer.setEnabled(false); + } + currentAssRenderer = null; } function fetchSubtitles(track) { @@ -553,8 +584,6 @@ }); } - var customTrackIndex = -1; - function setTrackForCustomDisplay(track) { if (!track) { @@ -570,10 +599,18 @@ destroyCustomTrack(true); customTrackIndex = track.index; renderTracksEvents(track); + lastCustomTrackMs = 0; } function renderTracksEvents(track) { + if (browserInfo.edge || browserInfo.msie) { + fetchSubtitles(track).then(function (data) { + currentTrackEvents = data.TrackEvents; + }); + return; + } + var trackElement = null; var expectedId = 'manualTrack' + track.index; @@ -602,7 +639,7 @@ // add some cues to show the text // in safari, the cues need to be added before setting the track mode to showing data.TrackEvents.forEach(function (trackEvent) { - trackElement.addCue(new VTTCue(trackEvent.StartPositionTicks / 10000000, trackEvent.EndPositionTicks / 10000000, trackEvent.Text.replace(/\\N/gi, '\n'))); + trackElement.addCue(new (window.VTTCue || window.TextTrackCue)(trackEvent.StartPositionTicks / 10000000, trackEvent.EndPositionTicks / 10000000, trackEvent.Text.replace(/\\N/gi, '\n'))); }); trackElement.mode = 'showing'; }); @@ -611,6 +648,58 @@ } } + var currentSubtitlesElement; + var currentTrackEvents; + var customTrackIndex = -1; + var lastCustomTrackMs = 0; + var currentClock; + var currentAssRenderer; + function updateSubtitleText(timeMs) { + + //var clock = currentClock; + //if (clock) { + // clock.seek(timeMs / 1000); + //} + + var trackEvents = currentTrackEvents; + if (!trackEvents) { + return; + } + + if (!currentSubtitlesElement) { + var videoSubtitlesElem = document.querySelector('.videoSubtitles'); + if (!videoSubtitlesElem) { + videoSubtitlesElem = document.createElement('div'); + videoSubtitlesElem.classList.add('videoSubtitles'); + videoSubtitlesElem.innerHTML = '
'; + document.body.appendChild(videoSubtitlesElem); + } + currentSubtitlesElement = videoSubtitlesElem.querySelector('.videoSubtitlesInner'); + } + + if (lastCustomTrackMs > 0) { + if (Math.abs(lastCustomTrackMs - timeMs) < 500) { + return; + } + } + + lastCustomTrackMs = new Date().getTime(); + + var positionTicks = timeMs * 10000; + for (var i = 0, length = trackEvents.length; i < length; i++) { + + var caption = trackEvents[i]; + if (positionTicks >= caption.StartPositionTicks && positionTicks <= caption.EndPositionTicks) { + currentSubtitlesElement.innerHTML = caption.Text; + currentSubtitlesElement.classList.remove('hide'); + return; + } + } + + currentSubtitlesElement.innerHTML = ''; + currentSubtitlesElement.classList.add('hide'); + } + self.setCurrentTrackElement = function (streamIndex) { console.log('Setting new text track index to: ' + streamIndex); diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index beb9c0c461..bf8f522c3c 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -235,10 +235,12 @@ define(['appSettings', 'userSettings', 'appStorage'], function (appSettings, use function canPlayerSeek() { var mediaRenderer = self.currentMediaRenderer; - var currentSrc = self.getCurrentSrc(mediaRenderer); + var currentSrc = (self.getCurrentSrc(mediaRenderer) || '').toLowerCase(); - if ((currentSrc || '').indexOf('.m3u8') != -1) { - return true; + if (currentSrc.indexOf('.m3u8') != -1) { + if (currentSrc.indexOf('forcelivestream=true') == -1) { + return true; + } } else { var duration = mediaRenderer.duration(); return duration && !isNaN(duration) && duration != Number.POSITIVE_INFINITY && duration != Number.NEGATIVE_INFINITY; @@ -707,7 +709,11 @@ define(['appSettings', 'userSettings', 'appStorage'], function (appSettings, use if (mediaSource.TranscodingSubProtocol == 'hls') { - mediaUrl += seekParam; + if (mediaUrl.toLowerCase().indexOf('forcelivestream=true') != -1) { + startPositionInSeekParam = 0; + startTimeTicksOffset = startPosition || 0; + } + contentType = 'application/x-mpegURL'; } else {