summaryrefslogtreecommitdiffstats
path: root/lib/class/artist.class.php
diff options
context:
space:
mode:
authormomo-i <momo-i@ampache>2009-02-24 23:37:19 +0000
committermomo-i <momo-i@ampache>2009-02-24 23:37:19 +0000
commit96acc29016a3ded75dc955b28b1b76ad57366e29 (patch)
tree4731dadff28636f5ab236314645741413a80fc69 /lib/class/artist.class.php
parent0bdecac9476fecffc05c7a35c26045bac3233c0b (diff)
downloadampache-96acc29016a3ded75dc955b28b1b76ad57366e29.tar.gz
ampache-96acc29016a3ded75dc955b28b1b76ad57366e29.tar.bz2
ampache-96acc29016a3ded75dc955b28b1b76ad57366e29.zip
Added: lyrics get from getid3 (pls test by any mp3s)
Added: debug_print function (pre tag for print_r)
Diffstat (limited to 'lib/class/artist.class.php')
-rw-r--r--lib/class/artist.class.php15
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php
index 5206e8d5..75a415ca 100644
--- a/lib/class/artist.class.php
+++ b/lib/class/artist.class.php
@@ -294,8 +294,23 @@ class Artist extends database_object {
$results = Dba::fetch_assoc($db_results);
+ $rs = Dba::read("SELECT file FROM song WHERE `id`='" . Dba::escape($song_id) . "'");
+ $filename = Dba::fetch_row($rs);
+ $vainfo = new vainfo($filename[0], '','','',$catalog->sort_pattern,$catalog->rename_pattern);
+ $vainfo->get_info();
+ $key = vainfo::get_tag_type($vainfo->tags);
+ $tag_lyrics = vainfo::clean_tag_info($vainfo->tags,$key,$filename);
+ $lyrics = $tag_lyrics['lyrics'];
+ if(function_exists('mb_detect_encoding') AND function_exists('mb_convert_encoding')) {
+ $enc = mb_detect_encoding($lyrics);
+ $lyrics = mb_convert_encoding($lyrics, 'UTF-8', $enc);
+ }
+
if (strlen($results['lyrics']) > 1) {
return html_entity_decode(strip_tags(($results['lyrics'])), ENT_QUOTES);
+ } elseif (strlen($lyrics) > 1) {
+ /// get lyrics from id3tag
+ return $lyrics;
}
else {
$client = new nusoap_client('http://lyricwiki.org/server.php?wsdl', 'wsdl');