From d729d5f58fa4a4a30e252ab063bcf636559945b0 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 14 Nov 2014 16:43:26 -0500
Subject: soundcloud support

---
 .../assets/javascripts/mx/primitives/mx.image.js   |   2 +-
 .../javascripts/mx/primitives/mx.soundcloud.js     | 122 +++++++++++++++++++++
 2 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 public/assets/javascripts/mx/primitives/mx.soundcloud.js

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

diff --git a/public/assets/javascripts/mx/primitives/mx.image.js b/public/assets/javascripts/mx/primitives/mx.image.js
index 575e9c0..b8557bf 100644
--- a/public/assets/javascripts/mx/primitives/mx.image.js
+++ b/public/assets/javascripts/mx/primitives/mx.image.js
@@ -12,7 +12,7 @@ MX.Image = MX.Object3D.extend({
 		this.backface = ops.backface || false
 			
 		ops.className && this.el.classList.add(ops.className)
-		this.backface && this.el.classList.add("backface-visible")		
+		this.backface && this.el.classList.add("backface-visible")
 		this.el.classList.add("image")
 		this.el.classList.add("mx-scenery")
 
diff --git a/public/assets/javascripts/mx/primitives/mx.soundcloud.js b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
new file mode 100644
index 0000000..6ac64bb
--- /dev/null
+++ b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
@@ -0,0 +1,122 @@
+MX.Soundcloud = MX.Object3D.extend({
+  init: function (ops) {
+  
+  	this.type = "Soundcloud"
+		this.media = ops.media
+    this.width = 0
+    this.height = 0
+		this.x = ops.x || 0
+		this.y = ops.y || 0
+		this.z = ops.z || 0
+		this.scale = ops.scale || 1
+		this.backface = ops.backface || false
+			
+		ops.className && this.el.classList.add(ops.className)
+		this.backface && this.el.classList.add("backface-visible")
+		this.el.classList.add("audio")
+		this.el.classList.add("mx-scenery")
+
+		this.el.style.backgroundRepeat = 'no-repeat'
+
+  	this.ops = ops
+  },
+
+  load: function(ops){
+    if (ops) {
+      ops = this.ops = defaults(ops, this.ops)
+    }
+    else {
+      ops = this.ops
+    }
+
+  	this.width = ops.media.width
+  	this.height = ops.media.height
+
+  	var tag = Parser.lookup.soundcloud.tag(ops.media)
+  	var $iframe = $(tag)
+  	var iframe = $iframe[0]
+  	$iframe.css('z-index', '-1')
+  	this.el.appendChild( iframe )
+
+  	var overlay = this.overlay = document.createElement("div")
+  	overlay.style.width = "100%"
+  	overlay.style.height = "100%"
+  	overlay.style.position = "absolute"
+  	overlay.style.top = "0"
+  	overlay.style.left = "0"
+  	overlay.style.zIndex = "2"
+  	overlay.className = "overlay"
+  	this.el.appendChild(overlay)
+  	
+  	this.player = SC.Widget( iframe )
+  	this.player.setVolume(80)
+  	
+  	this.duration = 0
+  	
+  	this.player.bind(SC.Widget.Events.READY, this.ready.bind(this))
+//   	this.player.bind(SC.Widget.Events.LOAD_PROGRESS, this.loadProgress.bind(this))
+//   	this.player.bind(SC.Widget.Events.PLAY_PROGRESS, this.playProgress.bind(this))
+  	this.player.bind(SC.Widget.Events.PLAY, this.didPlay.bind(this))
+  	this.player.bind(SC.Widget.Events.PAUSE, this.didPause.bind(this))
+  	this.player.bind(SC.Widget.Events.FINISH, this.finished.bind(this))
+  },
+  
+  ready: function(){
+  	if (this.media.autoplay) {
+  	  this.play()
+  	}
+
+  	this.player.getDuration(function(duration){
+  	  this.duration = duration
+  	}.bind(this))
+  },
+  
+  play: function(){
+    this.player.play()
+  },
+  
+  pause: function(){
+    this.player.pause()
+  },
+
+  toggle: function(state){
+    if (typeof state === "boolean") {
+      if (state) this.play()
+      else this.pause()
+    }
+    else {
+      this.player.toggle()
+    }
+  },
+  
+  seek: function(n){
+		if (n < 1) {
+			n = n * this.duration
+		}
+		this.player.seekTo(n)
+  },
+
+  setLoop: function(state){
+		this.media.loop = state
+  },
+  
+  didPlay: function(){
+    this.paused = false
+  },
+  
+  didPause: function(){
+    this.paused = true
+  },
+  
+  finished: function(){
+  	console.log("soundcloud finished")
+  	if (this.media.loop) {
+  		this.seek(0)
+  		this.play()
+  	}
+  	else if (this.bound) {
+  		$(".playButton").removeClass('playing')
+  	}
+  },
+  
+})
-- 
cgit v1.2.3-70-g09d2


From 61343137b4600aa225318de352b06de6aa4d1707 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 14 Nov 2014 17:29:25 -0500
Subject: audio settings

---
 public/assets/javascripts/mx/primitives/mx.soundcloud.js | 3 +++
 public/assets/javascripts/ui/lib/Parser.js               | 3 +--
 views/controls/editor/media-editor.ejs                   | 8 +++++---
 views/controls/reader/media-player.ejs                   | 2 +-
 4 files changed, 10 insertions(+), 6 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 6ac64bb..75286d9 100644
--- a/public/assets/javascripts/mx/primitives/mx.soundcloud.js
+++ b/public/assets/javascripts/mx/primitives/mx.soundcloud.js
@@ -17,6 +17,7 @@ MX.Soundcloud = MX.Object3D.extend({
 		this.el.classList.add("mx-scenery")
 
 		this.el.style.backgroundRepeat = 'no-repeat'
+		this.paused = true
 
   	this.ops = ops
   },
@@ -62,6 +63,8 @@ MX.Soundcloud = MX.Object3D.extend({
   },
   
   ready: function(){
+		this.seek( this.media.keyframe || 0 )
+
   	if (this.media.autoplay) {
   	  this.play()
   	}
diff --git a/public/assets/javascripts/ui/lib/Parser.js b/public/assets/javascripts/ui/lib/Parser.js
index 87d52ef..8bc0310 100644
--- a/public/assets/javascripts/ui/lib/Parser.js
+++ b/public/assets/javascripts/ui/lib/Parser.js
@@ -132,8 +132,7 @@ var Parser = {
 						type: "soundcloud",
 						token: result.id,
 						thumbnail: result.artwork_url || result.user.avatar_url,
-						title: result.title,
-						description: result.user.username,
+						title: result.user.username + " - " + result.title,
 						width: 166,
 						height: 166,
 					})
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 1f4f720..99746e8 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -11,7 +11,7 @@
 		<textarea name="description" placeholder="short description"></textarea>
 	</div>
 	
-	<div class="video setting">
+	<div class="video audio setting">
 		<span class="playButton" data-role="play-media">
 			<span class="on ion-ios7-play-outline"></span>
 			<span class="off ion-ios7-pause-outline"></span>
@@ -21,15 +21,17 @@
 		ion-volume-mute
  -->
 	</div>
-	<div class="video setting">
+	<div class="video audio setting">
 		<input type="checkbox" name="autoplay" value="1" id="video_autoplay">
 		<label for="video_autoplay">Autoplay</label>
 		<input type="checkbox" name="loop" value="1" id="video_loop">
 		<label for="video_loop">Loop</label>
+    <span class="video">
 		<input type="checkbox" name="mute" value="1" id="video_mute">
 		<label for="video_mute">Mute</label>
+		</span>
 	</div>
-	<div class="video setting">
+	<div class="video audio setting">
 		<label for="video-keyframe">Initial Still</label>
 		<br>
 		<input type="range" min="0" max="1" value="0" step="0.01" name="keyframe" id="video-keyframe">
diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs
index 9872592..cac9992 100644
--- a/views/controls/reader/media-player.ejs
+++ b/views/controls/reader/media-player.ejs
@@ -1,6 +1,6 @@
 <div class="vvbox settings" id="mediaPlayer">
 
-	<span class="playButton video" data-role="play-media">
+	<span class="playButton video audio" data-role="play-media">
 		<span class="on ion-play"></span>
 		<span class="off ion-pause"></span>
 	</span>
-- 
cgit v1.2.3-70-g09d2