Changeset 618 for trunk/libffado/src/libavc/streamformat
- Timestamp:
- 09/05/07 07:07:05 (17 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/libavc/streamformat/avc_extended_stream_format.cpp
r505 r618 23 23 24 24 #include "avc_extended_stream_format.h" 25 #include " ../util/avc_serialize.h"25 #include "libutil/cmd_serialize.h" 26 26 #include "libieee1394/ieee1394service.h" 27 27 … … 53 53 54 54 bool 55 StreamFormatInfo::serialize( IOSSerialize& se )55 StreamFormatInfo::serialize( Util::IOSSerialize& se ) 56 56 { 57 57 se.write( m_numberOfChannels, "StreamFormatInfo numberOfChannels" ); … … 61 61 62 62 bool 63 StreamFormatInfo::deserialize( IISDeserialize& de )63 StreamFormatInfo::deserialize( Util::IISDeserialize& de ) 64 64 { 65 65 de.read( &m_numberOfChannels ); … … 86 86 87 87 bool 88 FormatInformationStreamsSync::serialize( IOSSerialize& se )88 FormatInformationStreamsSync::serialize( Util::IOSSerialize& se ) 89 89 { 90 90 se.write( m_reserved0, "FormatInformationStreamsSync reserved" ); … … 102 102 103 103 bool 104 FormatInformationStreamsSync::deserialize( IISDeserialize& de )104 FormatInformationStreamsSync::deserialize( Util::IISDeserialize& de ) 105 105 { 106 106 de.read( &m_reserved0 ); … … 157 157 158 158 bool 159 FormatInformationStreamsCompound::serialize( IOSSerialize& se )159 FormatInformationStreamsCompound::serialize( Util::IOSSerialize& se ) 160 160 { 161 161 se.write( m_samplingFrequency, "FormatInformationStreamsCompound samplingFrequency" ); … … 172 172 173 173 bool 174 FormatInformationStreamsCompound::deserialize( IISDeserialize& de )174 FormatInformationStreamsCompound::deserialize( Util::IISDeserialize& de ) 175 175 { 176 176 de.read( &m_samplingFrequency ); … … 223 223 224 224 bool 225 FormatInformation::serialize( IOSSerialize& se )225 FormatInformation::serialize( Util::IOSSerialize& se ) 226 226 { 227 227 if ( m_root != eFHR_Invalid ) { … … 241 241 242 242 bool 243 FormatInformation::deserialize( IISDeserialize& de )243 FormatInformation::deserialize( Util::IISDeserialize& de ) 244 244 { 245 245 bool result = false; … … 338 338 339 339 bool 340 ExtendedStreamFormatCmd::serialize( IOSSerialize& se )340 ExtendedStreamFormatCmd::serialize( Util::IOSSerialize& se ) 341 341 { 342 342 AVCCommand::serialize( se ); … … 352 352 353 353 bool 354 ExtendedStreamFormatCmd::deserialize( IISDeserialize& de )354 ExtendedStreamFormatCmd::deserialize( Util::IISDeserialize& de ) 355 355 { 356 356 AVCCommand::deserialize( de ); trunk/libffado/src/libavc/streamformat/avc_extended_stream_format.h
r503 r618 106 106 #define AVC1394_EXTENDED_STREAM_FORMAT_INFO_STATUS_NOT_USED 0xff 107 107 108 class IOSSerialize;109 class IISDeserialize;108 class Util::IOSSerialize; 109 class Util::IISDeserialize; 110 110 111 111 enum ERateControl { … … 121 121 StreamFormatInfo(); 122 122 123 virtual bool serialize( IOSSerialize& se );124 virtual bool deserialize( IISDeserialize& de );123 virtual bool serialize( Util::IOSSerialize& se ); 124 virtual bool deserialize( Util::IISDeserialize& de ); 125 125 126 126 virtual StreamFormatInfo* clone() const; … … 147 147 FormatInformationStreamsSync(); 148 148 149 virtual bool serialize( IOSSerialize& se );150 virtual bool deserialize( IISDeserialize& de );149 virtual bool serialize( Util::IOSSerialize& se ); 150 virtual bool deserialize( Util::IISDeserialize& de ); 151 151 virtual FormatInformationStreamsSync* clone() const; 152 152 … … 165 165 virtual ~FormatInformationStreamsCompound(); 166 166 167 virtual bool serialize( IOSSerialize& se );168 virtual bool deserialize( IISDeserialize& de );167 virtual bool serialize( Util::IOSSerialize& se ); 168 virtual bool deserialize( Util::IISDeserialize& de ); 169 169 virtual FormatInformationStreamsCompound* clone() const; 170 170 … … 231 231 virtual ~FormatInformation(); 232 232 233 virtual bool serialize( IOSSerialize& se );234 virtual bool deserialize( IISDeserialize& de );233 virtual bool serialize( Util::IOSSerialize& se ); 234 virtual bool deserialize( Util::IISDeserialize& de ); 235 235 236 236 virtual FormatInformation* clone() const; … … 271 271 bool setSubFunction( ESubFunction subFunction ); 272 272 273 virtual bool serialize( IOSSerialize& se );274 virtual bool deserialize( IISDeserialize& de );273 virtual bool serialize( Util::IOSSerialize& se ); 274 virtual bool deserialize( Util::IISDeserialize& de ); 275 275 276 276 EStatus getStatus();