summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-03-24 13:23:33 -0400
committerJules Laplace <jules@okfoc.us>2015-03-24 13:23:33 -0400
commit3832685358c9d3ad3e0aead51228f29255702007 (patch)
tree51351d62c6653cd5752ed79ab5bfd2d90ac9892d
parentbcf1904e0bdd64353e6d06f922112cf28b1bc87f (diff)
setVolume functions
-rw-r--r--public/assets/javascripts/mx/primitives/mx.video.js5
-rw-r--r--public/assets/javascripts/mx/primitives/mx.vimeo.js5
-rw-r--r--public/assets/javascripts/mx/primitives/mx.youtube.js5
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/types/video.js4
4 files changed, 19 insertions, 0 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js
index c281f02..9138cdd 100644
--- a/public/assets/javascripts/mx/primitives/mx.video.js
+++ b/public/assets/javascripts/mx/primitives/mx.video.js
@@ -87,6 +87,11 @@ MX.Video = MX.Object3D.extend({
this.muted = false
},
+ setVolume: function(n){
+ if (this.muted) return
+ this.player.volume = n
+ },
+
setLoop: function(state){
this.media.loop = state
},
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js
index fe5ce86..bff781b 100644
--- a/public/assets/javascripts/mx/primitives/mx.vimeo.js
+++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js
@@ -130,6 +130,11 @@ MX.Vimeo = MX.Object3D.extend({
this.player.api('setVolume', 0.8)
this.muted = false
},
+
+ setVolume: function(n){
+ if (this.muted) return
+ this.player.api('setVolume', n)
+ },
setLoop: function(state){
this.media.loop = state
diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js
index 5c92378..fad66dd 100644
--- a/public/assets/javascripts/mx/primitives/mx.youtube.js
+++ b/public/assets/javascripts/mx/primitives/mx.youtube.js
@@ -173,6 +173,11 @@ MX.Youtube = MX.Object3D.extend({
this.player.setVolume(80)
this.muted = false
},
+
+ setVolume: function(n){
+ if (this.muted) return
+ this.player.setVolume( floor(n * 100) )
+ },
setLoop: function(state){
this.media.loop = state
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index d1b1763..fb1a868 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -90,6 +90,10 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
}
},
+ setVolume: function(n){
+ this.mx.setVolume(n)
+ },
+
serialize: function(){
var data = base.serialize.call(this)
return data