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

Fix bugs and apply new code as described in issue 11

Browse Source 
git-svn-id: http://php-reader.googlecode.com/svn/trunk@105 51a70ab9-7547-0410-9469-37e369ee0574
This commit is contained in:
svollbehr
2008-07-30 14:56:47 +00:00
parent c747c406d8
commit 809bf58885
34 changed files with 1002 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ID3/Frame/WXXX.php
View File

@@ -50,6 +50,7 @@ require_once("ID3/Encoding.php");
* @package php-reader
* @subpackage ID3
* @author Sven Vollbehr <svollbehr@gmail.com>
* @author Ryan Butterfield <buttza@gmail.com>
* @copyright Copyright (c) 2008 The PHP Reader Project Workgroup
* @license http://code.google.com/p/php-reader/wiki/License New BSD License
* @version $Rev$
@@ -71,30 +72,31 @@ final class ID3_Frame_WXXX extends ID3_Frame_AbstractLink
*/
public function __construct($reader = null, &$options = array())
{
parent::__construct($reader, $options);
ID3_Frame::__construct($reader, $options);
if ($reader === null)
return;
$this->_encoding = Transform::fromInt8($this->_data[0]);
$this->_encoding = Transform::fromUInt8($this->_data[0]);
$this->_data = substr($this->_data, 1);
switch ($this->_encoding) {
case self::UTF16:
list($this->_description, $this->_link) =
preg_split("/\\x00\\x00/", $this->_data, 2);
$this->explodeString16($this->_data, 2);
$this->_description = Transform::fromString16($this->_description);
break;
case self::UTF16BE:
list($this->_description, $this->_link) =
preg_split("/\\x00\\x00/", $this->_data, 2);
$this->explodeString16($this->_data, 2);
$this->_description = Transform::fromString16BE($this->_description);
break;
default:
list($this->_description, $this->_link) =
preg_split("/\\x00/", $this->_data);
$this->explodeString8($this->_data, 2);
break;
}
$this->_link = implode($this->explodeString8($this->_link, 1), "");
}
/**
@@ -139,21 +141,22 @@ final class ID3_Frame_WXXX extends ID3_Frame_AbstractLink
*/
public function __toString()
{
$data = Transform::toInt8($this->_encoding);
$data = Transform::toUInt8($this->_encoding);
switch ($this->_encoding) {
case self::UTF16:
$data .= Transform::toString16($this->_description) . "\0\0";
case self::UTF16LE:
$data .= Transform::toString16
($this->_description, $this->_encoding == self::UTF16 ?
Transform::MACHINE_ENDIAN_ORDER : Transform::LITTLE_ENDIAN_ORDER) .
"\0\0";
break;
case self::UTF16BE:
$data .= Transform::toString16BE($this->_description) . "\0\0";
break;
case self::UTF16LE:
$data .= Transform::toString16LE($this->_description) . "\0\0");
break;
default:
$data .= $this->_description . "\0";
}
$this->setData($data . $this->_link);
return parent::__toString();
return ID3_Frame::__toString();
}
}