Change USEROPTS.default_quality values

www/js/data.js

@@ -111,7 +111,7 @@ var USEROPTS = {
     ignore_channeljs     : getOrDefault("ignore_channeljs", false),
     sort_rank            : getOrDefault("sort_rank", true),
     sort_afk             : getOrDefault("sort_afk", false),
-    default_quality      : getOrDefault("default_quality", ""),
+    default_quality      : getOrDefault("default_quality", "auto"),
     boop                 : getOrDefault("boop", "never"),
     secure_connection    : getOrDefault("secure_connection", false),
     show_shadowchat      : getOrDefault("show_shadowchat", false)
@@ -137,6 +137,22 @@ if (["never", "onlyping", "always"].indexOf(USEROPTS.boop) === -1) {
     USEROPTS.boop = "onlyping";
 }
 
+// As of 3.8, preferred quality names are different
+(function () {
+    var fix = {
+        small: "240",
+        medium: "360",
+        large: "480",
+        hd720: "720",
+        hd1080: "1080",
+        highres: "best"
+    };
+
+    if (fix.hasOwnProperty(USEROPTS.default_quality)) {
+        USEROPTS.default_quality = fix[USEROPTS.default_quality];
+    }
+})();
+
 var VOLUME = parseFloat(getOrDefault("volume", 1));
 
 var NO_WEBSOCKETS = USEROPTS.altsocket;

www/js/player-new.js

@@ -162,23 +162,25 @@
       this.pauseSeekRaceCondition = false;
       waitUntilDefined(window, 'YT', (function(_this) {
         return function() {
-          var wmode;
-          removeOld();
-          wmode = USEROPTS.wmode_transparent ? 'transparent' : 'opaque';
-          return _this.yt = new YT.Player('ytapiplayer', {
-            videoId: data.id,
-            playerVars: {
-              autohide: 1,
-              autoplay: 1,
-              controls: 1,
-              iv_load_policy: 3,
-              rel: 0,
-              wmode: wmode
-            },
-            events: {
-              onReady: _this.onReady.bind(_this),
-              onStateChange: _this.onStateChange.bind(_this)
-            }
+          return waitUntilDefined(YT, 'Player', function() {
+            var wmode;
+            removeOld();
+            wmode = USEROPTS.wmode_transparent ? 'transparent' : 'opaque';
+            return _this.yt = new YT.Player('ytapiplayer', {
+              videoId: data.id,
+              playerVars: {
+                autohide: 1,
+                autoplay: 1,
+                controls: 1,
+                iv_load_policy: 3,
+                rel: 0,
+                wmode: wmode
+              },
+              events: {
+                onReady: _this.onReady.bind(_this),
+                onStateChange: _this.onStateChange.bind(_this)
+              }
+            });
           });
         };
       })(this));
@@ -190,7 +192,7 @@
         this.yt.loadVideoById(data.id, data.currentTime);
         this.qualityRaceCondition = true;
         if (USEROPTS.default_quality) {
-          return this.yt.setPlaybackQuality(USEROPTS.default_quality);
+          return this.setQuality(USEROPTS.default_quality);
         }
       } else {
         return console.error('WTF?  YouTubePlayer::load() called but yt is not ready');
@@ -206,7 +208,7 @@
       if (this.qualityRaceCondition) {
         this.qualityRaceCondition = false;
         if (USEROPTS.default_quality) {
-          this.yt.setPlaybackQuality(USEROPTS.default_quality);
+          this.setQuality(USEROPTS.default_quality);
         }
       }
       if (ev.data === YT.PlayerState.PLAYING && this.pauseSeekRaceCondition) {
@@ -253,6 +255,34 @@
       }
     };
 
+    YouTubePlayer.prototype.setQuality = function(quality) {
+      var ytQuality;
+      if (!this.yt || !this.yt.ready) {
+        return;
+      }
+      ytQuality = (function() {
+        switch (String(quality)) {
+          case "240":
+            return "small";
+          case "360":
+            return "medium";
+          case "480":
+            return "large";
+          case "720":
+            return "hd720";
+          case "1080":
+            return "hd1080";
+          case "best":
+            return "highres";
+          default:
+            return "auto";
+        }
+      })();
+      if (ytQuality !== "auto") {
+        return this.yt.setPlaybackQuality(ytQuality);
+      }
+    };
+
     YouTubePlayer.prototype.getTime = function(cb) {
       if (this.yt && this.yt.ready) {
         return cb(this.yt.getCurrentTime());

www/js/ui.js

@@ -296,8 +296,8 @@ $("#userpl_save").click(function() {
 /* video controls */
 
 $("#mediarefresh").click(function() {
-    PLAYER.type = "";
-    PLAYER.id = "";
+    PLAYER.mediaType = "";
+    PLAYER.mediaId = "";
     // playerReady triggers the server to send a changeMedia.
     // the changeMedia handler then reloads the player
     socket.emit("playerReady");