Publisher and soundcloud attribute, streamer

- More attribute to publisher and soundcloud
- Started using the streamer api instead of widget api

gulpfile.js

@@ -5,11 +5,11 @@ var gulp    = require('gulp'),
 
 gulp.task('js', function () {
     gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/token*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js'])
-        .pipe(uglify({
+        /*.pipe(uglify({
         	mangle: true,
             compress: true,
         	enclose: true
-        }))
+        }))*/
         .pipe(concat('main.min.js'))
         .pipe(gulp.dest('server/public/assets/dist'));
 });

server/public/assets/css/style.css

@@ -126,10 +126,15 @@ a {
 .soundcloud_info_container {
     position: absolute;
     bottom: 20px;
-    left: 20px;
+    right: 0px;
+    padding-left: 20px;
     display: flex;
-    width: 35%;
+    align-items: center;
-    justify-content: space-between;
+    background: rgba(0,0,0,.7);
+}
+
+.soundcloud_info_container a {
+    margin: 0 10px;
 }
 
 #player_loader_container {

server/public/assets/js/channel.js

@@ -16,7 +16,7 @@ var Channel = {
             Helper.addClass(".pagination-results", "client-pagination-height");
             Helper.addClass(".control-list", "client-control-list");
         } else {
-            Player.soundcloud_player = document.querySelector("#soundcloud_player");
+            //Player.soundcloud_player = document.querySelector("#soundcloud_player");
         }
         if(!Admin.logged_in) Admin.display_logged_out();
         number_suggested = 0;

server/public/assets/js/listeners.js

@@ -5,7 +5,7 @@ var client = false;
 if(domain.length > 0 && domain[0] == "client") {
     client = true;
 }
-var _SC1;
+var SC;
 var _SC2;
 var firstLoad = "";
 var videoSource;
@@ -211,7 +211,7 @@ window.addEventListener("DOMContentLoaded", function() {
                 tagS.onload = function() {
                     if(firstLoad == "") {
                         firstLoad = "widget";
-                        _SC1 = SC;
+                        SC = SC;
                     }
 
                     tagSearch            = document.createElement('script');
@@ -226,12 +226,12 @@ window.addEventListener("DOMContentLoaded", function() {
                             _SC2 = SC;
                         } else {
                             _SC2 = SC;
-                            SC = _SC1;
+                            SC = SC;
-                            _SC1 = _SC2;
+                            SC = _SC2;
                         }
                         console.log("loaded1")
-                        window._SC1 = _SC1;
+                        window.SC = SC;
-                        _SC1.initialize({
+                        SC.initialize({
                           client_id: '***REMOVED***'
                         });
                     }

server/public/assets/js/player.js

@@ -7,7 +7,7 @@ var Player = {
     stopInterval: false,
     fireplace: "",
     np: {},
-    soundcloud_player: document.querySelector('#soundcloud_player'),
+    soundcloud_player: undefined,
 
     youtube_listener: function(obj) {
         if(obj.np != undefined) {
@@ -207,7 +207,8 @@ var Player = {
             //Playercontrols.play_pause();
         } else {
             if(videoSource == "soundcloud") {
-                SC.Widget(document.querySelector("#soundcloud_player")).play();
+                Player.soundcloud_player.play();
+                //SC.Widget(document.querySelector("#soundcloud_player")).play();
             } else {
                 Player.player.playVideo();
             }
@@ -225,7 +226,8 @@ var Player = {
         } else {
             paused = true;
             if(videoSource == "soundcloud") {
-                SC.Widget(document.querySelector("#soundcloud_player")).pause();
+                Player.soundcloud_player.pause();
+                //SC.Widget(document.querySelector("#soundcloud_player")).pause();
             } else {
                 Player.player.pauseVideo();
             }
@@ -253,49 +255,112 @@ var Player = {
         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.src.indexOf(id) > -1) {
+
+        //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).seekTo((seekTo) * 1000);
-            SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume());
+            SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume());*/
             soundcloud_loading = false;
             if(_autoplay) {
-                SC.Widget(Player.soundcloud_player).isPaused(function(paused) {
+                /*SC.Widget(Player.soundcloud_player).isPaused(function(paused) {
                     if(paused) SC.Widget(Player.soundcloud_player).play();
-                });
+                });*/
             }
-            SC.Widget(Player.soundcloud_player).getCurrentSound(function(sound) {
+            //Player.soundcloud_player.listenTo("/tracks/" + id);
+            /*SC.Widget(Player.soundcloud_player).getCurrentSound(function(sound) {
                 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 {
+        //} else {
             var _autoAdd = "false";
             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.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 = '<iframe width="100%" id="soundcloud_player" height="166" scrolling="no" frameborder="no" style="visibility: hidden;z-index: -999;" \
-              src="https://w.soundcloud.com/player/?url=' + id + '&auto_play=' + _autoAdd + '&buying=false&sharing=false&download=false&show_user=false"> \
+              src="https://w.soundcloud.com/player/?url=' + id + '&auto_play=' + _autoAdd + '"> \
             </iframe>';
-            Player.soundcloud_player = document.querySelector("#soundcloud_player");
+            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;
+                player.play().then(function(){
+                    console.log(id);
+                    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.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.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).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);
+            //SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000);
             if(!document.hasFocus()) {
-                SC.Widget(Player.soundcloud_player).play();
+                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);*/
             }
+        //}
         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");
@@ -329,7 +394,7 @@ var Player = {
             } else {
             //window.player = Player.player;
                 try {
-                    SC.Widget(Player.soundcloud_player).pause();
+                    Player.soundcloud_player.pause();
                 } catch(e) {
                 }
                 Helper.addClass(".soundcloud_info_container", "hide");
@@ -372,7 +437,7 @@ var Player = {
 
         } else {
             try {
-                SC.Widget(Player.soundcloud_player).pause();
+                Player.soundcloud_player.pause();
             } catch(e) {
             }
             Helper.addClass(document.getElementById("player_overlay"), "hide");
@@ -401,7 +466,7 @@ var Player = {
             castSession.setVolume(vol/100);
         } else {
             Player.player.setVolume(vol);
-            SC.Widget(Player.soundcloud_player).setVolume(vol);
+            Player.soundcloud_player.setVolume(vol / 100);
         }
     },
 
@@ -534,7 +599,7 @@ var Player = {
     soundcloudFinish: function() {
         playing = false;
         paused  = false;
-
+        end_programmatically = true;
         if(!offline) {
             /*var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
             if(u == undefined) u = "";*/
@@ -551,6 +616,7 @@ var Player = {
             end_programmatically = false;
         } else {
             was_stopped = true;
+            console.log()
             console.log(785, "was stopped", was_stopped);
             if(!chromecastAvailable){
                 if(Helper.mobilecheck()) {
@@ -573,16 +639,25 @@ var Player = {
     soundcloudPlay: function() {
         Helper.addClass("#player_loader_container", "hide");
         if(videoSource == "youtube") {
-            SC.Widget(Player.soundcloud_player).pause();
+            Player.soundcloud_player.pause();
         } else if(soundcloud_loading){
-            SC.Widget(Player.soundcloud_player).seekTo((seekTo) * 1000);
+            Player.soundcloud_player.seek((seekTo) * 1000);
-            SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume());
+            Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100);
-            SC.Widget(Player.soundcloud_player).getCurrentSound(function(sound) {
+            /*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) {
@@ -625,9 +700,11 @@ var Player = {
     },
 
     soundcloudReady: function() {
-        SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.FINISH, Player.soundcloudFinish);
+        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).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,
@@ -805,9 +882,7 @@ var Player = {
                 dMinutes = Math.floor(duration / 60);
                 dSeconds = duration - dMinutes * 60;
                 if(videoSource == "soundcloud") {
-                    SC.Widget(Player.soundcloud_player).getPosition(function(dur) {
+                    currDurr = Math.floor(Player.soundcloud_player.currentTime()) / 1000;
-                        currDurr = Math.floor(dur) / 1000;
-                    });
                 } else {
                     currDurr = Player.player.getCurrentTime() !== undefined ? Math.floor(Player.player.getCurrentTime()) : seekTo;
                 }
@@ -839,13 +914,12 @@ var Player = {
                     document.getElementById("bar").style.width = per+"%";
                 }
                 if(videoSource == "soundcloud") {
-
+                    console.log(currDurr, Player.np.end, Player.soundcloud_player.isPlaying());
-                    SC.Widget(Player.soundcloud_player).isPaused(function(paused) {
+                        if(Math.ceil(currDurr) + 1 > Player.np.end && Player.soundcloud_player.isPlaying()) {
-                        if(Math.ceil(currDurr) > Player.np.end && !paused) {
                             end_programmatically = true;
 
                             if(!offline) {
-                                SC.Widget(Player.soundcloud_player).pause();
+                                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);
@@ -855,7 +929,6 @@ var Player = {
                                 Player.playNext();
                             }
                         }
-                    });
                 } else {
                     if(Player.player.getCurrentTime() > Player.np.end && Player.player.getPlayerState() == YT.PlayerState.PLAYING) {
                         end_programmatically = true;
@@ -883,7 +956,7 @@ var Player = {
         if(document.querySelectorAll("script[src='https://www.youtube.com/iframe_api']").length == 1){
             try{
                 Player.onYouTubeIframeAPIReady();
-                SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.READY, Player.soundcloudReady);
+                //SC.Widget(Player.soundcloud_player).bind("ready", Player.soundcloudReady);
                 Player.soundcloudReady();
             } catch(error){
                 console.error("Seems YouTube iFrame script isn't correctly loaded. Please reload the page.");
@@ -896,8 +969,8 @@ var Player = {
 
             tag.onload = function() {
                 if(document.querySelectorAll("script[src='https://w.soundcloud.com/player/api.js']").length == 1) {
-                    SC.Widget(Player.soundcloud_player);
+                    //SC.Widget(Player.soundcloud_player);
-                    SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.READY, Player.soundcloudReady);
+                    //SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.READY, Player.soundcloudReady);
                 } else {
                     tagS            = document.createElement('script');
                     tagS.src        = "https://w.soundcloud.com/player/api.js";
@@ -906,13 +979,6 @@ var Player = {
                     tagS.setAttribute("async", true);
 
 
-                    tagS.onload = function() {
-                        if(firstLoad == "") {
-                            firstLoad = "widget";
-                            _SC1 = SC;
-                        }
-                        SC.Widget(Player.soundcloud_player);
-                        SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.READY, Player.soundcloudReady);
                     tagSearch            = document.createElement('script');
                     tagSearch.setAttribute("async", true);
                     tagSearch.src        = "https://connect.soundcloud.com/sdk/sdk-3.3.0.js";
@@ -920,23 +986,15 @@ var Player = {
                     firstScriptTag.parentNode.insertBefore(tagSearch, firstScriptTag);
 
                     tagSearch.onload = function() {
-                            if(firstLoad == "") {
+                        SC.initialize({
-                                firstLoad = "search";
-                                _SC2 = SC;
-                            } else {
-                                _SC2 = SC;
-                                SC = _SC1;
-                                _SC1 = _SC2;
-                            }
-                            window._SC1 = _SC1;
-                            _SC1.initialize({
                           client_id: '***REMOVED***'
+                      }, function() {
+                          console.log("Loaded streamer");
                       });
                     }
                 }
             }
         }
     }
-    }
 
 };

server/public/assets/js/search.js

@@ -191,7 +191,7 @@ var Search = {
     },
 
     soundcloudSearch: function(keyword) {
-        _SC1.get('/tracks', {
+        SC.get('/tracks', {
             q: keyword
         }).then(function(tracks) {
 
@@ -214,11 +214,12 @@ var Search = {
                         title = song.user.username +  " - " + title;
                     }
                     var enc_title=title;//encodeURIComponent(title).replace(/'/g, "\\\'");
-                    var id=song.permalink_url;
+                    var id=song.id;
                     //duration = duration.replace("PT","").replace("H","h ").replace("M","m ").replace("S","s");
                     var thumb=song.artwork_url;
                     //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);
@@ -365,8 +366,6 @@ var Search = {
                                             ))
                                             not_matched = true;
                                             else if(duration > 1800) not_matched = true;
-
-
                                         }
                                     }
 

server/public/partials/channel/players.handlebars

@@ -3,11 +3,7 @@
         <div id="fireplace_player" class="ytplayer"></div>
     {{/unless}}
     <div id="player" class="ytplayer"></div>
-    <div id="soundcloud_container">
+    
-        <iframe width="100%" id="soundcloud_player" height="166" scrolling="no" frameborder="no" style="visibility: hidden;z-index: -999;"
-          src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/undefined&amp;{ auto_play: false, buying:false, sharing:false, download:false, show_user:false, }">
-        </iframe>
-    </div>
     <div id="main_components">
         <div id="player_overlay" class="hide valign-wrapper">
             <div id="playing_on">
@@ -17,6 +13,9 @@
                 <div id="chromecast_text"></div>
             </div>
             <div class="soundcloud_info_container hide">
+                <a href="#!" id="soundcloud_listen_link" target="_blank">
+                    <img src="https://developers.soundcloud.com/assets/powered_by_large_white-9c2af6a93ad2b1c541f423d9e9045980.png" />
+                </a>
                 <a href="#!" class="btn green waves-effect waves-light" target="_blank">Buy</a>
                 <a href="#!" class="btn red waves-effect waves-light" target="_blank">Artist</a>
             </div>