From dedd9d9c7c1d5c0af99b49a31be8878446382624 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Wed, 8 Jul 2015 20:25:12 +0300
Subject: [PATCH] Display mp3 artist and performer

---
 app/partials/desktop/audio_player.html | 8 ++++++--
 app/partials/mobile/audio_player.html  | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/partials/desktop/audio_player.html b/app/partials/desktop/audio_player.html
index 3c0125e3..626707b0 100644
--- a/app/partials/desktop/audio_player.html
+++ b/app/partials/desktop/audio_player.html
@@ -7,8 +7,12 @@
 			<span ng-switch-when="true" class="audio_player_duration" ng-bind="mediaPlayer.player.currentTime | durationRemains : (mediaPlayer.player.duration || audio.duration)"></span>
 			<span ng-switch-default class="audio_player_duration" ng-bind="mediaPlayer.player.duration || audio.duration | duration"></span>
 		</div>
-		<a ng-click="download()" class="audio_player_title" ng-switch="::audio.file_name.length > 0">
-			<span ng-switch-when="true" ng-bind="::audio.file_name"></span>
+		<a ng-click="download()" class="audio_player_title" ng-switch="::audio.audioTitle.length > 0 ? 2 : (audio.file_name.length > 0 ? 1 : 0)">
+			<span ng-switch-when="2">
+				<strong ng-bind="::audio.audioPerformer"></strong>
+				<span ng-bind="::(audio.audioPerformer ? '– ' : '') + audio.audioTitle"></span>
+			</span>
+			<span ng-switch-when="1" ng-bind="::audio.file_name"></span>
 			<span ng-switch-default my-i18n="message_attach_audio_message"></span>
 		</a>
 		<i ng-if="::message.media_unread || false" ng-show="message.media_unread" class="icon icon-audio-unread"></i>
diff --git a/app/partials/mobile/audio_player.html b/app/partials/mobile/audio_player.html
index fde47006..0755082f 100644
--- a/app/partials/mobile/audio_player.html
+++ b/app/partials/mobile/audio_player.html
@@ -7,8 +7,12 @@
 			<span ng-switch-when="true" class="audio_player_duration" ng-bind="mediaPlayer.player.currentTime | durationRemains : (mediaPlayer.player.duration || audio.duration)"></span>
 			<span ng-switch-default class="audio_player_duration" ng-bind="mediaPlayer.player.duration || audio.duration | duration"></span>
 		</div>
-		<a ng-click="download()" class="audio_player_title" ng-switch="::audio.file_name.length > 0">
-			<span ng-switch-when="true" ng-bind="::audio.file_name"></span>
+		<a ng-click="download()" class="audio_player_title" ng-switch="::audio.audioTitle.length > 0 ? 2 : (audio.file_name.length > 0 ? 1 : 0)">
+			<span ng-switch-when="2">
+				<strong ng-bind="::audio.audioPerformer"></strong>
+				<span ng-bind="::(audio.audioPerformer ? '– ' : '') + audio.audioTitle"></span>
+			</span>
+			<span ng-switch-when="1" ng-bind="::audio.file_name"></span>
 			<span ng-switch-default my-i18n="message_attach_audio_message"></span>
 		</a>
 		<div class="audio_player_meta" ng-if="!audio.downloaded || !(mediaPlayer.player.duration || audio.duration)" ng-switch="audio.progress.enabled">