rik/plibreader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix encoding and one byte field issue

Browse Source 
git-svn-id: http://php-reader.googlecode.com/svn/trunk@12 51a70ab9-7547-0410-9469-37e369ee0574
This commit is contained in:
svollbehr
2008-03-17 12:54:34 +00:00
parent 165d162582
commit 3914cfdacc
16 changed files with 170 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/ID3/Frame/SYLT.php
View File

@@ -65,15 +65,8 @@ final class ID3_Frame_USER extends ID3_Frame
* @var Array
*/
public static $types = array
(0x00 => "Other",
0x01 => "Lyrics",
0x02 => "Text transcription",
0x03 => "Movement/Part name",
0x04 => "Eevents",
0x05 => "Chord",
0x06 => "Trivia",
0x07 => "URLs to webpages",
0x08 => "URLs to images");
("Other", "Lyrics", "Text transcription", "Movement/Part name", "Eevents",
"Chord", "Trivia", "URLs to webpages", "URLs to images");
/** @var integer */
private $_encoding;
@@ -102,25 +95,30 @@ final class ID3_Frame_USER extends ID3_Frame
{
parent::__construct($reader);
$this->_encoding = substr($this->_data, 0, 1);
$this->_encoding = ord($this->_data{0});
$this->_language = substr($this->_data, 1, 3);
$this->_format = substr($this->_data, 3, 1);
$this->_type = substr($this->_data, 4, 1);
$this->_format = ord($this->_data{3});
$this->_type = ord($this->_data{4});
$this->_data = substr($this->_data, 5);
switch ($this->_encoding) {
case self::UTF16:
list($this->_description, $this->_data) =
preg_split("/\\x00\\x00/", substr($this->_data, 5), 2);
$this->_description = Transform::getString16LE($this->_description);
break;
$bom = substr($this->_data, 0, 2);
$this->_data = substr($this->_data, 2);
if ($bom == 0xfffe) {
list($this->_description, $this->_data) =
preg_split("/\\x00\\x00/", $this->_data, 2);
$this->_description = Transform::getString16LE($this->_description);
break;
}
case self::UTF16BE:
list($this->_description, $this->_data) =
preg_split("/\\x00\\x00/", substr($this->_data, 5), 2);
preg_split("/\\x00\\x00/", $this->_data, 2);
$this->_description = Transform::getString16BE($this->_description);
break;
default:
list($this->_description, $this->_data) =
preg_split("/\\x00/", substr($this->_data, 5), 2);
preg_split("/\\x00/", $this->_data, 2);
$this->_description = Transform::getString8($this->_description);
}