diff --git a/data/interfaces/default/current_activity_header.html b/data/interfaces/default/current_activity_header.html
index 30fc6c8d..042450b1 100644
--- a/data/interfaces/default/current_activity_header.html
+++ b/data/interfaces/default/current_activity_header.html
@@ -15,12 +15,23 @@ DOCUMENTATION :: END
%doc>
% if data != None:
- % if data == '0':
+<%
+ s = '('
+ if data['direct_play']:
+ s += str(data['direct_play']) + ' direct play' + ('s' if data['direct_play'] > 1 else '') + ', '
+ if data['direct_stream']:
+ s += str(data['direct_stream']) + ' direct stream' + ('s' if data['direct_stream'] > 1 else '') + ', '
+ if data['transcode']:
+ s += str(data['transcode']) + ' transcode' + ('s' if data['transcode'] > 1 else '') + ', '
+ s = s.rstrip(', ')
+ s += ')'
+%>
+ % if data['stream_count'] == '0':
Activity
- % elif data == '1':
- Activity ${data} stream
+ % elif data['stream_count'] == '1':
+ Activity ${data['stream_count']} stream ${s}
% else:
- Activity ${data} streams
+ Activity ${data['stream_count']} streams ${s}
% endif
% else:
Activity
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 38a10392..01811546 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -211,7 +211,18 @@ class WebInterface(object):
return serve_template(templatename="current_activity_header.html", data=None)
if result:
- return serve_template(templatename="current_activity_header.html", data=result['stream_count'])
+ data = {'stream_count': result['stream_count']}
+ data['direct_play'] = \
+ sum(1 for s in result['sessions']
+ if s['video_decision'] == 'direct play' and s['audio_decision'] == 'direct play')
+ data['direct_stream'] = \
+ sum(1 for s in result['sessions']
+ if s['video_decision'] == 'copy' and s['audio_decision'] == 'copy')
+ data['transcode'] = \
+ sum(1 for s in result['sessions']
+ if s['video_decision'] == 'transcode' or s['audio_decision'] == 'transcode')
+
+ return serve_template(templatename="current_activity_header.html", data=data)
else:
logger.warn(u"Unable to retrieve data for get_current_activity_header.")
return serve_template(templatename="current_activity_header.html", data=None)