From 8453694d7c490e6d95fe25b676cc5c59b234cab6 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 3 Feb 2014 15:51:28 -0500 Subject: [PATCH] convert series providers to new system --- dashboard-ui/scripts/mediaplayer.js | 7 ++++++- dashboard-ui/scripts/wizardfinishpage.js | 3 --- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 36382e5042..e4ef7f6d0f 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -634,8 +634,12 @@ options.push({ name: '720p - 5Mbps', maxWidth: 1280, bitrate: 5000000 }); } else if (maxAllowedWidth >= 470) { + options.push({ name: '480p - 4Mbps', maxWidth: 720, bitrate: 4000000 }); + options.push({ name: '480p - 3.5Mbps', maxWidth: 720, bitrate: 3500000 }); + options.push({ name: '480p - 3Mbps', maxWidth: 720, bitrate: 3000000 }); + options.push({ name: '480p - 2.5Mbps', maxWidth: 720, bitrate: 2500000 }); + options.push({ name: '480p - 2Mbps', maxWidth: 720, bitrate: 2000000 }); options.push({ name: '480p - 1.5Mbps', maxWidth: 720, bitrate: 1500000 }); - options.push({ name: '480p - 1.0Mbps', maxWidth: 720, bitrate: 1000000 }); } if (maxAllowedWidth >= 1270) { @@ -645,6 +649,7 @@ options.push({ name: '720p - 1.5Mbps', maxWidth: 1280, bitrate: 1500000 }); } + options.push({ name: '480p - 1.0Mbps', maxWidth: 720, bitrate: 1000000 }); options.push({ name: '480p - 720 kbps', maxWidth: 720, bitrate: 700000 }); options.push({ name: '480p - 420 kbps', maxWidth: 720, bitrate: 420000 }); options.push({ name: '360p', maxWidth: 640, bitrate: 400000 }); diff --git a/dashboard-ui/scripts/wizardfinishpage.js b/dashboard-ui/scripts/wizardfinishpage.js index 3466ba5161..1398fafb77 100644 --- a/dashboard-ui/scripts/wizardfinishpage.js +++ b/dashboard-ui/scripts/wizardfinishpage.js @@ -6,9 +6,6 @@ config.IsStartupWizardCompleted = true; - // Try migrate everyone over to this. Eventually remove the config setting. - config.EnablePeoplePrefixSubFolders = true; - ApiClient.updateServerConfiguration(config).done(function () { ApiClient.getUsers().done(function (users) {