summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-12-18 09:43:44 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-12-18 09:43:44 +0000
commit2e4141d2f5cb1f3ccbb73bc5deec07601a85bcc5 (patch)
tree4a7c687afad7b3f6d0fccc3ca1ed3f25f291a867
parent64df5b62139b5bb247c9e902b3838985b3ab4c1d (diff)
downloadampache-2e4141d2f5cb1f3ccbb73bc5deec07601a85bcc5.tar.gz
ampache-2e4141d2f5cb1f3ccbb73bc5deec07601a85bcc5.tar.bz2
ampache-2e4141d2f5cb1f3ccbb73bc5deec07601a85bcc5.zip
fixed genre pickup in oggs
-rwxr-xr-xdocs/CHANGELOG2
-rwxr-xr-xmodules/id3/audioinfo.class.php2
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 111705c1..cf33b295 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,8 @@
--------------------------------------------------------------------------
v.3.3.2-Alpha4
+ - Fixed problem where Genre on OGG was not being correctly
+ picked up by catalog (Thx redswami)
- Added "Keyword" search which searches title, artist name
and album name, also forced 'quick search' to always
use Keyword (Thx Rubin)
diff --git a/modules/id3/audioinfo.class.php b/modules/id3/audioinfo.class.php
index 04e42da9..30a29cbc 100755
--- a/modules/id3/audioinfo.class.php
+++ b/modules/id3/audioinfo.class.php
@@ -155,12 +155,14 @@ class AudioInfo {
$this->result['ogg']['artist'] = iconv("UTF-8",conf('site_charset') . "//TRANSLIT", $this->info['ogg']['comments']['artist'][0]);
$this->result['ogg']['album'] = iconv("UTF-8",conf('site_charset') . "//TRANSLIT", $this->info['ogg']['comments']['album'][0]);
$this->result['ogg']['author'] = iconv("UTF-8",conf('site_charset') . "//TRANSLIT", $this->info['ogg']['comments']['author'][0]);
+ $this->result['ogg']['genre'] = iconv("UTF-8",conf('site_charset') . "//TRANSLIT", $this->info['ogg']['comments']['genre'][0]);
}
else {
$this->result['ogg']['title'] = $this->info['ogg']['comments']['title'][0];
$this->result['ogg']['artist'] = $this->info['ogg']['comments']['artist'][0];
$this->result['ogg']['album'] = $this->info['ogg']['comments']['album'][0];
$this->result['ogg']['author'] = $this->info['ogg']['comments']['author'][0];
+ $this->result['ogg']['genre'] = $this->info['ogg']['comments']['genre'][0];
}
$this->result['ogg']['year'] = $this->info['ogg']['comments']['date'][0];