From 881b586d7a0e16f1b74f2a7fdcb9e94edbcc6363 Mon Sep 17 00:00:00 2001 From: svollbehr Date: Fri, 20 Nov 2009 17:33:58 +0000 Subject: [PATCH] Refactoring git-svn-id: http://php-reader.googlecode.com/svn/branches/zend@158 51a70ab9-7547-0410-9469-37e369ee0574 --- src/Zend/Media/Id3/DateFrame.php | 4 ++-- src/Zend/Media/Id3/Frame.php | 22 ++++++++++++++-------- src/Zend/Media/Id3/Frame/Aenc.php | 2 +- src/Zend/Media/Id3/Frame/Apic.php | 2 +- src/Zend/Media/Id3/Frame/Comm.php | 2 +- src/Zend/Media/Id3/Frame/Comr.php | 2 +- src/Zend/Media/Id3/Frame/Encr.php | 2 +- src/Zend/Media/Id3/Frame/Equ2.php | 2 +- src/Zend/Media/Id3/Frame/Equa.php | 2 +- src/Zend/Media/Id3/Frame/Etco.php | 2 +- src/Zend/Media/Id3/Frame/Geob.php | 2 +- src/Zend/Media/Id3/Frame/Grid.php | 2 +- src/Zend/Media/Id3/Frame/Ipls.php | 2 +- src/Zend/Media/Id3/Frame/Link.php | 2 +- src/Zend/Media/Id3/Frame/Mcdi.php | 2 +- src/Zend/Media/Id3/Frame/Owne.php | 2 +- src/Zend/Media/Id3/Frame/Pcnt.php | 2 +- src/Zend/Media/Id3/Frame/Popm.php | 2 +- src/Zend/Media/Id3/Frame/Poss.php | 2 +- src/Zend/Media/Id3/Frame/Priv.php | 2 +- src/Zend/Media/Id3/Frame/Rbuf.php | 2 +- src/Zend/Media/Id3/Frame/Rva2.php | 2 +- src/Zend/Media/Id3/Frame/Rvad.php | 2 +- src/Zend/Media/Id3/Frame/Rvrb.php | 2 +- src/Zend/Media/Id3/Frame/Seek.php | 2 +- src/Zend/Media/Id3/Frame/Sign.php | 2 +- src/Zend/Media/Id3/Frame/Sylt.php | 2 +- src/Zend/Media/Id3/Frame/Sytc.php | 2 +- src/Zend/Media/Id3/Frame/Tsrc.php | 4 ++-- src/Zend/Media/Id3/Frame/Txxx.php | 2 +- src/Zend/Media/Id3/Frame/Unknown.php | 2 +- src/Zend/Media/Id3/Frame/Uslt.php | 2 +- src/Zend/Media/Id3/Frame/Wxxx.php | 2 +- src/Zend/Media/Id3/LanguageTextFrame.php | 2 +- src/Zend/Media/Id3/LinkFrame.php | 2 +- src/Zend/Media/Id3/NumberFrame.php | 4 ++-- src/Zend/Media/Id3/TextFrame.php | 2 +- 37 files changed, 53 insertions(+), 47 deletions(-) diff --git a/src/Zend/Media/Id3/DateFrame.php b/src/Zend/Media/Id3/DateFrame.php index 965eeee..a6d198c 100644 --- a/src/Zend/Media/Id3/DateFrame.php +++ b/src/Zend/Media/Id3/DateFrame.php @@ -103,9 +103,9 @@ abstract class Zend_Media_Id3_DateFrame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $this->setEncoding(Zend_Media_Id3_Encoding::ISO88591); - parent::_writeFrame($writer); + parent::_writeData($writer); } } diff --git a/src/Zend/Media/Id3/Frame.php b/src/Zend/Media/Id3/Frame.php index a491339..6df8ad5 100644 --- a/src/Zend/Media/Id3/Frame.php +++ b/src/Zend/Media/Id3/Frame.php @@ -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); diff --git a/src/Zend/Media/Id3/Frame/Aenc.php b/src/Zend/Media/Id3/Frame/Aenc.php index a8f9906..12c27f1 100644 --- a/src/Zend/Media/Id3/Frame/Aenc.php +++ b/src/Zend/Media/Id3/Frame/Aenc.php @@ -168,7 +168,7 @@ final class Zend_Media_Id3_Frame_Aenc extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeString8($this->_owner, 1) ->writeUInt16BE($this->_previewStart) diff --git a/src/Zend/Media/Id3/Frame/Apic.php b/src/Zend/Media/Id3/Frame/Apic.php index 20adb46..3fc4f24 100644 --- a/src/Zend/Media/Id3/Frame/Apic.php +++ b/src/Zend/Media/Id3/Frame/Apic.php @@ -265,7 +265,7 @@ final class Zend_Media_Id3_Frame_Apic extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding) ->writeString8($this->_mimeType, 1) diff --git a/src/Zend/Media/Id3/Frame/Comm.php b/src/Zend/Media/Id3/Frame/Comm.php index eaa5a5a..83cbdb3 100644 --- a/src/Zend/Media/Id3/Frame/Comm.php +++ b/src/Zend/Media/Id3/Frame/Comm.php @@ -128,7 +128,7 @@ final class Zend_Media_Id3_Frame_Comm extends Zend_Media_Id3_LanguageTextFrame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding) ->write($this->_language); diff --git a/src/Zend/Media/Id3/Frame/Comr.php b/src/Zend/Media/Id3/Frame/Comr.php index ce238b7..8c81cab 100644 --- a/src/Zend/Media/Id3/Frame/Comr.php +++ b/src/Zend/Media/Id3/Frame/Comr.php @@ -455,7 +455,7 @@ final class Zend_Media_Id3_Frame_Comr extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding) ->write($this->_currency) diff --git a/src/Zend/Media/Id3/Frame/Encr.php b/src/Zend/Media/Id3/Frame/Encr.php index d211584..8289ab2 100644 --- a/src/Zend/Media/Id3/Frame/Encr.php +++ b/src/Zend/Media/Id3/Frame/Encr.php @@ -156,7 +156,7 @@ final class Zend_Media_Id3_Frame_Encr extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeString8($this->_owner, 1) ->writeInt8($this->_method) diff --git a/src/Zend/Media/Id3/Frame/Equ2.php b/src/Zend/Media/Id3/Frame/Equ2.php index 7760645..2945d7a 100644 --- a/src/Zend/Media/Id3/Frame/Equ2.php +++ b/src/Zend/Media/Id3/Frame/Equ2.php @@ -183,7 +183,7 @@ final class Zend_Media_Id3_Frame_Equ2 extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeInt8($this->_interpolation) ->writeString8($this->_device, 1); diff --git a/src/Zend/Media/Id3/Frame/Equa.php b/src/Zend/Media/Id3/Frame/Equa.php index 1cc2377..0d86490 100644 --- a/src/Zend/Media/Id3/Frame/Equa.php +++ b/src/Zend/Media/Id3/Frame/Equa.php @@ -121,7 +121,7 @@ final class Zend_Media_Id3_Frame_Equa extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeInt8(16); foreach ($this->_adjustments as $frequency => $adjustment) { diff --git a/src/Zend/Media/Id3/Frame/Etco.php b/src/Zend/Media/Id3/Frame/Etco.php index 417d76d..7cda37a 100644 --- a/src/Zend/Media/Id3/Frame/Etco.php +++ b/src/Zend/Media/Id3/Frame/Etco.php @@ -157,7 +157,7 @@ final class Zend_Media_Id3_Frame_Etco extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_format); foreach ($this->_events as $timestamp => $type) { diff --git a/src/Zend/Media/Id3/Frame/Geob.php b/src/Zend/Media/Id3/Frame/Geob.php index 4b14ced..0ba46c5 100644 --- a/src/Zend/Media/Id3/Frame/Geob.php +++ b/src/Zend/Media/Id3/Frame/Geob.php @@ -236,7 +236,7 @@ final class Zend_Media_Id3_Frame_Geob extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding) ->writeString8($this->_mimeType, 1); diff --git a/src/Zend/Media/Id3/Frame/Grid.php b/src/Zend/Media/Id3/Frame/Grid.php index e5c72d9..7cb2a7b 100644 --- a/src/Zend/Media/Id3/Frame/Grid.php +++ b/src/Zend/Media/Id3/Frame/Grid.php @@ -151,7 +151,7 @@ final class Zend_Media_Id3_Frame_Grid extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeString8($this->_owner, 1) ->writeUInt8($this->_group) diff --git a/src/Zend/Media/Id3/Frame/Ipls.php b/src/Zend/Media/Id3/Frame/Ipls.php index a96e3a6..0f8c263 100644 --- a/src/Zend/Media/Id3/Frame/Ipls.php +++ b/src/Zend/Media/Id3/Frame/Ipls.php @@ -171,7 +171,7 @@ final class Zend_Media_Id3_Frame_Ipls extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding); foreach ($this->_people as $entry) { diff --git a/src/Zend/Media/Id3/Frame/Link.php b/src/Zend/Media/Id3/Frame/Link.php index 6623efc..a7ecf50 100644 --- a/src/Zend/Media/Id3/Frame/Link.php +++ b/src/Zend/Media/Id3/Frame/Link.php @@ -179,7 +179,7 @@ final class Zend_Media_Id3_Frame_Link extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeString8(substr($this->_target, 0, 4), 4) ->writeString8($this->_url, 1) diff --git a/src/Zend/Media/Id3/Frame/Mcdi.php b/src/Zend/Media/Id3/Frame/Mcdi.php index 06fca94..5a2e01e 100644 --- a/src/Zend/Media/Id3/Frame/Mcdi.php +++ b/src/Zend/Media/Id3/Frame/Mcdi.php @@ -95,7 +95,7 @@ final class Zend_Media_Id3_Frame_Mcdi extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->write($this->_data); } diff --git a/src/Zend/Media/Id3/Frame/Owne.php b/src/Zend/Media/Id3/Frame/Owne.php index 4aac05f..7fc3540 100644 --- a/src/Zend/Media/Id3/Frame/Owne.php +++ b/src/Zend/Media/Id3/Frame/Owne.php @@ -234,7 +234,7 @@ final class Zend_Media_Id3_Frame_Owne extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding) ->write($this->_currency) diff --git a/src/Zend/Media/Id3/Frame/Pcnt.php b/src/Zend/Media/Id3/Frame/Pcnt.php index 1dfcf80..250c39c 100644 --- a/src/Zend/Media/Id3/Frame/Pcnt.php +++ b/src/Zend/Media/Id3/Frame/Pcnt.php @@ -99,7 +99,7 @@ final class Zend_Media_Id3_Frame_Pcnt extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { if ($this->_counter > 4294967295) { $writer->writeInt64BE($this->_counter); // UInt64 diff --git a/src/Zend/Media/Id3/Frame/Popm.php b/src/Zend/Media/Id3/Frame/Popm.php index 785f25f..4d8d04f 100644 --- a/src/Zend/Media/Id3/Frame/Popm.php +++ b/src/Zend/Media/Id3/Frame/Popm.php @@ -163,7 +163,7 @@ final class Zend_Media_Id3_Frame_Popm extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeString8($this->_owner, 1) ->writeInt8($this->_rating); diff --git a/src/Zend/Media/Id3/Frame/Poss.php b/src/Zend/Media/Id3/Frame/Poss.php index f9b6c2d..265f9f7 100644 --- a/src/Zend/Media/Id3/Frame/Poss.php +++ b/src/Zend/Media/Id3/Frame/Poss.php @@ -121,7 +121,7 @@ final class Zend_Media_Id3_Frame_Poss extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_format) ->writeUInt32BE($this->_position); diff --git a/src/Zend/Media/Id3/Frame/Priv.php b/src/Zend/Media/Id3/Frame/Priv.php index 42103de..9cffd28 100644 --- a/src/Zend/Media/Id3/Frame/Priv.php +++ b/src/Zend/Media/Id3/Frame/Priv.php @@ -117,7 +117,7 @@ final class Zend_Media_Id3_Frame_Priv extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeString8($this->_owner, 1) ->write($this->_data); diff --git a/src/Zend/Media/Id3/Frame/Rbuf.php b/src/Zend/Media/Id3/Frame/Rbuf.php index dd2bb3b..c5046ad 100644 --- a/src/Zend/Media/Id3/Frame/Rbuf.php +++ b/src/Zend/Media/Id3/Frame/Rbuf.php @@ -178,7 +178,7 @@ final class Zend_Media_Id3_Frame_Rbuf extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $tmp = new Zend_Io_StringWriter(); $tmp->writeUInt32BE($this->_bufferSize); diff --git a/src/Zend/Media/Id3/Frame/Rva2.php b/src/Zend/Media/Id3/Frame/Rva2.php index 18dd408..13f35df 100644 --- a/src/Zend/Media/Id3/Frame/Rva2.php +++ b/src/Zend/Media/Id3/Frame/Rva2.php @@ -189,7 +189,7 @@ final class Zend_Media_Id3_Frame_Rva2 extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeString8($this->_device, 1); foreach ($this->_adjustments as $channel) { diff --git a/src/Zend/Media/Id3/Frame/Rvad.php b/src/Zend/Media/Id3/Frame/Rvad.php index 5932677..622770b 100644 --- a/src/Zend/Media/Id3/Frame/Rvad.php +++ b/src/Zend/Media/Id3/Frame/Rvad.php @@ -188,7 +188,7 @@ final class Zend_Media_Id3_Frame_Rvad extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeInt8($flags = 0); if ($this->_adjustments[self::right] > 0) diff --git a/src/Zend/Media/Id3/Frame/Rvrb.php b/src/Zend/Media/Id3/Frame/Rvrb.php index 98432ac..3edff59 100644 --- a/src/Zend/Media/Id3/Frame/Rvrb.php +++ b/src/Zend/Media/Id3/Frame/Rvrb.php @@ -315,7 +315,7 @@ final class Zend_Media_Id3_Frame_Rvrb extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt16BE($this->_reverbLeft) ->writeUInt16BE($this->_reverbRight) diff --git a/src/Zend/Media/Id3/Frame/Seek.php b/src/Zend/Media/Id3/Frame/Seek.php index 791bf72..102e121 100644 --- a/src/Zend/Media/Id3/Frame/Seek.php +++ b/src/Zend/Media/Id3/Frame/Seek.php @@ -88,7 +88,7 @@ final class Zend_Media_Id3_Frame_Seek extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeInt32BE($this->_minOffset); } diff --git a/src/Zend/Media/Id3/Frame/Sign.php b/src/Zend/Media/Id3/Frame/Sign.php index 69f7262..a3b4692 100644 --- a/src/Zend/Media/Id3/Frame/Sign.php +++ b/src/Zend/Media/Id3/Frame/Sign.php @@ -115,7 +115,7 @@ final class Zend_Media_Id3_Frame_Sign extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_group) ->write($this->_signature); diff --git a/src/Zend/Media/Id3/Frame/Sylt.php b/src/Zend/Media/Id3/Frame/Sylt.php index 81c4c17..74f6a11 100644 --- a/src/Zend/Media/Id3/Frame/Sylt.php +++ b/src/Zend/Media/Id3/Frame/Sylt.php @@ -329,7 +329,7 @@ final class Zend_Media_Id3_Frame_SYLT extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding) ->write($this->_language) diff --git a/src/Zend/Media/Id3/Frame/Sytc.php b/src/Zend/Media/Id3/Frame/Sytc.php index 36b889a..df2698a 100644 --- a/src/Zend/Media/Id3/Frame/Sytc.php +++ b/src/Zend/Media/Id3/Frame/Sytc.php @@ -141,7 +141,7 @@ final class Zend_Media_Id3_Frame_Sytc extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_format); foreach ($this->_events as $timestamp => $tempo) { diff --git a/src/Zend/Media/Id3/Frame/Tsrc.php b/src/Zend/Media/Id3/Frame/Tsrc.php index 0747d9d..92fa926 100644 --- a/src/Zend/Media/Id3/Frame/Tsrc.php +++ b/src/Zend/Media/Id3/Frame/Tsrc.php @@ -196,11 +196,11 @@ final class Zend_Media_Id3_Frame_Tsrc extends Zend_Media_Id3_TextFrame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $this->setText ($this->_country . $this->_registrant . $this->_year . $this->_uniqueNumber, Zend_Media_Id3_Encoding::ISO88591); - parent::_writeFrame($writer); + parent::_writeData($writer); } } diff --git a/src/Zend/Media/Id3/Frame/Txxx.php b/src/Zend/Media/Id3/Frame/Txxx.php index 4850bd9..d519943 100644 --- a/src/Zend/Media/Id3/Frame/Txxx.php +++ b/src/Zend/Media/Id3/Frame/Txxx.php @@ -117,7 +117,7 @@ final class Zend_Media_Id3_Frame_Txxx extends Zend_Media_Id3_TextFrame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding); switch ($this->_encoding) { diff --git a/src/Zend/Media/Id3/Frame/Unknown.php b/src/Zend/Media/Id3/Frame/Unknown.php index 0701447..ac43daf 100644 --- a/src/Zend/Media/Id3/Frame/Unknown.php +++ b/src/Zend/Media/Id3/Frame/Unknown.php @@ -43,6 +43,6 @@ final class Zend_Media_Id3_Frame_Unknown extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) {} } diff --git a/src/Zend/Media/Id3/Frame/Uslt.php b/src/Zend/Media/Id3/Frame/Uslt.php index fa5cb73..8c866f2 100644 --- a/src/Zend/Media/Id3/Frame/Uslt.php +++ b/src/Zend/Media/Id3/Frame/Uslt.php @@ -127,7 +127,7 @@ final class Zend_Media_Id3_Frame_Uslt extends Zend_Media_Id3_LanguageTextFrame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding) ->write($this->_language); diff --git a/src/Zend/Media/Id3/Frame/Wxxx.php b/src/Zend/Media/Id3/Frame/Wxxx.php index 2ec8566..e1f0c92 100644 --- a/src/Zend/Media/Id3/Frame/Wxxx.php +++ b/src/Zend/Media/Id3/Frame/Wxxx.php @@ -157,7 +157,7 @@ final class Zend_Media_Id3_Frame_Wxxx extends Zend_Media_Id3_LinkFrame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding); switch ($this->_encoding) { diff --git a/src/Zend/Media/Id3/LanguageTextFrame.php b/src/Zend/Media/Id3/LanguageTextFrame.php index e4aaa8d..e55063f 100644 --- a/src/Zend/Media/Id3/LanguageTextFrame.php +++ b/src/Zend/Media/Id3/LanguageTextFrame.php @@ -201,7 +201,7 @@ abstract class Zend_Media_Id3_LanguageTextFrame extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding) ->write($this->_language); diff --git a/src/Zend/Media/Id3/LinkFrame.php b/src/Zend/Media/Id3/LinkFrame.php index 9e2f160..6d3be2f 100644 --- a/src/Zend/Media/Id3/LinkFrame.php +++ b/src/Zend/Media/Id3/LinkFrame.php @@ -85,7 +85,7 @@ abstract class Zend_Media_Id3_LinkFrame extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->write($this->_link); } diff --git a/src/Zend/Media/Id3/NumberFrame.php b/src/Zend/Media/Id3/NumberFrame.php index 33c875c..c00779f 100644 --- a/src/Zend/Media/Id3/NumberFrame.php +++ b/src/Zend/Media/Id3/NumberFrame.php @@ -85,9 +85,9 @@ abstract class Zend_Media_Id3_NumberFrame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $this->setEncoding(Zend_Media_Id3_Encoding::ISO88591); - parent::_writeFrame($writer); + parent::_writeData($writer); } } diff --git a/src/Zend/Media/Id3/TextFrame.php b/src/Zend/Media/Id3/TextFrame.php index 524e692..e189f13 100644 --- a/src/Zend/Media/Id3/TextFrame.php +++ b/src/Zend/Media/Id3/TextFrame.php @@ -170,7 +170,7 @@ abstract class Zend_Media_Id3_TextFrame extends Zend_Media_Id3_Frame * @param Zend_Io_Writer $writer The writer object. * @return void */ - protected function _writeFrame($writer) + protected function _writeData($writer) { $writer->writeUInt8($this->_encoding); switch ($this->_encoding) {