summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-10-07 21:37:41 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-10-07 21:37:41 +0000
commit6758b3d6b0fc976a2d01d9318a56a9aa4aad5493 (patch)
treed61e4606e8eafdd7eba49c355eeb7aa181a968c6 /lib
parente04c3a62d0e3a36cb7d9b1a9ccad2635c2d331b9 (diff)
downloadampache-6758b3d6b0fc976a2d01d9318a56a9aa4aad5493.tar.gz
ampache-6758b3d6b0fc976a2d01d9318a56a9aa4aad5493.tar.bz2
ampache-6758b3d6b0fc976a2d01d9318a56a9aa4aad5493.zip
fixed a problem with failing to retrive real player tags
Diffstat (limited to 'lib')
-rw-r--r--lib/general.lib.php18
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/general.lib.php b/lib/general.lib.php
index b9992be5..03b8a4e6 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -364,13 +364,16 @@ function extend_session($sid) {
*/
function get_tag_type($results) {
+
+
+
// Check and see if we are dealing with an ogg
// If so order will be a little different
if ($results['ogg']) {
$order[0] = 'ogg';
} // end if ogg
- elseif ($results['rm']) {
- $order[0] = 'rm';
+ elseif ($results['rm'] OR $results['format_name'] == 'Real') {
+ $order[0] = 'real';
}
elseif ($results['flac']) {
$order[0] = 'flac';
@@ -410,6 +413,17 @@ function get_tag_type($results) {
*/
function clean_tag_info($results,$key,$filename) {
+ if ($key == 'real') {
+ $results['real'] = $results['tags']['real'];
+ }
+
+ /* Flatten any arrayed results */
+ foreach ($results[$key] as $field=>$data) {
+ if (is_array($data)) {
+ $results[$key][$field] = array_pop($data);
+ }
+ }
+
$info = array();
$clean_array = array("\n","\t","\r","\0");