mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

sync fixes

Browse source
This commit is contained in:
Luke Pulverenti 2015-03-26 19:10:34 -04:00
parent dfce8df586
commit fa08c6245b
3 changed files with 36 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/css/librarybrowser.css
View file

@ -1446,3 +1446,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
padding-left: 1em; padding-left: 1em;
} }
} }
.homeTopViews .cardText{
font-size: 14px;
}

25
dashboard-ui/scripts/mediaplayer.js
View file

@ -120,7 +120,7 @@
profile.MaxStreamingBitrate = bitrateSetting; profile.MaxStreamingBitrate = bitrateSetting;
profile.MaxStaticBitrate = 40000000; profile.MaxStaticBitrate = 40000000;
profile.MusicStreamingTranscodingBitrate = 128000; profile.MusicStreamingTranscodingBitrate = Math.min(bitrateSetting, 192000);
profile.DirectPlayProfiles = []; profile.DirectPlayProfiles = [];
profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
@ -232,12 +232,14 @@
{ {
Condition: 'Equals', Condition: 'Equals',
Property: 'IsCabac', Property: 'IsCabac',
Value: 'true' Value: 'true',
IsRequired: false
}, },
{ {
Condition: 'NotEquals', Condition: 'NotEquals',
Property: 'IsAnamorphic', Property: 'IsAnamorphic',
Value: 'true' Value: 'true',
IsRequired: false
}, },
{ {
Condition: 'EqualsAny', Condition: 'EqualsAny',
@ -263,7 +265,8 @@
{ {
Condition: 'NotEquals', Condition: 'NotEquals',
Property: 'IsAnamorphic', Property: 'IsAnamorphic',
Value: 'true' Value: 'true',
IsRequired: false
}, },
{ {
Condition: 'LessThanEqual', Condition: 'LessThanEqual',
@ -622,11 +625,23 @@
}); });
}; };
function supportsDirectPlay(mediaSource) {
if (mediaSource.SupportsDirectPlay && mediaSource.Protocol == 'Http' && !mediaSource.RequiredHttpHeaders.length) {
// TODO: Need to verify the host is going to be reachable
return true;
}
return false;
}
function getOptimalMediaSource(mediaType, versions) { function getOptimalMediaSource(mediaType, versions) {
alert(JSON.stringify(versions));
var optimalVersion = versions.filter(function (v) { var optimalVersion = versions.filter(function (v) {
v.enableDirectPlay = v.SupportsDirectPlay && v.Protocol == 'Http' && !v.RequiredHttpHeaders.length; v.enableDirectPlay = supportsDirectPlay(v);
return v.enableDirectPlay; return v.enableDirectPlay;

22
dashboard-ui/supporterkey.html
View file

@ -87,18 +87,20 @@
</div> </div>
</div> </div>
<br /> <div style="display:none;">
<h1>${HeaderSupporterBenefits}</h1> <br />
<p class="linkSupporterKeyMessage"></p> <h1>${HeaderSupporterBenefits}</h1>
<a href="https://play.google.com/store/apps/details?id=tv.mediabrowser.mediabrowsertv" target="_blank" title="Android TV"> <p class="linkSupporterKeyMessage"></p>
<img src="css/images/clients/androidtv-tile.png" style="height:60px;" /> <a href="https://play.google.com/store/apps/details?id=tv.mediabrowser.mediabrowsertv" target="_blank" title="Android TV">
</a> <img src="css/images/clients/androidtv-tile.png" style="height:60px;" />
<br /> </a>
<br /> <br />
<div class="supporters"> <br />
<div class="supporters">
</div>
<button type="button" id="btnAddConnectUser" data-icon="plus">${ButtonAddUser}</button>
</div> </div>
<button type="button" id="btnAddConnectUser" data-icon="plus">${ButtonAddUser}</button>
</div> </div>
</div> </div>
</div> </div>