[aaf-commits] AAF/ref-impl/src/impl ImplAAFAES3PCMDescriptor.cpp, 1.2, 1.3 ImplAAFAES3PCMDescriptor.h, 1.2, 1.3

[William J. S. Ph.D. <ws...@us...>]

Update of /cvsroot/aaf/AAF/ref-impl/src/impl
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5318/ref-impl/src/impl

Modified Files:
	ImplAAFAES3PCMDescriptor.cpp ImplAAFAES3PCMDescriptor.h 
Log Message:
implemented changes to aes3pcmdescriptor as specified at aaf meeting

Index: ImplAAFAES3PCMDescriptor.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFAES3PCMDescriptor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ImplAAFAES3PCMDescriptor.h	10 Jan 2007 16:01:24 -0000	1.2
--- ImplAAFAES3PCMDescriptor.h	18 Jan 2007 21:19:42 -0000	1.3
***************
*** 130,133 ****
--- 130,134 ----
  	  // @parm [out] Address to store the FixedChannelStatusData.
  	  (aafUInt32 index,
+ 	  aafUInt32 sizeOfBuffer,
  	  aafUInt8 * pFixedChannelStatusData);
  
***************
*** 139,142 ****
--- 140,144 ----
  	  // @parm [in] FixedChannelStatusData.
  	  (aafUInt32 index,
+ 	  aafUInt32 sizeOfBuffer,
  	  aafUInt8 * pFixedChannelStatusData);
  
***************
*** 166,169 ****
--- 168,172 ----
  	  // @parm [out] Address to store the FixedUserData.
  	  (aafUInt32 index,
+ 	  aafUInt32 sizeOfBuffer,
  	  aafUInt8 * pFixedUserData);
  
***************
*** 175,178 ****
--- 178,182 ----
  	  // @parm [in] FixedUserData.
  	  (aafUInt32 index,
+ 	  aafUInt32 sizeOfBuffer,
  	  aafUInt8 * pFixedUserData);
  
***************
*** 202,210 ****
  	template<class T, class U> AAFRESULT STDMETHODCALLTYPE 
  	GetDataAt(aafUInt32 index, T * pData, U & array,
! 				   aafUInt32 SizeOfData);
  
  	template<class T, class U> AAFRESULT STDMETHODCALLTYPE
  	SetDataAt(aafUInt32 index, T * pData, U & array, 
! 				   aafUInt32 SizeOfData, const T & defValue);
  
  	
--- 206,215 ----
  	template<class T, class U> AAFRESULT STDMETHODCALLTYPE 
  	GetDataAt(aafUInt32 index, T * pData, U & array,
! 				   aafUInt32 SizeOfData, aafUInt32 sizeOfBuffer);
  
  	template<class T, class U> AAFRESULT STDMETHODCALLTYPE
  	SetDataAt(aafUInt32 index, T * pData, U & array, 
! 				   aafUInt32 SizeOfData, 
! 				   aafUInt32 sizeOfBuffer, const T & defValue);
  
  	

