-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes and improves streaming, and introduces usability improvements. Features: Mute state persists in cookie. No longer streams audio when muted longer than one song; saves energy, bandwidth. Added playback gap setting, which pads start and end of song playback. Confirmation dialog if you try to navigate away while you're a DJ. Modifications: Simplified segment streaming, should fix initial playback skips. Queue items show song duration instead of album name. Made playback progress bar thinner in middle. Added placeholder text to search results when query is blank. Fixed: Fixed users' names not updating from login info. Fixed sending superfluous room:song:stop messages when song ends. Fixed upload button not disabling when disconnected. Package Changes: Upgraded fluent-ffmpeg from v2rc2 to v2rc3.
- Loading branch information
Showing
15 changed files
with
422 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "name": "DJ", | ||
| "description": "A virtual DJ website, where you can play and listen to music together. Inspired by turntable.fm.", | ||
| "version": "1.3.2-alpha", | ||
| "version": "1.4.0-alpha", | ||
| "author": "Drew Gottlieb (dag10) <[email protected]>", | ||
| "repository": { | ||
| "type": "git", | ||
|
|
@@ -18,7 +18,7 @@ | |
| "winston": "0.7.2", | ||
| "sanitizer": "0.1.1", | ||
| "multiparty": "git://github.com/andrewrk/node-multiparty.git#3.3.0", | ||
| "fluent-ffmpeg": "2.0.0-rc2", | ||
| "fluent-ffmpeg": "2.0.0-rc3", | ||
| "socket.io": "0.9.15", | ||
| "underscore": "1.5.2", | ||
| "backbone": "1.1.0", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /*! | ||
| * jQuery Cookie Plugin v1.4.1 | ||
| * https://github.com/carhartl/jquery-cookie | ||
| * | ||
| * Copyright 2013 Klaus Hartl | ||
| * Released under the MIT license | ||
| */ | ||
| (function (factory) { | ||
| if (typeof define === 'function' && define.amd) { | ||
| // AMD | ||
| define(['jquery'], factory); | ||
| } else if (typeof exports === 'object') { | ||
| // CommonJS | ||
| factory(require('jquery')); | ||
| } else { | ||
| // Browser globals | ||
| factory(jQuery); | ||
| } | ||
| }(function ($) { | ||
|
|
||
| var pluses = /\+/g; | ||
|
|
||
| function encode(s) { | ||
| return config.raw ? s : encodeURIComponent(s); | ||
| } | ||
|
|
||
| function decode(s) { | ||
| return config.raw ? s : decodeURIComponent(s); | ||
| } | ||
|
|
||
| function stringifyCookieValue(value) { | ||
| return encode(config.json ? JSON.stringify(value) : String(value)); | ||
| } | ||
|
|
||
| function parseCookieValue(s) { | ||
| if (s.indexOf('"') === 0) { | ||
| // This is a quoted cookie as according to RFC2068, unescape... | ||
| s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); | ||
| } | ||
|
|
||
| try { | ||
| // Replace server-side written pluses with spaces. | ||
| // If we can't decode the cookie, ignore it, it's unusable. | ||
| // If we can't parse the cookie, ignore it, it's unusable. | ||
| s = decodeURIComponent(s.replace(pluses, ' ')); | ||
| return config.json ? JSON.parse(s) : s; | ||
| } catch(e) {} | ||
| } | ||
|
|
||
| function read(s, converter) { | ||
| var value = config.raw ? s : parseCookieValue(s); | ||
| return $.isFunction(converter) ? converter(value) : value; | ||
| } | ||
|
|
||
| var config = $.cookie = function (key, value, options) { | ||
|
|
||
| // Write | ||
|
|
||
| if (value !== undefined && !$.isFunction(value)) { | ||
| options = $.extend({}, config.defaults, options); | ||
|
|
||
| if (typeof options.expires === 'number') { | ||
| var days = options.expires, t = options.expires = new Date(); | ||
| t.setTime(+t + days * 864e+5); | ||
| } | ||
|
|
||
| return (document.cookie = [ | ||
| encode(key), '=', stringifyCookieValue(value), | ||
| options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE | ||
| options.path ? '; path=' + options.path : '', | ||
| options.domain ? '; domain=' + options.domain : '', | ||
| options.secure ? '; secure' : '' | ||
| ].join('')); | ||
| } | ||
|
|
||
| // Read | ||
|
|
||
| var result = key ? undefined : {}; | ||
|
|
||
| // To prevent the for loop in the first place assign an empty array | ||
| // in case there are no cookies at all. Also prevents odd result when | ||
| // calling $.cookie(). | ||
| var cookies = document.cookie ? document.cookie.split('; ') : []; | ||
|
|
||
| for (var i = 0, l = cookies.length; i < l; i++) { | ||
| var parts = cookies[i].split('='); | ||
| var name = decode(parts.shift()); | ||
| var cookie = parts.join('='); | ||
|
|
||
| if (key && key === name) { | ||
| // If second argument (value) is a function it's a converter... | ||
| result = read(cookie, value); | ||
| break; | ||
| } | ||
|
|
||
| // Prevent storing a cookie that we couldn't decode. | ||
| if (!key && (cookie = read(cookie)) !== undefined) { | ||
| result[name] = cookie; | ||
| } | ||
| } | ||
|
|
||
| return result; | ||
| }; | ||
|
|
||
| config.defaults = {}; | ||
|
|
||
| $.removeCookie = function (key, options) { | ||
| if ($.cookie(key) === undefined) { | ||
| return false; | ||
| } | ||
|
|
||
| // Must not alter options, thus extending a fresh object... | ||
| $.cookie(key, '', $.extend({}, options, { expires: -1 })); | ||
| return !$.cookie(key); | ||
| }; | ||
|
|
||
| })); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.