KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #214 from zoff-music/fix/duration-fix

Browse Source 
Fixed issue with duration not working on songs without a start and en…
This commit is contained in:
Kasper Rynning-Tønnesen
2017-11-08 15:45:23 +01:00
committed by GitHub
parent 2e58559407 f90af8d2e1
commit 92438a301e
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/public/assets/js/player.js
View File

@@ -75,6 +75,13 @@ var Player = {
end: obj.np[0].end, end: obj.np[0].end,
duration: obj.np[0].duration, duration: obj.np[0].duration,
}; };
if(!obj.np[0].hasOwnProperty("start")) {
Player.np.start = 0;
}
if(!obj.np[0].hasOwnProperty("end")) {
Player.np.end = Player.np.duration;
}
conf = obj.conf[0]; conf = obj.conf[0];
time = obj.time; time = obj.time;
seekTo = (time - conf.startTime) + Player.np.start; seekTo = (time - conf.startTime) + Player.np.start;
@@ -96,6 +103,12 @@ var Player = {
end: obj.np[0].end, end: obj.np[0].end,
duration: obj.np[0].duration, duration: obj.np[0].duration,
}; };
if(!obj.np[0].hasOwnProperty("start")) {
Player.np.start = 0;
}
if(!obj.np[0].hasOwnProperty("end")) {
Player.np.end = Player.np.duration;
}
conf = obj.conf[0]; conf = obj.conf[0];
time = obj.time; time = obj.time;
seekTo = (time - conf.startTime) + Player.np.start; seekTo = (time - conf.startTime) + Player.np.start;