summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorPaul Arthur <flowerysong00@yahoo.com>2011-02-21 15:13:08 -0500
committerPaul Arthur <flowerysong00@yahoo.com>2011-02-21 15:13:08 -0500
commitfa505d770830902f7cce9fa2f42f9785273b7abc (patch)
tree31a25425b9af8c92f499f28c7d08d89799508f76 /config
parent997c05143c88f1a0964588a4c1506acf7c8c31ea (diff)
downloadampache-fa505d770830902f7cce9fa2f42f9785273b7abc.tar.gz
ampache-fa505d770830902f7cce9fa2f42f9785273b7abc.tar.bz2
ampache-fa505d770830902f7cce9fa2f42f9785273b7abc.zip
Add support for autodetecting encoding for broken id3v2 tags
Mostly untested. Must be enabled in config, so we won't be breaking people's perfectly valid tags by default.
Diffstat (limited to 'config')
-rw-r--r--config/ampache.cfg.php.dist21
1 files changed, 11 insertions, 10 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist
index 322df511..5e76d7e9 100644
--- a/config/ampache.cfg.php.dist
+++ b/config/ampache.cfg.php.dist
@@ -210,6 +210,11 @@ require_localnet_session = "true"
; DEFAULT: id3v2 id3v1 vorbiscomment quicktime ape asf avi mpeg riff
getid3_tag_order = "id3v2,id3v1,vorbiscomment,quicktime,ape,asf,avi,mpeg,riff"
+; Determines whether we try to autodetect the encoding for id3v2 tags.
+; May break valid tags.
+; DEFAULT: false
+;getid3_detect_id3v2_encoding = "false"
+
; This determines the order in which metadata sources are used (and in the
; case of plugins, checked)
; POSSIBLE VALUES (builtins): filename and getID3
@@ -625,16 +630,12 @@ use_rss = true
;#############################
; Multibyte Settings #
;#############################
-;Use Iconv or not
-;DEFAULT: false
+; Use Iconv or not
+; DEFAULT: false
;use_iconv = false
-;Override mb_detect_order in php.ini or not
-;DEFAULT: false
-;mb_detect_override = true
-
-;Custom mb_detect_order
-;list comma separated, available encodings are listed on php.net.
-;see http://php.net/manual/mbstring.supported-encodings.php
-;DEFAULT: auto (use your php.ini)
+; mb_detect_order
+; comma separated, available encodings are listed on php.net.
+; see http://php.net/manual/mbstring.supported-encodings.php
+; DEFAULT: auto
;mb_detect_order = "EUC-JP, SJIS, eucJP-win, SJIS-win, JIS, ISO-2022-JP, ASCII, UTF-8, UTF-7"