Changeset 2442
- Timestamp:
- 10/27/13 20:27:34 (7 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/src/libavc/audiosubunit/avc_function_block.cpp
r2102 r2442 143 143 : IBusData() 144 144 , m_controlSelector( FunctionBlockProcessing::eCSE_Processing_Mixer ) 145 , m_controlDataLength( 0x02 ) 146 , m_mixerSetting( 0x0000 ) 145 147 { 146 148 } 147 149 148 150 FunctionBlockProcessingMixer::FunctionBlockProcessingMixer( const FunctionBlockProcessingMixer& rhs ) 149 : m_controlSelector( rhs.m_controlSelector ) 151 : m_controlSelector( rhs.m_controlSelector ), 152 m_controlDataLength( 0x02 ), 153 m_mixerSetting( 0x00 ) 150 154 { 151 155 } … … 159 163 { 160 164 bool bStatus; 161 bStatus = se.write( m_controlSelector, "FunctionBlockProcessingMixer controlSelector" ); 165 bStatus = se.write( m_controlSelector, "FunctionBlockProcessingMixer controlSelector" ); 166 bStatus &= se.write( m_controlDataLength, "FunctionBlockProcessingMixer controlDataLength" ); 167 bStatus &= se.write( m_mixerSetting, "FunctionBlockProcessingMixer mixerSetting" ); 162 168 163 169 return bStatus; … … 168 174 { 169 175 bool bStatus; 170 bStatus = de.read( &m_controlSelector ); 176 byte_t padding; 177 178 bStatus = de.read( &m_controlSelector ); 179 bStatus &= de.read( &m_controlDataLength ); 180 bStatus &= de.read( &m_mixerSetting ); 181 bStatus &= de.read( &padding ); 182 bStatus &= de.read( &padding ); 171 183 172 184 return bStatus; trunk/libffado/src/libavc/audiosubunit/avc_function_block.h
r1498 r2442 79 79 virtual FunctionBlockProcessingMixer* clone() const; 80 80 81 control_selector_t m_controlSelector; 81 control_selector_t m_controlSelector; 82 control_data_length_t m_controlDataLength; 83 u_int16_t m_mixerSetting; 82 84 }; 83 85