specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add JWPlayer support

Browse source
This commit is contained in:
calzoneman 2013-04-28 17:06:58 -05:00
parent 4bdbac3dbd
commit 7f7ae16138
7 changed files with 61 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
channel.js
View file

@ -603,6 +603,13 @@ function mediaUpdate(chan, id) {
setTimeout(function() { mediaUpdate(chan, id); }, 1000);
}
function isLive(type) {
return type == "li"
|| type == "tw"
|| type == "rt"
|| type == "jw";
}
Channel.prototype.enqueue = function(data, user) {
var idx = data.pos == "next" ? this.position + 1 : this.queue.length;
@ -668,9 +675,18 @@ Channel.prototype.enqueue = function(data, user) {
});
this.broadcastPlaylistMeta();
break;
case "jw":
var media = new Media(data.id, "JWPlayer Stream - " + data.id, "--:--", "jw");
media.queueby = user ? user.name : "";
this.queue.splice(idx, 0, media);
this.sendAll("queue", {
media: media.pack(),
pos: idx
});
this.broadcastPlaylistMeta();
break;
default:
break;
}
}
}
@ -784,9 +800,7 @@ Channel.prototype.playNext = function() {
});
// If it's not a livestream, enable autolead
if(this.leader == null && this.media.type != "tw"
&& this.media.type != "li"
&& this.media.type != "rt") {
if(this.leader == null && !isLive(this.media.type)) {
this.time = new Date().getTime();
if(this.media.id != oid) {
mediaUpdate(this, this.media.id);
@ -829,9 +843,7 @@ Channel.prototype.jumpTo = function(pos) {
});
// If it's not a livestream, enable autolead
if(this.leader == null && this.media.type != "tw"
&& this.media.type != "li"
&& this.media.type != "rt") {
if(this.leader == null && !isLive(this.media.type)) {
this.time = new Date().getTime();
if(this.media.id != oid) {
mediaUpdate(this, this.media.id);
@ -908,8 +920,7 @@ Channel.prototype.tryUpdate = function(user, data) {
return;
}
if(this.media.type == "li" || this.media.type == "tw" ||
this.media.type == "rt") {
if(isLive(this.media.type)) {
return;
}
@ -1284,9 +1295,7 @@ Channel.prototype.changeLeader = function(name) {
}
if(name == "") {
this.logger.log("*** Resuming autolead");
if(this.media != null && this.media.type != "li"
&& this.media.type != "tw"
&& this.media.type != "rt") {
if(this.media != null && !isLive(this.media.type)) {
this.time = new Date().getTime();
this.i = 0;
mediaUpdate(this, this.media.id);

2
package.json
View file

@ -2,7 +2,7 @@
"author": "Calvin Montgomery",
"name": "CyTube",
"description": "Online media synchronizer and chat",
"version": "1.4.1",
"version": "1.4.2",
"repository": {
"url": "http://github.com/calzoneman/sync"
},

2
server.js
View file

@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
const VERSION = "1.4.1";
const VERSION = "1.4.2";
var fs = require("fs");
var Logger = require("./logger.js");

4
www/assets/js/functions.js
View file

@ -427,6 +427,10 @@ function parseVideoURL(url){
url = url.trim()
if(typeof(url) != "string")
return null;
if(url.indexOf("jw:") == 0) {
url = url.substring(3);
return [url, "jw"];
}
if(url.indexOf("rtmp://") == 0) {
return [url, "rt"];
}

28
www/assets/js/media.js
View file

@ -25,6 +25,9 @@ var Media = function(data) {
case "rt":
this.initRTMP();
break;
case "jw":
this.initJWPlayer();
break;
default:
break;
}
@ -278,6 +281,31 @@ Media.prototype.initRTMP = function() {
this.seek = function() { }
}
Media.prototype.initJWPlayer = function() {
this.removeOld();
jwplayer("ytapiplayer").setup({
file: this.id,
width: VWIDTH,
height: VHEIGHT,
autostart: true
});
setTimeout(function() {$("#ytapiplayer_logo").remove();}, 1000);
this.load = function(data) {
this.id = data.id;
this.initJWPlayer();
}
this.pause = function() { }
this.play = function() { }
this.getTime = function() { }
this.seek = function() { }
}
Media.prototype.update = function(data) {
if(data.id != this.id) {
if(data.currentTime < 0) {

8
www/help.html
View file

@ -130,15 +130,17 @@
<li>http://www.dailymotion.com/video/(videoid)</li>
<li>http://www.twitch.tv/(channel)</li>
<li>http://www.livestream.com/(channel)</li>
<li>rtmp://(stream url)</li>
<li>jw:(stream url) - uses a JWPlayer embed (use this for audio streams)
</ul>
You can also queue multiple items at once by separating the URLs with commas.
<div>
<input type="text" id="mediaurl" style="margin:auto;">
<div class="btn-group">
<button class="btn">Queue Next</button>
<button class="btn">Queue @ End</button>
<button class="btn">Next</button>
<button class="btn">End</button>
</div>
<button class="btn btn-danger">Voteskip</button>
<button class="btn btn-block">Voteskip</button>
</div>
<p>Below is an example of an entry in the playlist. Please note the control buttons only appear if you are a moderator or if the queue is unlocked. The button with vertical arrows is for moving videos in the playlist. Click and hold the button and drag the mouse up and down to move the video in the playlist. The red "X" button will remove the video from the playlist. The green play button will jump the playlist to that video. The "Next" button will move the video so that it plays after the current video.
</p>

1
www/index.html
View file

@ -254,6 +254,7 @@
<!-- APIs -->
<script src="http://api.dmcdn.net/all.js"></script>
<script src="http://jwpsrv.com/library/QouFCLBMEeKC+CIACpYGxA.js"></script>
<script src="./assets/js/sc.js"></script>
<script src="./assets/js/froogaloop.min.js"></script>
<script src="./assets/js/swf.js"></script>