diff options
| author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-02-05 03:04:50 -0500 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-02-05 11:42:56 -0500 |
| commit | 09052713776ea813de322000080bbc022a309823 (patch) | |
| tree | f8d9833433c84cce6f76d2cc4ff3ba096dbfe7a0 /config/ampache.cfg.php.dist | |
| parent | 02286a12b812afe915556a3e43ed727eb70260a7 (diff) | |
| download | ampache-09052713776ea813de322000080bbc022a309823.tar.gz ampache-09052713776ea813de322000080bbc022a309823.tar.bz2 ampache-09052713776ea813de322000080bbc022a309823.zip | |
Clean up vainfo somewhat
Handling of unknown tags was wrong (we should just pass them through and
hope for the best, not do some weird-ass id3v2 thing). Add matroska to
the list of known tags. Switch the video types to a generic cleanup
function and move the several-times-duplicated general information
gathering into the general information gathering function where it
belongs. Treat the general information as another tag type instead of
special-casing it as a complete override through array_merge. Drop the
useless iconv stuff (getID3 already translates tags to our requested
charset). Rename some functions to more closely match their purpose.
Fix some private functions that were marked public. Fix encoding
detection, which has been completely broken for a while.
Diffstat (limited to 'config/ampache.cfg.php.dist')
| -rw-r--r-- | config/ampache.cfg.php.dist | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist index baf4d835..ac9b6dc2 100644 --- a/config/ampache.cfg.php.dist +++ b/config/ampache.cfg.php.dist @@ -215,12 +215,11 @@ require_localnet_session = "true" ; This determines the tag order for all cataloged ; music. If none of the listed tags are found then -; ampache will default to the first tag format -; that was found. -; POSSIBLE VALUES: ape asf avi id3v1 id3v2 lyrics3 mpeg quicktime riff +; ampache will randomly use whatever was found. +; POSSIBLE VALUES: ape asf avi id3v1 id3v2 lyrics3 matroska mpeg quicktime riff ; vorbiscomment -; DEFAULT: id3v2 id3v1 vorbiscomment quicktime ape asf avi mpeg riff -getid3_tag_order = "id3v2,id3v1,vorbiscomment,quicktime,ape,asf,avi,mpeg,riff" +; DEFAULT: id3v2 id3v1 vorbiscomment quicktime matroska ape asf avi mpeg riff +getid3_tag_order = "id3v2,id3v1,vorbiscomment,quicktime,matroska,ape,asf,avi,mpeg,riff" ; Determines whether we try to autodetect the encoding for id3v2 tags. ; May break valid tags. @@ -667,12 +666,8 @@ use_rss = true ;############################# ; Multibyte Settings # ;############################# -; Use Iconv or not -; DEFAULT: false -;use_iconv = false - -; mb_detect_order -; comma separated, available encodings are listed on php.net. -; see http://php.net/manual/mbstring.supported-encodings.php +; See http://php.net/manual/mbstring.supported-encodings.php +; If you want ID3v1 encoding detection to work, you should uncomment this line +; so that the ordering is sane. ; DEFAULT: auto -;mb_detect_order = "EUC-JP, SJIS, eucJP-win, SJIS-win, JIS, ISO-2022-JP, ASCII, UTF-8, UTF-7" +;mb_detect_order = "ASCII,UTF-8,EUC-JP,ISO-2022-JP,SJIS,JIS" |