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

Refactoring

Browse Source 
git-svn-id: http://php-reader.googlecode.com/svn/branches/zend@158 51a70ab9-7547-0410-9469-37e369ee0574
This commit is contained in:
svollbehr
2009-11-20 17:33:58 +00:00
parent 573f488c26
commit 881b586d7a
37 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Zend/Media/Id3/Frame.php
View File

@@ -138,18 +138,24 @@ abstract class Zend_Media_Id3_Frame extends Zend_Media_Id3_Object
if ($this->getOption('version', 4) < 4) {
$this->_size = $this->_reader->readUInt32BE();
$flags = $this->_reader->readUInt16BE();
if (($flags & 0x8000) == 0x8000)
if (($flags & 0x8000) == 0x8000) {
$this->_flags |= self::DISCARD_ON_TAGCHANGE;
if (($flags & 0x4000) == 0x4000)
}
if (($flags & 0x4000) == 0x4000) {
$this->_flags |= self::DISCARD_ON_FILECHANGE;
if (($flags & 0x2000) == 0x2000)
}
if (($flags & 0x2000) == 0x2000) {
$this->_flags |= self::READ_ONLY;
if (($flags & 0x80) == 0x80)
}
if (($flags & 0x80) == 0x80) {
$this->_flags |= self::COMPRESSION;
if (($flags & 0x40) == 0x40)
}
if (($flags & 0x40) == 0x40) {
$this->_flags |= self::ENCRYPTION;
if (($flags & 0x20) == 0x20)
}
if (($flags & 0x20) == 0x20) {
$this->_flags |= self::GROUPING_IDENTITY;
}
}
/* ID3v2.4.0 size and flags */
@@ -248,7 +254,7 @@ abstract class Zend_Media_Id3_Frame extends Zend_Media_Id3_Object
* @param Zend_Io_Writer $writer The writer object.
* @return void
*/
abstract protected function _writeFrame($writer);
abstract protected function _writeData($writer);
/**
* Writes the frame data with the header.
@@ -286,7 +292,7 @@ abstract class Zend_Media_Id3_Frame extends Zend_Media_Id3_Object
$flags = $this->_flags;
}
$this->_writeFrame($buffer = new Zend_Io_StringWriter());
$this->_writeData($buffer = new Zend_Io_StringWriter());
$data = $buffer->toString();
$size = $this->_size = strlen($data);