Index: ImplAAFAES3PCMDescriptor.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFAES3PCMDescriptor.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ImplAAFAES3PCMDescriptor.cpp	10 Jan 2007 16:01:24 -0000	1.2
--- ImplAAFAES3PCMDescriptor.cpp	18 Jan 2007 21:19:42 -0000	1.3
***************
*** 301,305 ****
  ImplAAFAES3PCMDescriptor::GetDataAt(aafUInt32 index,
  										 T * pData, U & array,
! 										 aafUInt32 SizeOfData)
  {
  	TRACE("ImplAAFAES3PCMDescriptor::GetDataAt");
--- 301,306 ----
  ImplAAFAES3PCMDescriptor::GetDataAt(aafUInt32 index,
  										 T * pData, U & array,
! 										 aafUInt32 SizeOfData, 
! 										 aafUInt32 sizeOfBuffer)
  {
  	TRACE("ImplAAFAES3PCMDescriptor::GetDataAt");
***************
*** 314,317 ****
--- 315,322 ----
  	}
  
+ 	if(SizeOfData != sizeOfBuffer) {
+ 		return AAFRESULT_WRONG_SIZE;
+ 	}
+ 
  	AAFRESULT res = VerifyDataArraySize<T, U>(index, SizeOfData, array, pData);
  	if(res != AAFRESULT_SUCCESS) {
***************
*** 334,338 ****
  ImplAAFAES3PCMDescriptor::SetDataAt(aafUInt32 index,
  									T * pData, U & array,
! 									aafUInt32 SizeOfData, const T & defValue)
  {
  	TRACE("ImplAAFAES3PCMDescriptor::SetDataAt");
--- 339,345 ----
  ImplAAFAES3PCMDescriptor::SetDataAt(aafUInt32 index,
  									T * pData, U & array,
! 									aafUInt32 SizeOfData, 
! 									aafUInt32 sizeOfBuffer, 
! 									const T & defValue)
  {
  	TRACE("ImplAAFAES3PCMDescriptor::SetDataAt");
***************
*** 347,350 ****
--- 354,362 ----
  		return(res);
  	}
+ 
+ 	if(SizeOfData != sizeOfBuffer) {
+ 		return AAFRESULT_WRONG_SIZE;
+ 	}
+ 
  	aafUInt32 beginIndex = index * SizeOfData;
  	aafUInt32 endIndex = (index + 1) * SizeOfData;
***************
*** 360,363 ****
--- 372,376 ----
  AAFRESULT STDMETHODCALLTYPE 
  ImplAAFAES3PCMDescriptor::GetFixedChannelStatusDataAt(aafUInt32 index,
+ 													  aafUInt32 sizeOfBuffer,
  											aafUInt8 * pFixedChannelStatusData)
  {
***************
*** 365,373 ****
  	return(GetDataAt<aafUInt8, OMArrayProperty<aafUInt8> >
  				(index, pFixedChannelStatusData, _fixedChannelStatusDataArray,
! 				 SizeOfFixedChannelStatusData));
  }
  
  AAFRESULT STDMETHODCALLTYPE
  ImplAAFAES3PCMDescriptor::SetFixedChannelStatusDataAt(aafUInt32 index,
  											aafUInt8 * pFixedChannelStatusData)
  {
--- 378,387 ----
  	return(GetDataAt<aafUInt8, OMArrayProperty<aafUInt8> >
  				(index, pFixedChannelStatusData, _fixedChannelStatusDataArray,
! 				 SizeOfFixedChannelStatusData, sizeOfBuffer));
  }
  
  AAFRESULT STDMETHODCALLTYPE
  ImplAAFAES3PCMDescriptor::SetFixedChannelStatusDataAt(aafUInt32 index,
+ 													  aafUInt32 sizeOfBuffer,
  											aafUInt8 * pFixedChannelStatusData)
  {
***************
*** 375,398 ****
  	return(SetDataAt<aafUInt8, OMArrayProperty<aafUInt8> >
  				(index, pFixedChannelStatusData, _fixedChannelStatusDataArray,
! 				 SizeOfFixedChannelStatusData, 0));
  }
  
  AAFRESULT STDMETHODCALLTYPE 
  ImplAAFAES3PCMDescriptor::GetFixedUserDataAt(aafUInt32 index,
! 												  aafUInt8 * pFixedUserData)
  {
  	TRACE("ImplAAFAES3PCMDescriptor::GetFixedUserDataAt");
  	return(GetDataAt<aafUInt8, OMArrayProperty<aafUInt8> >
  		(index, pFixedUserData, _fixedUserDataArray,
! 		SizeOfFixedUserData));
  }
  
  AAFRESULT STDMETHODCALLTYPE
  ImplAAFAES3PCMDescriptor::SetFixedUserDataAt(aafUInt32 index,
! 												  aafUInt8 * pFixedUserData)
  {
  	TRACE("ImplAAFAES3PCMDescriptor::SetFixedUserDataAt");
  	return(SetDataAt<aafUInt8, OMArrayProperty<aafUInt8> >
  		(index, pFixedUserData, _fixedUserDataArray,
! 		SizeOfFixedUserData, 0));
! }
--- 389,414 ----
  	return(SetDataAt<aafUInt8, OMArrayProperty<aafUInt8> >
  				(index, pFixedChannelStatusData, _fixedChannelStatusDataArray,
! 				 SizeOfFixedChannelStatusData, sizeOfBuffer, 0));
  }
  
  AAFRESULT STDMETHODCALLTYPE 
  ImplAAFAES3PCMDescriptor::GetFixedUserDataAt(aafUInt32 index,
! 											 aafUInt32 sizeOfBuffer,
! 											 aafUInt8 * pFixedUserData)
  {
  	TRACE("ImplAAFAES3PCMDescriptor::GetFixedUserDataAt");
  	return(GetDataAt<aafUInt8, OMArrayProperty<aafUInt8> >
  		(index, pFixedUserData, _fixedUserDataArray,
! 		SizeOfFixedUserData, sizeOfBuffer));
  }
  
  AAFRESULT STDMETHODCALLTYPE
  ImplAAFAES3PCMDescriptor::SetFixedUserDataAt(aafUInt32 index,
! 											 aafUInt32 sizeOfBuffer,
! 											 aafUInt8 * pFixedUserData)
  {
  	TRACE("ImplAAFAES3PCMDescriptor::SetFixedUserDataAt");
  	return(SetDataAt<aafUInt8, OMArrayProperty<aafUInt8> >
  		(index, pFixedUserData, _fixedUserDataArray,
! 		SizeOfFixedUserData, sizeOfBuffer, 0));
! }
\ No newline at end of file