Changeset 618 for trunk/libffado/src/libavc/musicsubunit
- Timestamp:
- 09/05/07 07:07:05 (17 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/libavc/musicsubunit/avc_descriptor_music.cpp
r524 r618 27 27 #include "../descriptors/avc_descriptor_cmd.h" 28 28 29 #include " ../util/avc_serialize.h"29 #include "libutil/cmd_serialize.h" 30 30 #include "libieee1394/ieee1394service.h" 31 31 … … 48 48 49 49 bool 50 AVCMusicGeneralStatusInfoBlock::serialize( IOSSerialize& se )50 AVCMusicGeneralStatusInfoBlock::serialize( Util::IOSSerialize& se ) 51 51 { 52 52 bool result=true; … … 63 63 64 64 bool 65 AVCMusicGeneralStatusInfoBlock::deserialize( IISDeserialize& de )65 AVCMusicGeneralStatusInfoBlock::deserialize( Util::IISDeserialize& de ) 66 66 { 67 67 bool result=true; … … 86 86 87 87 bool 88 AVCMusicOutputPlugStatusInfoBlock::serialize( IOSSerialize& se )88 AVCMusicOutputPlugStatusInfoBlock::serialize( Util::IOSSerialize& se ) 89 89 { 90 90 bool result=true; … … 96 96 97 97 bool 98 AVCMusicOutputPlugStatusInfoBlock::deserialize( IISDeserialize& de )98 AVCMusicOutputPlugStatusInfoBlock::deserialize( Util::IISDeserialize& de ) 99 99 { 100 100 bool result=true; … … 128 128 129 129 bool 130 AVCMusicClusterInfoBlock::serialize( IOSSerialize& se )130 AVCMusicClusterInfoBlock::serialize( Util::IOSSerialize& se ) 131 131 { 132 132 bool result=true; … … 162 162 163 163 bool 164 AVCMusicClusterInfoBlock::deserialize( IISDeserialize& de )164 AVCMusicClusterInfoBlock::deserialize( Util::IISDeserialize& de ) 165 165 { 166 166 bool result=true; … … 255 255 256 256 bool 257 AVCMusicSubunitPlugInfoBlock::serialize( IOSSerialize& se )257 AVCMusicSubunitPlugInfoBlock::serialize( Util::IOSSerialize& se ) 258 258 { 259 259 bool result=true; … … 286 286 287 287 bool 288 AVCMusicSubunitPlugInfoBlock::deserialize( IISDeserialize& de )288 AVCMusicSubunitPlugInfoBlock::deserialize( Util::IISDeserialize& de ) 289 289 { 290 290 bool result=true; … … 388 388 389 389 bool 390 AVCMusicPlugInfoBlock::serialize( IOSSerialize& se )390 AVCMusicPlugInfoBlock::serialize( Util::IOSSerialize& se ) 391 391 { 392 392 bool result=true; … … 418 418 419 419 bool 420 AVCMusicPlugInfoBlock::deserialize( IISDeserialize& de )420 AVCMusicPlugInfoBlock::deserialize( Util::IISDeserialize& de ) 421 421 { 422 422 bool result=true; … … 519 519 520 520 bool 521 AVCMusicRoutingStatusInfoBlock::serialize( IOSSerialize& se )521 AVCMusicRoutingStatusInfoBlock::serialize( Util::IOSSerialize& se ) 522 522 { 523 523 bool result=true; … … 560 560 561 561 bool 562 AVCMusicRoutingStatusInfoBlock::deserialize( IISDeserialize& de )562 AVCMusicRoutingStatusInfoBlock::deserialize( Util::IISDeserialize& de ) 563 563 { 564 564 bool result=true; … … 654 654 655 655 bool 656 AVCMusicStatusDescriptor::serialize( IOSSerialize& se )656 AVCMusicStatusDescriptor::serialize( Util::IOSSerialize& se ) 657 657 { 658 658 bool result=true; … … 674 674 675 675 bool 676 AVCMusicStatusDescriptor::deserialize( IISDeserialize& de )676 AVCMusicStatusDescriptor::deserialize( Util::IISDeserialize& de ) 677 677 { 678 678 bool result=true; trunk/libffado/src/libavc/musicsubunit/avc_descriptor_music.h
r524 r618 48 48 49 49 50 class IOSSerialize;51 class IISDeserialize;50 class Util::IOSSerialize; 51 class Util::IISDeserialize; 52 52 53 53 /** … … 58 58 public: 59 59 60 virtual bool serialize( IOSSerialize& se );61 virtual bool deserialize( IISDeserialize& de );60 virtual bool serialize( Util::IOSSerialize& se ); 61 virtual bool deserialize( Util::IISDeserialize& de ); 62 62 63 63 AVCMusicGeneralStatusInfoBlock( ); … … 80 80 public: 81 81 82 virtual bool serialize( IOSSerialize& se );83 virtual bool deserialize( IISDeserialize& de );82 virtual bool serialize( Util::IOSSerialize& se ); 83 virtual bool deserialize( Util::IISDeserialize& de ); 84 84 85 85 AVCMusicOutputPlugStatusInfoBlock( ); … … 106 106 typedef std::vector<struct sSignalInfo>::iterator SignalInfoVectorIterator; 107 107 108 virtual bool serialize( IOSSerialize& se );109 virtual bool deserialize( IISDeserialize& de );108 virtual bool serialize( Util::IOSSerialize& se ); 109 virtual bool deserialize( Util::IISDeserialize& de ); 110 110 111 111 virtual bool clear(); … … 147 147 }; 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 152 152 AVCMusicSubunitPlugInfoBlock( ); … … 181 181 public: 182 182 183 virtual bool serialize( IOSSerialize& se );184 virtual bool deserialize( IISDeserialize& de );183 virtual bool serialize( Util::IOSSerialize& se ); 184 virtual bool deserialize( Util::IISDeserialize& de ); 185 185 virtual bool clear(); 186 186 … … 221 221 public: 222 222 223 virtual bool serialize( IOSSerialize& se );224 virtual bool deserialize( IISDeserialize& de );223 virtual bool serialize( Util::IOSSerialize& se ); 224 virtual bool deserialize( Util::IISDeserialize& de ); 225 225 226 226 AVCMusicRoutingStatusInfoBlock( ); … … 255 255 256 256 public: 257 virtual bool serialize( IOSSerialize& se );258 virtual bool deserialize( IISDeserialize& de );257 virtual bool serialize( Util::IOSSerialize& se ); 258 virtual bool deserialize( Util::IISDeserialize& de ); 259 259 260 260 AVCMusicStatusDescriptor( Unit* unit, Subunit* subunit ); trunk/libffado/src/libavc/musicsubunit/avc_musicsubunit.cpp
r612 r618 30 30 #include "../general/avc_plug_info.h" 31 31 #include "../streamformat/avc_extended_stream_format.h" 32 #include " ../util/avc_serialize.h"32 #include "libutil/cmd_serialize.h" 33 33 34 34 #include "avc_musicsubunit.h"