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

fix build

Browse source
This commit is contained in:
Luke Pulverenti 2015-06-10 23:01:41 -04:00
parent f470541e59
commit b8f54a3174
5 changed files with 62 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -159,6 +159,12 @@
return null;
};
self.stop = function () {
if (mediaElement) {
mediaElement.pause();
}
};
self.pause = function () {
if (mediaElement) {
mediaElement.pause();

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

@ -1338,7 +1338,7 @@
if (mediaRenderer) {
mediaRenderer.pause();
mediaRenderer.stop();
$(mediaRenderer).off("ended.playnext").one("ended", function () {
@ -1654,9 +1654,10 @@
var mediaRenderer = getAudioRenderer();
mediaRenderer.setCurrentSrc(audioUrl);
// Set volume first to avoid an audible change
mediaRenderer.volume(initialVolume);
mediaRenderer.setPoster(self.getPosterUrl(item));
mediaRenderer.setCurrentSrc(audioUrl);
$(mediaRenderer).on("volumechange.mediaplayerevent", function () {

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

@ -1958,8 +1958,8 @@ var AppInfo = {};
}
if (Dashboard.isRunningInCordova() && $.browser.android) {
//define("audiorenderer", ["thirdparty/cordova/android/vlcplayer"]);
define("audiorenderer", ["scripts/htmlmediarenderer"]);
define("audiorenderer", ["thirdparty/cordova/android/vlcplayer"]);
//define("audiorenderer", ["scripts/htmlmediarenderer"]);
define("videorenderer", ["scripts/htmlmediarenderer"]);
}
else {

48
dashboard-ui/thirdparty/cordova/android/vlcplayer.js vendored
View file

@ -49,7 +49,7 @@
self.currentTime = function (val) {
if (val != null) {
AndroidVlcPlayer.setPosition(val);
AndroidVlcPlayer.sendVlcCommand("setposition", val.toString());
return;
}
@ -65,18 +65,22 @@
return null;
};
self.stop = function () {
AndroidVlcPlayer.sendVlcCommand("stop", null);
};
self.pause = function () {
AndroidVlcPlayer.pause();
AndroidVlcPlayer.sendVlcCommand("pause", null);
};
self.unpause = function () {
AndroidVlcPlayer.unpause();
AndroidVlcPlayer.sendVlcCommand("unpause", null);
};
self.volume = function (val) {
if (playerState) {
if (val != null) {
AndroidVlcPlayer.setVolume(val);
AndroidVlcPlayer.sendVlcCommand("setvolume", (val * 100).toString());
return;
}
@ -88,6 +92,7 @@
if (!val) {
self.destroy();
return;
}
if (type == 'audio') {
@ -95,6 +100,8 @@
} else {
AndroidVlcPlayer.playVideoVlc(val);
}
playerState.currentSrc = val;
};
self.currentSrc = function () {
@ -114,12 +121,43 @@
self.destroy = function () {
AndroidVlcPlayer.destroy();
AndroidVlcPlayer.destroyVlc();
playerState = {};
};
self.setPoster = function (url) {
};
self.report = function (eventName, duration, position, isPaused, volume) {
var state = playerState;
console.log('Vlc: ' + eventName + ' - ' + position + ' - ' + duration);
state.duration = duration;
state.currentTime = position;
state.isPaused = isPaused;
state.volume = (volume || 0) / 100;
if (eventName == 'playbackstop') {
onEnded();
}
else if (eventName == 'volumechange') {
onVolumeChange();
}
else if (eventName == 'positionchange') {
onTimeUpdate();
}
else if (eventName == 'paused') {
onPause();
}
else if (eventName == 'unpaused') {
onPlaying();
}
else if (eventName == 'playing') {
onPlaying();
}
};
window.AudioRenderer.Current = self;
}
window.AudioRenderer = vlcRenderer;

8
dashboard-ui/thirdparty/jquery.unveil-custom.js vendored
View file

@ -18,6 +18,14 @@
// If less than 100, the search window ends up not getting images
// If less than 200, this happens on the home page
// Need to fix those before this can be set to 0
// Non-ios browsers can generally handle a higher value and still perform well
// This helps eliminate the draw-in effect as you scroll
if (!$.browser.ipad && !$.browser.iphone) {
return 1000;
//return Math.max(screen.height, screen.width, 1000);
}
return 500;
}