3 files changed, 42 insertions, 3 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js
index f92fe9f..c5dd749 100644
--- a/public/assets/javascripts/mx/primitives/mx.video.js
+++ b/public/assets/javascripts/mx/primitives/mx.video.js
@@ -30,6 +30,7 @@ MX.Video = MX.Object3D.extend({
     this.player = document.createElement('video')
 		this.player.addEventListener("loadedmetadata", this.ready.bind(this))
 		this.player.addEventListener("error", this.error.bind(this))
+		this.player.addEventListener("ended", this.finished.bind(this))
 		this.player.width = this.width
 		this.player.height = this.height
     this.player.src = this.media.url
@@ -68,13 +69,25 @@ MX.Video = MX.Object3D.extend({
 		this.player.currentTime = n
   },
   
+  mute: function(){
+  	this.player.muted = true
+  },
+  
+  unmute: function(){
+  	this.player.muted = false
+  },
+  
   duration: function(){
   	return this.player.duration
   },
   
   finished: function(){
   	console.log("video finished")
-  	if (this.media.bound) {
+  	if (this.media.loop) {
+  		this.seek(0)
+  		this.play()
+  	}
+  	else if (this.bound) {
   		$(".playButton").removeClass('playing')
   	}
   },
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index 5a373ff..c44464e 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -88,6 +88,14 @@ MX.Vimeo = MX.Object3D.extend({
   duration: function(){
 		return this.player.duration
   },
+
+  mute: function(){
+		this.player.api('setVolume', 0.0)
+  },
+  
+  unmute: function(){
+		this.player.api('setVolume', 0.8)
+  },
   
   onPlay: function(){
   	if (this.paused) {
@@ -102,7 +110,11 @@ MX.Vimeo = MX.Object3D.extend({
   },
   
   finished: function(){
-  	if (this.media.bound) {
+  	if (this.media.loop) {
+  		this.seek(0)
+  		this.play()
+  	}
+  	else if (this.bound) {
   		$(".playButton").removeClass('playing')
   	}
   }
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index a31a24d..68bb5f3 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -79,6 +79,7 @@ MX.Youtube = MX.Object3D.extend({
   
   ready: function(){
   	console.log("youtube ready")
+  	this.seek(0)
   },
   
   error: function(err){
@@ -127,10 +128,23 @@ MX.Youtube = MX.Object3D.extend({
   duration: function(){
   	return this.player.getDuration()
   },
+
+  mute: function(){
+		this.player.mute()
+  },
+  
+  unmute: function(){
+		this.player.unMute()
+		this.player.setVolume(80)
+  },
   
   finished: function(){
   	console.log("youtube finished")
-  	if (this.media.bound) {
+  	if (this.media.loop) {
+  		this.seek(0)
+  		this.play()
+  	}
+  	else if (this.bound) {
   		$(".playButton").removeClass('playing')
   	}
   }