diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json index 257ccdae1e..ce2d9e43cc 100644 --- a/dashboard-ui/bower_components/emby-apiclient/.bower.json +++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.0.21", - "_release": "1.0.21", + "version": "1.0.22", + "_release": "1.0.22", "_resolution": { "type": "version", - "tag": "1.0.21", - "commit": "e341b097c05c31ec012e04dfbd0455ae9dfc4929" + "tag": "1.0.22", + "commit": "2b5f83fc8011106b3b97f34a893f47e9a991830d" }, "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_target": "~1.0.3", diff --git a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js index 7f2e84ecaf..03937779c5 100644 --- a/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js +++ b/dashboard-ui/bower_components/emby-apiclient/connectionmanager.js @@ -1123,7 +1123,7 @@ if (options.updateDateLastAccessed !== false) { server.DateLastAccessed = new Date().getTime(); - if (server.LastConnectionMode == ConnectionMode.Local) { + if (connectionMode == ConnectionMode.Local) { server.DateLastLocalConnection = new Date().getTime(); } } diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 3fb667849b..f0fa20a704 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -15,12 +15,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.0.14", - "_release": "1.0.14", + "version": "1.0.15", + "_release": "1.0.15", "_resolution": { "type": "version", - "tag": "1.0.14", - "commit": "a7a8baf260ab509c5f9b1750cbf6fe921883141c" + "tag": "1.0.15", + "commit": "a87cc9a074a449a96302923191bf232ec7cc2911" }, "_source": "git://github.com/MediaBrowser/emby-webcomponents.git", "_target": "~1.0.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js index a7b6658b30..d922bb0bb2 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js +++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js @@ -103,12 +103,23 @@ profile.DirectPlayProfiles = []; + var videoAudioCodecs = []; + if (canPlayMp3) { + videoAudioCodecs.push('mp3'); + } + if (canPlayAac) { + videoAudioCodecs.push('aac'); + } + if (canPlayAc3) { + videoAudioCodecs.push('ac3'); + } + if (supportedFormats.indexOf('h264') != -1) { profile.DirectPlayProfiles.push({ Container: 'mp4,m4v', Type: 'Video', VideoCodec: 'h264', - AudioCodec: 'aac' + (canPlayMp3 ? ',mp3' : '') + (canPlayAc3 ? ',ac3' : '') + AudioCodec: videoAudioCodecs.join(',') }); } @@ -117,7 +128,7 @@ Container: 'mkv,mov', Type: 'Video', VideoCodec: 'h264', - AudioCodec: 'aac' + (canPlayMp3 ? ',mp3' : '') + (canPlayAc3 ? ',ac3' : '') + AudioCodec: videoAudioCodecs.join(',') }); } @@ -160,17 +171,6 @@ } }); - var videoAudioCodecs = []; - if (canPlayMp3) { - videoAudioCodecs.push('mp3'); - } - if (canPlayAac) { - videoAudioCodecs.push('aac'); - } - if (canPlayAc3) { - videoAudioCodecs.push('ac3'); - } - // Can't use mkv on mobile because we have to use the native player controls and they won't be able to seek it if (canPlayMkv && !browser.mobile) { profile.TranscodingProfiles.push({ @@ -268,24 +268,6 @@ ] }); - profile.CodecProfiles.push({ - Type: 'VideoAudio', - Codec: 'aac,mp3', - Conditions: [ - { - Condition: 'LessThanEqual', - Property: 'AudioChannels', - Value: videoAudioChannels - }, - { - Condition: 'Equals', - Property: 'IsSecondaryAudio', - Value: 'false', - IsRequired: 'false' - } - ] - }); - profile.CodecProfiles.push({ Type: 'VideoAudio', Conditions: [ diff --git a/dashboard-ui/bower_components/iron-icons/.bower.json b/dashboard-ui/bower_components/iron-icons/.bower.json index 6ac4cbc7f5..34ce317a74 100644 --- a/dashboard-ui/bower_components/iron-icons/.bower.json +++ b/dashboard-ui/bower_components/iron-icons/.bower.json @@ -1,6 +1,6 @@ { "name": "iron-icons", - "version": "1.1.0", + "version": "1.1.1", "description": "A set of icons for use with iron-icon", "authors": [ "The Polymer Authors" @@ -34,11 +34,11 @@ "util", "update-icons.sh" ], - "_release": "1.1.0", + "_release": "1.1.1", "_resolution": { "type": "version", - "tag": "v1.1.0", - "commit": "623d8dae77cd8658ce1f6834b30a4f3f6e2100ea" + "tag": "v1.1.1", + "commit": "77a8e0190d6c481d8b5df0495fa484928880ea53" }, "_source": "git://github.com/PolymerElements/iron-icons.git", "_target": "^1.0.0", diff --git a/dashboard-ui/bower_components/iron-icons/bower.json b/dashboard-ui/bower_components/iron-icons/bower.json index f408676a28..cd678f1a5e 100644 --- a/dashboard-ui/bower_components/iron-icons/bower.json +++ b/dashboard-ui/bower_components/iron-icons/bower.json @@ -1,6 +1,6 @@ { "name": "iron-icons", - "version": "1.1.0", + "version": "1.1.1", "description": "A set of icons for use with iron-icon", "authors": [ "The Polymer Authors" diff --git a/dashboard-ui/bower_components/iron-icons/demo/index.html b/dashboard-ui/bower_components/iron-icons/demo/index.html index 8e0df6ce17..acfbf36cc7 100644 --- a/dashboard-ui/bower_components/iron-icons/demo/index.html +++ b/dashboard-ui/bower_components/iron-icons/demo/index.html @@ -30,6 +30,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN + - + - + + + - - - - +