github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 12:59:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove speed from activity when transcode throttled

Browse source
This commit is contained in:
JonnyWong16 2017-08-13 09:43:45 -07:00
commit 21309ba280
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
data/interfaces/default/current_activity_instance.html
View file

@ -140,13 +140,14 @@ DOCUMENTATION :: END
</div> </div>
<div class="dashboard-activity-info-details-transcode-state" id="transcode-state-${data['session_key']}"> <div class="dashboard-activity-info-details-transcode-state" id="transcode-state-${data['session_key']}">
% if data['video_decision'] == 'transcode' or data['audio_decision'] == 'transcode': % if data['video_decision'] == 'transcode' or data['audio_decision'] == 'transcode':
Stream &nbsp;<strong>Transcode
% if data['transcode_hardware'] == '1': % if data['transcode_hardware'] == '1':
Stream &nbsp;<strong>Transcode (HW) (Speed: ${data['transcode_speed']}) (HW)
% else:
Stream &nbsp;<strong>Transcode (Speed: ${data['transcode_speed']})
% endif % endif
% if data['transcode_throttled'] == '1': % if data['transcode_throttled'] == '1':
(Throttled) (Throttled)
% else:
(Speed: ${data['transcode_speed']})
% endif % endif
</strong> </strong>
% elif data['video_decision'] == 'copy' or data['audio_decision'] == 'copy': % elif data['video_decision'] == 'copy' or data['audio_decision'] == 'copy':

4
data/interfaces/default/index.html
View file

@ -284,9 +284,9 @@
// if transcoding, update the transcode state // if transcoding, update the transcode state
var ts = ''; var ts = '';
if (s.video_decision == 'transcode' || s.audio_decision == 'transcode') { if (s.video_decision == 'transcode' || s.audio_decision == 'transcode') {
var throttled = (s.throttled == '1') ? ' (Throttled)' : ''; var throttled = (s.throttled == '1') ? ' (Throttled)' : ' (Speed: ' + s.transcode_speed + ')';
var hw = (s.transcode_hardware == '1') ? ' (HW)' : ''; var hw = (s.transcode_hardware == '1') ? ' (HW)' : '';
ts += 'Stream &nbsp;<strong>Transcode' + hw + ' (Speed: ' + s.transcode_speed + ')' + throttled + '</strong><br>'; ts += 'Stream &nbsp;<strong>Transcode' + hw + throttled + '</strong><br>';
} else if (s.video_decision == 'copy' || s.audio_decision == 'copy') { } else if (s.video_decision == 'copy' || s.audio_decision == 'copy') {
ts += 'Stream &nbsp;<strong>Direct Stream</strong><br>'; ts += 'Stream &nbsp;<strong>Direct Stream</strong><br>';
} else { } else {