From 0089f44a4d2968daa9156b8440c3d45ab10ff1dc Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 10 Mar 2016 23:25:56 -0500 Subject: [PATCH] update packaging --- .../bower_components/emby-webcomponents/.bower.json | 8 ++++---- .../bower_components/emby-webcomponents/browser.js | 2 +- .../emby-webcomponents/browserdeviceprofile.js | 4 ++-- dashboard-ui/bower_components/iron-icon/.bower.json | 6 +++--- dashboard-ui/scripts/librarymenu.js | 3 ++- dashboard-ui/scripts/mediaplayer.js | 13 +++++++++++-- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 3e3c5a7398..ac83d5ef6b 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.1.32", - "_release": "1.1.32", + "version": "1.1.33", + "_release": "1.1.33", "_resolution": { "type": "version", - "tag": "1.1.32", - "commit": "0aa9676c2790f9ac6cb32f259d750079cf89ae0c" + "tag": "1.1.33", + "commit": "9933aefe464ffcf5a3a29851ec0f34ff088d0ff5" }, "_source": "git://github.com/MediaBrowser/emby-webcomponents.git", "_target": "~1.1.5", diff --git a/dashboard-ui/bower_components/emby-webcomponents/browser.js b/dashboard-ui/bower_components/emby-webcomponents/browser.js index 30b90cc975..d30e32e611 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browser.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browser.js @@ -96,7 +96,7 @@ browser.xboxOne = userAgent.toLowerCase().indexOf('xbox') != -1; browser.animate = document.documentElement.animate != null; browser.tizen = userAgent.toLowerCase().indexOf('tizen') != -1; - browser.webos = userAgent.toLowerCase().indexOf('webos') != -1; + browser.web0s = userAgent.toLowerCase().indexOf('Web0S'.toLowerCase()) != -1; browser.tv = isTv(); diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js index 4d4f0e094e..77a566ed61 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js @@ -100,7 +100,7 @@ define(['browser'], function (browser) { function testCanPlayTs() { - return browser.tizen || browser.webos; + return browser.tizen || browser.web0s; } function getDirectPlayProfileForVideoContainer(container) { @@ -123,7 +123,7 @@ define(['browser'], function (browser) { break; case 'm2ts': case 'wmv': - supported = browser.tizen || browser.webos; + supported = browser.tizen || browser.web0s; break; default: break; diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json index f0167baf13..9784e3a3b7 100644 --- a/dashboard-ui/bower_components/iron-icon/.bower.json +++ b/dashboard-ui/bower_components/iron-icon/.bower.json @@ -32,14 +32,14 @@ "web-component-tester": "^4.0.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/polymerelements/iron-icon", + "homepage": "https://github.com/PolymerElements/iron-icon", "_release": "1.0.8", "_resolution": { "type": "version", "tag": "v1.0.8", "commit": "f36b38928849ef3853db727faa8c9ef104d611eb" }, - "_source": "git://github.com/polymerelements/iron-icon.git", + "_source": "git://github.com/PolymerElements/iron-icon.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-icon" + "_originalSource": "PolymerElements/iron-icon" } \ No newline at end of file diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 060db4141b..947cf323ec 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -83,8 +83,8 @@ } if (headerUserButton) { - headerUserButton.icon = null; headerUserButton.src = url; + headerUserButton.icon = null; headerUserButton.classList.add('headerUserButtonRound'); hasImage = true; } @@ -94,6 +94,7 @@ if (headerUserButton && !hasImage) { headerUserButton.icon = 'person'; headerUserButton.src = null; + headerUserButton.removeAttribute('src'); headerUserButton.classList.remove('headerUserButtonRound'); // Looks like a bug in paper-icon-button that this doesn't get removed diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 6859af0609..51df21f435 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -47,8 +47,8 @@ define(['appSettings', 'userSettings', 'appStorage'], function (appSettings, use function updateDeviceProfileForAndroid(profile) { // Just here as an easy escape out, if ever needed - var enableVlcVideo = window.VlcAudio; - var enableVlcAudio = true; + var enableVlcVideo = true; + var enableVlcAudio = window.VlcAudio; if (enableVlcVideo) { @@ -151,6 +151,15 @@ define(['appSettings', 'userSettings', 'appStorage'], function (appSettings, use Value: '41' }] }); + + profile.TranscodingProfiles.filter(function (p) { + + return p.Type == 'Video' && p.VideoCodec == 'h264'; + + }).forEach(function (p) { + + p.AudioCodec += ',ac3'; + }); } if (enableVlcAudio) {