Fix bugs and apply new code as described in issue 11
git-svn-id: http://php-reader.googlecode.com/svn/trunk@105 51a70ab9-7547-0410-9469-37e369ee0574
This commit is contained in:
@@ -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$
|
||||
@@ -85,9 +86,9 @@ final class ID3_Frame_OWNE extends ID3_Frame
|
||||
if ($reader === null)
|
||||
return;
|
||||
|
||||
$this->_encoding = Transform::fromInt8($this->_data[0]);
|
||||
$this->_encoding = Transform::fromUInt8($this->_data[0]);
|
||||
list($tmp, $this->_data) =
|
||||
preg_split("/\\x00/", substr($this->_data, 1), 2);
|
||||
$this->explodeString8(substr($this->_data, 1), 2);
|
||||
$this->_currency = substr($tmp, 0, 3);
|
||||
$this->_price = substr($tmp, 3);
|
||||
$this->_date = substr($this->_data, 0, 8);
|
||||
@@ -197,18 +198,18 @@ final class ID3_Frame_OWNE extends ID3_Frame
|
||||
*/
|
||||
public function __toString()
|
||||
{
|
||||
$data = Transform::toInt8($this->_encoding) . $this->_currency .
|
||||
$data = Transform::toUInt8($this->_encoding) . $this->_currency .
|
||||
$this->_price . "\0" . $this->_date;
|
||||
switch ($this->_encoding) {
|
||||
case self::UTF16:
|
||||
$data .= Transform::toString16($this->_seller);
|
||||
case self::UTF16LE:
|
||||
$data .= Transform::toString16
|
||||
($this->_seller, $this->_encoding == self::UTF16 ?
|
||||
Transform::MACHINE_ENDIAN_ORDER : Transform::LITTLE_ENDIAN_ORDER);
|
||||
break;
|
||||
case self::UTF16BE:
|
||||
$data .= Transform::toString16BE($this->_seller);
|
||||
break;
|
||||
case self::UTF16LE:
|
||||
$data .= Transform::toString16LE($this->_seller);
|
||||
break;
|
||||
default:
|
||||
$data .= $this->_seller;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user