From e1c8d5c6c9986557470eb47f146bbbc08b1e1f8c Mon Sep 17 00:00:00 2001
From: Calvin Montgomery <calzoneman@gmail.com>
Date: Mon, 23 Mar 2015 16:10:00 -0700
Subject: [PATCH] Fix Ustream

---
 lib/get-info.js  | 6 +++---
 www/js/player.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/get-info.js b/lib/get-info.js
index b8454326..0aacd909 100644
--- a/lib/get-info.js
+++ b/lib/get-info.js
@@ -634,13 +634,13 @@ var Getters = {
              *
              * [](/eatadick)
              */
-            var m = data.match(/cid":([0-9]+)/);
-            if(m) {
+            var m = data.match(/https:\/\/www\.ustream\.tv\/embed\/(\d+)/);
+            if (m) {
                 var title = "Ustream.tv - " + id;
                 var media = new Media(m[1], title, "--:--", "us");
                 callback(false, media);
             } else {
-                callback(true, null);
+                callback("Channel ID not found", null);
             }
         });
     },
diff --git a/www/js/player.js b/www/js/player.js
index e7684e2e..20c8602e 100644
--- a/www/js/player.js
+++ b/www/js/player.js
@@ -796,7 +796,7 @@ var UstreamPlayer = function (data) {
         removeOld(iframe);
         iframe.attr("width", VWIDTH);
         iframe.attr("height", VHEIGHT);
-        iframe.attr("src", "//www.ustream.tv/embed/"+self.videoId+"?v=3&wmode=direct");
+        iframe.attr("src", "//www.ustream.tv/embed/"+self.videoId+"?v=3&wmode=direct&autoplay=1");
         iframe.attr("frameborder", "0");
         iframe.attr("scrolling", "no");
         iframe.css("border", "none");