summaryrefslogtreecommitdiffstats
path: root/lib/class/vainfo.class.php
diff options
context:
space:
mode:
authormomo-i <momo-i@ampache>2009-03-02 22:13:55 +0000
committermomo-i <momo-i@ampache>2009-03-02 22:13:55 +0000
commitf8def34b7d9bab33acbb33cf10da7a347d04d709 (patch)
tree687be75e705fbe98f7f1a6b9df38adcb7f6c5d46 /lib/class/vainfo.class.php
parentd469634f3cd98ad5a42d72c2aff0f1b2a968cf7d (diff)
downloadampache-f8def34b7d9bab33acbb33cf10da7a347d04d709.tar.gz
ampache-f8def34b7d9bab33acbb33cf10da7a347d04d709.tar.bz2
ampache-f8def34b7d9bab33acbb33cf10da7a347d04d709.zip
Fixed: Show lyrics using id3v2(USLT) if exists
Diffstat (limited to 'lib/class/vainfo.class.php')
-rw-r--r--lib/class/vainfo.class.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/class/vainfo.class.php b/lib/class/vainfo.class.php
index 78f5186f..7a4fe819 100644
--- a/lib/class/vainfo.class.php
+++ b/lib/class/vainfo.class.php
@@ -265,8 +265,12 @@ class vainfo {
$info['album'] = trim($results[$key]['album']);
$info['genre'] = trim($results[$key]['genre']);
$info['language'] = Dba::escape($results[$key]['language']);
- //$info['lyrics'] = Dba::escape($results[$key]['lyrics']);
- $info['lyrics'] = $results['info']['lyrics']['unsynchedlyrics'];
+ if (!empty($results[$key]['unsynchedlyrics'])) { // ID3v2 USLT
+ $info['lyrics'] = $results[$key]['unsynchedlyrics'];
+ }
+ else { // Lyrics3 v2.0
+ $info['lyrics'] = $results['info']['lyrics']['unsynchedlyrics'];
+ }
$info['track'] = intval($results[$key]['track']);
}
else {