From 78c7a4d77ac7a6b05d417c43513f6b9c0fbd64a2 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Sun, 14 Apr 2013 12:22:09 -0500
Subject: [PATCH] Fix Issue#27

---
 www/assets/js/media.js | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/www/assets/js/media.js b/www/assets/js/media.js
index 0d2e9172..10a2934f 100644
--- a/www/assets/js/media.js
+++ b/www/assets/js/media.js
@@ -42,6 +42,11 @@ Media.prototype.initYouTube = function() {
         events: {
             onPlayerReady: function() {
                 socket.emit("playerReady");
+            },
+            onStateChange: function(ev) {
+                if(LEADER && ev.data == YT.PlayerState.ENDED) {
+                    socket.emit("playNext");
+                }
             }
         }
     });
@@ -87,6 +92,12 @@ Media.prototype.initVimeo = function() {
     $f(iframe[0]).addEvent("ready", function() {
         this.player = $f(iframe[0]);
         this.play();
+
+        this.player.addEvent("finish", function() {
+            if(LEADER) {
+                socket.emit("playNext");
+            }
+        });
     }.bind(this));
 
     this.load = function(data) {
@@ -120,6 +131,12 @@ Media.prototype.initDailymotion = function() {
         params: {autoplay: 1}
     });
 
+    this.player.addEventListener("ended", function(e) {
+        if(LEADER) {
+            socket.emit("playNext");
+        }
+    });
+
     this.load = function(data) {
         this.id = data.id;
         this.player.api("load", data.id);
@@ -153,7 +170,13 @@ Media.prototype.initSoundcloud = function() {
     iframe.css("border", "none");
 
     this.player = SC.Widget("ytapiplayer");
-    setTimeout(function() { this.play(); }.bind(this), 1000);
+    this.player.load(this.id, {auto_play: true});
+
+    this.player.bind(SC.Widget.Events.FINISH, function() {
+        if(LEADER) {
+            socket.emit("playNext");
+        }
+    });
 
     this.load = function(data) {
         this.id = data.id;