Skip to content
This repository has been archived by the owner on Sep 18, 2018. It is now read-only.

Video load logic fixes and updates #55

Merged
merged 2 commits into from Nov 3, 2011
Merged

Video load logic fixes and updates #55

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0a795e
simplify video load logic
octatone Nov 3, 2011
679896d
loop around on last item - and missed getVideoKey
octatone Nov 3, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
86 changes: 36 additions & 50 deletions js/tv.js
View file
Open in desktop
Expand Up @@ -381,64 +381,42 @@ function loadVideo(video) {
if(globals.shuffle){
if(globals.shuffled.length == 0){
shuffleChan(this_chan);
}else{
selected_video = globals.shuffled.indexOf(selected_video);
}
if(video === 'next' && selected_video < videos_size){
selected_video++;
while(sfwCheck(globals.shuffled[selected_video], this_chan) && selected_video < videos_size){
selected_video++;
}
if(sfwCheck(globals.shuffled[selected_video], this_chan)){
selected_video = this_video;
}
}else if(video == 'next' && selected_video == videos_size){
selected_video = 0;
}else if(selected_video > 0 && video === 'prev'){
selected_video--;
while(sfwCheck(globals.shuffled[selected_video], this_chan) && selected_video > 0){
selected_video--;
}
if(sfwCheck(globals.shuffled[selected_video], this_chan)){
selected_video = this_video;
}
}else if(video === 'first'){
//get normal key if shuffled already
selected_video = globals.shuffled.indexOf(selected_video);
}

if(video === 'next' && selected_video <= videos_size){
selected_video++;
if(selected_video > videos_size){
selected_video = 0;
if(sfwCheck(globals.shuffled[selected_video], this_chan)){
while(sfwCheck(selected_video, this_chan) && selected_video < videos_size){
selected_video++;
}
}
}
selected_video = globals.shuffled[selected_video];
}else{
if(video === 'next' && selected_video < videos_size){
while(sfwCheck(getVideoKey(selected_video), this_chan) && selected_video < videos_size){
selected_video++;
while(sfwCheck(selected_video, this_chan) && selected_video < videos_size){
selected_video++;
}
if(sfwCheck(selected_video, this_chan)){
selected_video = this_video;
}
}else if(video == 'next' && selected_video == videos_size){
selected_video = 0;
}else if(selected_video > 0 && video === 'prev'){
}
if(sfwCheck(getVideoKey(selected_video), this_chan)){
selected_video = this_video;
}
}else if(selected_video >= 0 && video === 'prev'){
selected_video--;
if(selected_video < 0){
selected_video = videos_size;
}
while(sfwCheck(getVideoKey(selected_video), this_chan) && selected_video > 0){
selected_video--;
while(sfwCheck(selected_video, this_chan) && selected_video > 0){
selected_video--;
}
if(sfwCheck(selected_video, this_chan)){
selected_video = this_video;
}
}else if(video === 'first'){
selected_video = 0;
if(sfwCheck(selected_video, this_chan)){
while(sfwCheck(selected_video, this_chan) && selected_video < videos_size){
selected_video++;
}
}
if(sfwCheck(getVideoKey(selected_video), this_chan)){
selected_video = this_video;
}
}else if(video === 'first'){
selected_video = 0;
if(sfwCheck(getVideoKey(selected_video), this_chan)){
while(sfwCheck(getVideoKey(selected_video), this_chan) && selected_video < videos_size){
selected_video++;
}
}
}
selected_video = getVideoKey(selected_video);

if(typeof(video) === 'number'){ //must be a number NOT A STRING - allows direct load of video # in video array
selected_video = video;
Expand Down Expand Up @@ -546,6 +524,14 @@ function loadVideo(video) {
}
}

function getVideoKey(key){
if(globals.shuffle && globals.shuffled.length == globals.videos[globals.cur_chan].video.length){
return globals.shuffled[key];
}else{
return key;
}
}

function loadVideoById(video_id) {
var this_chan = globals.cur_chan, video = findVideoById(video_id, this_chan); //returns number typed
if(video !== false){
Expand Down