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

35
src/ID3/Frame/USER.php
View File

@@ -51,6 +51,7 @@ require_once("ID3/Language.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$
@@ -62,7 +63,7 @@ final class ID3_Frame_USER extends ID3_Frame
private $_encoding = ID3_Encoding::UTF8;
/** @var string */
private $_language = "eng";
private $_language = "und";
/** @var string */
private $_text;
@@ -71,16 +72,19 @@ final class ID3_Frame_USER extends ID3_Frame
* Constructs the class with given parameters and parses object related data.
*
* @param Reader $reader The reader object.
* @param Array $options The options array.
*/
public function __construct($reader = null)
public function __construct($reader = null, &$options = array())
{
parent::__construct($reader);
parent::__construct($reader, $options);
if ($reader === null)
return;
$this->_encoding = Transform::fromInt8($this->_data[0]);
$this->_encoding = Transform::fromUInt8($this->_data[0]);
$this->_language = substr($this->_data, 1, 3);
if ($this->_language == "XXX")
$this->_language = "und";
$this->_data = substr($this->_data, 4);
switch ($this->_encoding) {
@@ -125,7 +129,12 @@ final class ID3_Frame_USER extends ID3_Frame
* @see ID3_Language
* @param string $language The language code.
*/
public function setLanguage($language) { $this->_language = $language; }
public function setLanguage($language)
{
if ($language == "XXX")
$language = "und";
$this->_language = substr($language, 0, 3);
}
/**
* Returns the text.
@@ -143,11 +152,11 @@ final class ID3_Frame_USER extends ID3_Frame
*/
public function setText($text, $language = false, $encoding = false)
{
$this->_text = $text;
$this->_text = $text;
if ($language !== false)
$this->_language = $language;
$this->setLanguage($language);
if ($encoding !== false)
$this->_encoding = $encoding;
$this->setEncoding($encoding);
}
/**
@@ -157,17 +166,17 @@ final class ID3_Frame_USER extends ID3_Frame
*/
public function __toString()
{
$data = Transform::toInt8($this->_encoding) . $this->_language;
$data = Transform::toUInt8($this->_encoding) . $this->_language;
switch ($this->_encoding) {
case self::UTF16:
$data .= Transform::toString16($this->_text);
case self::UTF16LE:
$data .= Transform::toString16
($this->_text, $this->_encoding == self::UTF16 ?
Transform::MACHINE_ENDIAN_ORDER : Transform::LITTLE_ENDIAN_ORDER);
break;
case self::UTF16BE:
$data .= Transform::toString16BE($this->_text);
break;
case self::UTF16LE:
$data .= Transform::toString16LE($this->_text);
break;
default:
$data .= $this->_text;
}