mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fixes #555 - Have clients report seek and queuing capabilities

Browse source
This commit is contained in:
Luke Pulverenti 2013-09-24 11:08:51 -04:00
parent bc70b9ed6e
commit 086a032545
4 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ApiClient.js
View file

@ -3200,7 +3200,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
* @param {String} userId * @param {String} userId
* @param {String} itemId * @param {String} itemId
*/ */
self.reportPlaybackStart = function (userId, itemId) { self.reportPlaybackStart = function (userId, itemId, canSeek, queueableMediaTypes) {
if (!userId) { if (!userId) {
throw new Error("null userId"); throw new Error("null userId");
@ -3210,17 +3210,26 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
throw new Error("null itemId"); throw new Error("null itemId");
} }
canSeek = canSeek || false;
queueableMediaTypes = queueableMediaTypes || '';
if (self.isWebSocketOpen()) { if (self.isWebSocketOpen()) {
var deferred = $.Deferred(); var deferred = $.Deferred();
self.sendWebSocketMessage("PlaybackStart", itemId); var msg = [itemId, canSeek, queueableMediaTypes];
self.sendWebSocketMessage("PlaybackStart", msg.join('|'));
deferred.resolveWith(null, []); deferred.resolveWith(null, []);
return deferred.promise(); return deferred.promise();
} }
var url = self.getUrl("Users/" + userId + "/PlayingItems/" + itemId); var url = self.getUrl("Users/" + userId + "/PlayingItems/" + itemId, {
CanSeek: canSeek,
QueueableMediaTypes: queueableMediaTypes
});
return self.ajax({ return self.ajax({
type: "POST", type: "POST",

4
dashboard-ui/scripts/mediaplayer.js
View file

@ -438,7 +438,7 @@
audioElement.off("play.once"); audioElement.off("play.once");
ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id); ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id, true, item.MediaType);
startProgressInterval(item.Id); startProgressInterval(item.Id);
@ -635,7 +635,7 @@
videoElement.off("play.once"); videoElement.off("play.once");
ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id); ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id, true, item.MediaType);
startProgressInterval(item.Id); startProgressInterval(item.Id);

14
dashboard-ui/scripts/remotecontrol.js
View file

@ -256,7 +256,7 @@
return s.DeviceId != deviceId; return s.DeviceId != deviceId;
}); });
renderSessionsInPlayMenu(sessions, options, elem); renderSessionsInPlayMenu(sessions, options, elem, popup);
if (ApiClient.isWebSocketOpen()) { if (ApiClient.isWebSocketOpen()) {
ApiClient.sendWebSocketMessage("SessionsStart", "1000,1000"); ApiClient.sendWebSocketMessage("SessionsStart", "1000,1000");
@ -441,7 +441,7 @@
$('.chkSelectPlayTime:first', elem).checked(true); $('.chkSelectPlayTime:first', elem).checked(true);
} }
function renderSessionsInPlayMenu(sessions, options, elem) { function renderSessionsInPlayMenu(sessions, options, elem, popup) {
if (!sessions.length) { if (!sessions.length) {
elem.html('<p>There are currently no available media browser sessions to control.</p>'); elem.html('<p>There are currently no available media browser sessions to control.</p>');
@ -507,7 +507,7 @@
var session = sessions[i]; var session = sessions[i];
html += '<tr class="trSession" data-sessionid="' + session.Id + '">'; html += '<tr class="trSession" data-queue="' + session.QueueableMediaTypes.join(',') + '" data-sessionid="' + session.Id + '">';
html += '<td class="tdSelectSession"></td>'; html += '<td class="tdSelectSession"></td>';
html += '<td>' + session.Client + '</td>'; html += '<td>' + session.Client + '</td>';
@ -872,7 +872,7 @@
html += '<span class="duration"></span>'; html += '<span class="duration"></span>';
html += '</div>'; html += '</div>';
html += '<input type="range" name="positionSlider" id="positionSlider" min="0" max="100" value="50" step=".1" style="display:none;" />'; html += '<div class="positionSliderContainer"><input type="range" name="positionSlider" id="positionSlider" min="0" max="100" value="50" step=".1" style="display:none;" /></div>';
html += '</div>'; html += '</div>';
html += '<div style="text-align:center; margin: 0 0 2em;">'; html += '<div style="text-align:center; margin: 0 0 2em;">';
@ -953,6 +953,12 @@
imageContainer.hide(); imageContainer.hide();
} }
if (session.CanSeek) {
$('.positionSliderContainer', elem).show();
} else {
$('.positionSliderContainer', elem).hide();
}
var time = session.NowPlayingPositionTicks || 0; var time = session.NowPlayingPositionTicks || 0;
var duration = item.RunTimeTicks || 0; var duration = item.RunTimeTicks || 0;

2
packages.config
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.175" targetFramework="net45" /> <package id="MediaBrowser.ApiClient.Javascript" version="3.0.176" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" /> <package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" /> <package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
</packages> </packages>