diff --git a/server/handlers/list.js b/server/handlers/list.js index f9ab8887..8a9c843d 100644 --- a/server/handlers/list.js +++ b/server/handlers/list.js @@ -85,7 +85,6 @@ function list(msg, guid, coll, offline, socket) { socket.join(coll); List.send_list(coll, socket, true, false, true); db.collection("frontpage_lists").insert({"_id": coll, "count" : 0, "frontpage": true, "accessed": Functions.get_time(), "viewers": 1}, function(e,d){ - console.log("added new channel", coll); }); Functions.check_inlist(coll, guid, socket, offline); }); diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js index 33ea4cda..9aaa6945 100644 --- a/server/handlers/list_change.js +++ b/server/handlers/list_change.js @@ -381,8 +381,6 @@ function add_function(arr, coll, guid, offline, socket) { } var new_song = {"added": added,"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration, "start": parseInt(start), "end": parseInt(end), "type": "video", "source": source}; if(source == "soundcloud") new_song.thumbnail = arr.thumbnail; - console.log(new_song); - //return; db.collection(coll).update({id: id}, new_song, {upsert: true}, function(err, docs){ new_song._id = "asd"; if(np) { diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js index ccaa4760..c701b465 100644 --- a/server/public/assets/js/channel.js +++ b/server/public/assets/js/channel.js @@ -31,7 +31,6 @@ var Channel = { } window.onpopstate = function(e){ - console.log(e) Channel.onepage_load(); }; diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js index 09360dc6..8b90e3dd 100755 --- a/server/public/assets/js/frontpage.js +++ b/server/public/assets/js/frontpage.js @@ -26,7 +26,6 @@ var Frontpage = { document.getElementById("channel-list-container").insertAdjacentHTML("beforeend", "

No channels yet

"); } else { Frontpage.populate_channels(msg.channels, true); - console.log(msg.channels); } Frontpage.set_viewers(msg.viewers); }, diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js index cc2101e1..70c0d535 100644 --- a/server/public/assets/js/functions.js +++ b/server/public/assets/js/functions.js @@ -201,7 +201,6 @@ function get_list_ajax() { } }, error: function(response) { - console.log(response); response = JSON.parse(response); if(response.status == 403) { start_auth(); diff --git a/server/public/assets/js/list.js b/server/public/assets/js/list.js index 30e9413d..a94302e5 100755 --- a/server/public/assets/js/list.js +++ b/server/public/assets/js/list.js @@ -356,7 +356,6 @@ var List = { full_playlist.push(now_playing); } - console.log(added.source); if(added.source != "soundcloud" && document.querySelectorAll("#suggested-"+added.id).length > 0) { number_suggested = number_suggested - 1; if(number_suggested < 0) number_suggested = 0; diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index ae5280e3..09a2422f 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -188,16 +188,13 @@ window.addEventListener("DOMContentLoaded", function() { else if(!fromChannel && window.location.pathname == "/"){ Frontpage.init(); } - console.log(window.location.pathname); if(window.location.pathname == "/" && !client) { - console.log("time to load"); tag = document.createElement('script'); tag.src = "https://www.youtube.com/iframe_api"; firstScriptTag = document.getElementsByTagName('script')[0]; firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); tag.onload = function() { - console.log("loaded script") if(document.querySelectorAll("script[src='https://w.soundcloud.com/player/api.js']").length == 1) { } else { @@ -211,7 +208,6 @@ window.addEventListener("DOMContentLoaded", function() { SC.initialize({ client_id: '***REMOVED***' }, function() { - console.log("Loaded streamer"); }); } } @@ -454,7 +450,6 @@ addListener("submit", "#description_form", function(event){ }); addListener("click", "#playpause-overlay", function(){ - console.log("playpause"); if(document.getElementById("play-overlay").classList.contains("hide")){ Player.pauseVideo(); Helper.toggleClass("#play-overlay", "hide"); @@ -619,7 +614,6 @@ document.addEventListener("keydown", function(event) { document.querySelector("#import") != document.activeElement && document.querySelector("#find_input") != document.activeElement && document.querySelector("#import_spotify") != document.activeElement) { - console.log("play pause space", videoSource); if(videoSource == "soundcloud") { event.preventDefault(); Playercontrols.play_pause(); @@ -1314,7 +1308,6 @@ addListener("click", ".result-object", function(e){ if(end > original_length) { end = original_length; } - console.log(source); if(start > end) { M.toast({html: "Start can't be before the end..", displayLength: 3000, classes: "red lighten"}); } else if(start < 0) { @@ -1414,8 +1407,6 @@ addListener("click", "#add-many", function(e){ source = "soundcloud"; thumbnail = e.getAttribute("data-type-thumbnail"); } - console.log(start, end); - console.log(source); if(start > end) { M.toast({html: "Start can't be before the end..", displayLength: 3000, classes: "red lighten"}); } else if(start < 0) { @@ -1427,7 +1418,6 @@ addListener("click", "#add-many", function(e){ e.parentElement.parentElement.parentElement.remove(); Search.submit(id, title, length, false, 0, 1, start, end, source, thumbnail); } catch(event) { - console.log(event); M.toast({html: "Only numbers are accepted as song start and end parameters..", displayLength: 3000, classes: "red lighten"}); } } diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index b7a29f8a..4f630127 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -67,10 +67,10 @@ var Player = { if(obj.np != undefined) { Player.getTitle(song_title, viewers); if(((embed && autoplay) || !embed ) && !offline && !was_stopped) { - console.log("loadVideoById \nwas_stopped=",was_stopped,"\noffline=",offline) + Helper.log(["loadVideoById \nwas_stopped="+was_stopped+"\noffline="+offline]) Player.loadVideoById(Player.np.id, duration, Player.np.start, Player.np.end); } else { - console.log("cueVideoById \nwas_stopped=",was_stopped,"\noffline=",offline) + Helper.log(["cueVideoById \nwas_stopped="+was_stopped+"\noffline="+offline]) Player.cueVideoById(Player.np.id, duration, Player.np.start, Player.np.end); } } @@ -111,7 +111,6 @@ var Player = { playing = false; paused = false; was_stopped = false; - console.log(362, "was stopped", was_stopped); if(!offline) { /*var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true); if(u == undefined) u = "";*/ @@ -124,7 +123,6 @@ var Player = { if(videoSource == "soundcloud") { Player.player.stopVideo(); //was_stopped = false; - console.log(362, "was stopped", was_stopped); return; } if(embed) { @@ -170,7 +168,6 @@ var Player = { } else { if(!chromecastAvailable){ was_stopped = true; - console.log(417, "was stopped", was_stopped); if(beginning && mobile_beginning) { Helper.css("#playpause", "visibility", "visible"); Helper.css("#playpause", "pointer-events", "all"); @@ -255,116 +252,47 @@ var Player = { Player.stopVideo(); if(_autoplay) was_stopped = false; Helper.removeClass(document.getElementById("player_overlay"), "hide"); - //document.getElementById("player_overlay_text").innerText = "Loading SoundCloud"; Helper.css(document.getElementById("player_overlay"), "background-color", "#2d2d2d"); - - //if(Player.soundcloud_player) { - //console.log(Player.soundcloud_player) - if(start == undefined) start = 0; - if(seekTo == undefined) seekTo = 0; - /*SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000); - SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume());*/ - soundcloud_loading = false; - - /*SC.Widget(Player.soundcloud_player).isPaused(function(paused) { - if(paused) SC.Widget(Player.soundcloud_player).play(); - });*/ - - //Player.soundcloud_player.listenTo("/tracks/" + id); - /*SC.Widget(Player.soundcloud_player).getCurrentSound(function(sound) { + if(start == undefined) start = 0; + if(seekTo == undefined) seekTo = 0; + soundcloud_loading = false; + var _autoAdd = "false"; + if(_autoplay) { + _autoAdd = "true"; + Helper.removeClass("#player_loader_container", "hide"); + } + try { + if(SC == null || !SC.stream) return; + } catch(e) { + return; + } + SC.stream("/tracks/" + id).then(function(player){ + Player.soundcloud_player = player; + Player.soundcloud_player.bind("finish", Player.soundcloudFinish); + Player.soundcloud_player.bind("pause", Player.soundcloudPause); + Player.soundcloud_player.bind("play", Player.soundcloudPlay); + window.player = player; + SC.get('/tracks', { + ids: id + }).then(function(tracks) { + var sound = tracks[0]; Helper.removeClass(".soundcloud_info_container", "hide"); - document.querySelector(".soundcloud_info_container .green").href = sound.purchase_url; - document.querySelector(".soundcloud_info_container .red").href = sound.user.permalink_url; - console.log(sound); - });*/ - //} else { - var _autoAdd = "false"; + document.querySelector("#soundcloud_listen_link").href = sound.permalink_url; + document.querySelector(".soundcloud_info_container .green").href = sound.user.permalink_url; + //document.querySelector(".soundcloud_info_container .red").href = sound.user.permalink_url; + }); if(_autoplay) { - _autoAdd = "true"; - Helper.removeClass("#player_loader_container", "hide"); - } - /*SC.Widget(Player.soundcloud_player).unbind(SC.Widget.Events.FINISH, Player.soundcloudFinish); - SC.Widget(Player.soundcloud_player).unbind(SC.Widget.Events.PAUSE, Player.soundcloudPause); - SC.Widget(Player.soundcloud_player).unbind(SC.Widget.Events.PLAY, Player.soundcloudPlay); - document.querySelector("#soundcloud_container").innerHTML = ''; - Player.soundcloud_player = document.querySelector("#soundcloud_player");*/ - try { - if(SC == null || !SC.stream) return; - } catch(e) { - return; - } - console.log("Trying to play soundcloud here"); - SC.stream("/tracks/" + id).then(function(player){ - console.log(player); - Player.soundcloud_player = player; - Player.soundcloud_player.bind("finish", Player.soundcloudFinish); - Player.soundcloud_player.bind("pause", Player.soundcloudPause); - Player.soundcloud_player.bind("play", Player.soundcloudPlay); - window.player = player; - SC.get('/tracks', { - ids: id - }).then(function(tracks) { - var sound = tracks[0]; - Helper.removeClass(".soundcloud_info_container", "hide"); - document.querySelector("#soundcloud_listen_link").href = sound.permalink_url; - document.querySelector(".soundcloud_info_container .green").href = sound.purchase_url; - document.querySelector(".soundcloud_info_container .red").href = sound.user.permalink_url; + player.play().then(function(){ + Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100); + Player.soundcloud_player.seek((seekTo) * 1000); + }).catch(function(e){ }); - if(_autoplay) { - player.play().then(function(){ - console.log(id); - Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100); - Player.soundcloud_player.seek((seekTo) * 1000); - console.log('Playback started!'); - }).catch(function(e){ - console.error('Playback rejected. Try calling play() from a user interaction.', e); - }); - } - }); - soundcloud_loading = true; - /*SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.FINISH, Player.soundcloudFinish); - SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PAUSE, Player.soundcloudPause); - SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PLAY, Player.soundcloudPlay); - SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume());*/ - /*SC.Widget(Player.soundcloud_player).load(id, { - autoplay: true, - callback: function(element) { - console.log(element); - console.log("It should be playing now"); - SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000); - SC.Widget(Player.soundcloud_player).play(); - - - } - })*/ - if(start == undefined) start = 0; - if(seekTo == undefined) seekTo = 0; - - //SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000); - if(!document.hasFocus()) { - console.log("Is out of focus, trying timout for playing"); - - /*setTimeout(function() { - SC.Widget(Player.soundcloud_player).getCurrentSound(function(sound) { - console.log(sound, sound.uri, sound.uri.replace("https://api.soundcloud.com", "")) - SC.stream(sound.uri.replace("https://api.soundcloud.com", "")).then(function(player){ - console.log(player); - player.play().then(function(){ - console.log('Playback started!'); - }).catch(function(e){ - console.error('Playback rejected. Try calling play() from a user interaction.', e); - }); - }); - Helper.removeClass(".soundcloud_info_container", "hide"); - document.querySelector(".soundcloud_info_container .green").href = sound.purchase_url; - document.querySelector(".soundcloud_info_container .red").href = sound.user.permalink_url; - console.log(sound); - }); - }, 500);*/ } - //} + }); + soundcloud_loading = true; + if(start == undefined) start = 0; + if(seekTo == undefined) seekTo = 0; + if(_autoplay) was_stopped = false; Helper.css(document.getElementById("player_overlay"), "background", "url('" + full_playlist[full_playlist.length - 1].thumbnail + "')"); Helper.css(document.getElementById("player_overlay"), "background-size", "auto"); @@ -620,8 +548,6 @@ var Player = { end_programmatically = false; } else { was_stopped = true; - console.log() - console.log(785, "was stopped", was_stopped); if(!chromecastAvailable){ if(Helper.mobilecheck()) { Helper.css("#playpause", "visibility", "visible"); @@ -647,21 +573,6 @@ var Player = { } else if(soundcloud_loading){ Player.soundcloud_player.seek((seekTo) * 1000); Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100); - /*Player.soundcloud_player.getCurrentSound(function(sound) { - console.log(sound, sound.uri, sound.uri.replace("https://api.soundcloud.com", "")) - SC.stream(sound.uri.replace("https://api.soundcloud.com", "")).then(function(player){ - console.log(player); - player.play().then(function(){ - console.log('Playback started!'); - }).catch(function(e){ - console.error('Playback rejected. Try calling play() from a user interaction.', e); - }); - }); - Helper.removeClass(".soundcloud_info_container", "hide"); - document.querySelector(".soundcloud_info_container .green").href = sound.purchase_url; - document.querySelector(".soundcloud_info_container .red").href = sound.user.permalink_url; - console.log(sound); - });*/ soundcloud_loading = false; } if(embed) { @@ -692,7 +603,6 @@ var Player = { if((was_stopped) && !offline) { /*var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true); if(u == undefined) u = "";*/ - console.log("Emit for position"); paused = false; was_stopped = false; socket.emit('pos', {channel: chan.toLowerCase()}); @@ -706,17 +616,6 @@ var Player = { soundcloudReady: function() { beginning = true; player_ready = true; - /*SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.FINISH, Player.soundcloudFinish); - SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PAUSE, Player.soundcloudPause); - SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.PLAY, Player.soundcloudPlay);*/ - /*SC.Widget(Player.soundcloud_player).load("https://soundcloud.com/kid-astray/kid-astray-back-to-the-ordinary", { - auto_play: false, - buying:false, - sharing:false, - download:false, - show_user:false, - });*/ - if(videoSource == "soundcloud" && videoId != undefined) Player.loadVideoById(videoId, Player.np.duration, Player.np.start, Player.np.end); }, @@ -918,16 +817,11 @@ var Player = { document.getElementById("bar").style.width = per+"%"; } if(videoSource == "soundcloud") { - console.log(currDurr, Player.np.end, Player.soundcloud_player.isPlaying()); if(Math.ceil(currDurr) + 1 > Player.np.end && Player.soundcloud_player.isPlaying()) { end_programmatically = true; - if(!offline) { Player.soundcloud_player.pause(); was_stopped = false; - console.log(1071, "was stopped", was_stopped); - /*var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true); - if(u == undefined) u = "";*/ socket.emit("end", {id: video_id, channel: chan.toLowerCase()}); } else { Player.playNext(); @@ -940,9 +834,6 @@ var Player = { if(!offline) { Player.player.pauseVideo(); was_stopped = false; - console.log(1086, "was stopped", was_stopped); - /*var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true); - if(u == undefined) u = "";*/ socket.emit("end", {id: video_id, channel: chan.toLowerCase()}); } else { Player.playNext(); @@ -987,7 +878,6 @@ var Player = { SC.initialize({ client_id: '***REMOVED***' }, function() { - console.log("Loaded streamer"); }); } } diff --git a/server/public/assets/js/playercontrols.js b/server/public/assets/js/playercontrols.js index d1c477f6..0aef12e7 100755 --- a/server/public/assets/js/playercontrols.js +++ b/server/public/assets/js/playercontrols.js @@ -8,7 +8,6 @@ var Playercontrols = { }, initControls: function() { - console.log("init controls"); document.getElementById("volume-button").addEventListener("click", Playercontrols.mute_video); document.getElementById("playpause").addEventListener("click", Playercontrols.play_pause); document.getElementById("volume-button-overlay").addEventListener("click", Playercontrols.mute_video); @@ -190,7 +189,6 @@ var Playercontrols = { }, play_pause: function() { - console.log("play pause here"); if(!chromecastAvailable){ if(videoSource == "soundcloud") { if(!Player.soundcloud_player.isPlaying()) { @@ -226,7 +224,6 @@ var Playercontrols = { }, play_pause_show: function() { - console.log("pause2"); if(chromecastAvailable){ if(document.getElementById("play").classList.contains("hide")){ Player.pauseVideo(); @@ -357,9 +354,7 @@ var Playercontrols = { }, playPause: function() { - console.log("playpause", videoSource); if(videoSource == "soundcloud") { - console.log("hello"); if(!Player.soundcloud_player.isPlaying()) { Helper.addClass("#play", "hide"); Helper.removeClass("#pause", "hide"); diff --git a/server/public/assets/js/search.js b/server/public/assets/js/search.js index 98b8816f..a29a864c 100755 --- a/server/public/assets/js/search.js +++ b/server/public/assets/js/search.js @@ -220,7 +220,6 @@ var Search = { //var thumb = null; if(thumb == null) thumb = song.waveform_url; else thumb = thumb.replace("-large.jpg", "-t500x500.jpg"); - console.log(song); //$("#results").append(result_html); var songs = pre_result.cloneNode(true); songs.querySelector(".search-title").innerText = title; @@ -252,7 +251,6 @@ var Search = { fresh = true; } document.getElementById("results_soundcloud").innerHTML = ""; - //console.log(output); if(output.length > 0) { if(document.querySelector("#results").innerHTML.length > 0) { Helper.css(".search_results", "display", "block"); @@ -631,7 +629,6 @@ addVideos: function(ids){ }, submit: function(id,title,duration, playlist, num, full_num, start, end, source, thumbnail){ - console.log(id,title,duration, playlist, num, full_num, start, end, source, thumbnail); if((client || Helper.mobilecheck()) && !socket_connected) { add_ajax(id, title, duration, playlist, num, full_num, start, end, source, thumbnail); return; diff --git a/server/public/partials/channel/players.handlebars b/server/public/partials/channel/players.handlebars index 71f625a3..77658927 100644 --- a/server/public/partials/channel/players.handlebars +++ b/server/public/partials/channel/players.handlebars @@ -3,7 +3,7 @@
{{/unless}}
- +
@@ -16,8 +16,7 @@ - Buy - Artist + Artist
Waiting for Video