From 0a67e7f8ab74f82212a123dd6c30903124c1e8df Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 24 Mar 2015 17:08:47 -0400
Subject: sound interpolation

---
 public/assets/javascripts/mx/primitives/mx.soundcloud.js | 5 +++++
 public/assets/javascripts/mx/primitives/mx.video.js      | 2 +-
 public/assets/javascripts/mx/primitives/mx.vimeo.js      | 2 +-
 public/assets/javascripts/mx/primitives/mx.youtube.js    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'public/assets/javascripts/mx')

diff --git a/public/assets/javascripts/mx/primitives/mx.soundcloud.js b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
index 75286d9..fecb2f4 100644
--- a/public/assets/javascripts/mx/primitives/mx.soundcloud.js
+++ b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
@@ -102,6 +102,11 @@ MX.Soundcloud = MX.Object3D.extend({
   setLoop: function(state){
 		this.media.loop = state
   },
+
+  setVolume: function(n){
+    if (this.muted || ! this.player) return
+  	this.player.setVolume(floor( n * 100 ))
+  },
   
   didPlay: function(){
     this.paused = false
diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js
index 9138cdd..43c392a 100644
--- a/public/assets/javascripts/mx/primitives/mx.video.js
+++ b/public/assets/javascripts/mx/primitives/mx.video.js
@@ -88,7 +88,7 @@ MX.Video = MX.Object3D.extend({
   },
   
   setVolume: function(n){
-    if (this.muted) return
+    if (this.muted || ! this.player) return
   	this.player.volume = n
   },
   
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index bff781b..ccd0a13 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -132,7 +132,7 @@ MX.Vimeo = MX.Object3D.extend({
   },
 
   setVolume: function(n){
-    if (this.muted) return
+    if (this.muted || ! this.player) return
   	this.player.api('setVolume', n)
   },
   
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index fad66dd..e4e73d6 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -175,7 +175,7 @@ MX.Youtube = MX.Object3D.extend({
   },
 
   setVolume: function(n){
-    if (this.muted) return
+    if (this.muted || ! this.player || ! this.player.setVolume) return
     this.player.setVolume( floor(n * 100) )
   },
   
-- 
cgit v1.2.3-70-g09d2