Menu
▾
▴
[aaf-commits] AAF/dodo AAFCodecDef.dod, 1.15, 1.16 AAFContainerDef.dod, 1.13, 1.14 AAFDataDef.dod, 1.29, 1.30 AAFDataDef2.dod, 1.4, 1.5 AAFDataDef3.dod, 1.3, 1.4 AAFDefObject.dod, 1.24, 1.25 AAFInterpolationDef.dod, 1.9, 1.10 AAFKLVDataDefinition.dod, 1.4, 1.5 AAFMetaDefinition.dod, 1.6, 1.7 AAFOperationDef.dod, 1.33, 1.34 AAFParameterDef.dod, 1.27, 1.28 AAFPluginDef.dod, 1.19, 1.20 AAFRIFFChunk.dod, 1.1, 1.2 AAFTaggedValueDefinition.dod, 1.4, 1.5
|
From: William D. <bmd...@us...> - 2006-11-08 16:09:06
|
Update of /cvsroot/aaf/AAF/dodo In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22545 Modified Files: AAFCodecDef.dod AAFContainerDef.dod AAFDataDef.dod AAFDataDef2.dod AAFDataDef3.dod AAFDefObject.dod AAFInterpolationDef.dod AAFKLVDataDefinition.dod AAFMetaDefinition.dod AAFOperationDef.dod AAFParameterDef.dod AAFPluginDef.dod AAFRIFFChunk.dod AAFTaggedValueDefinition.dod Log Message: New V 1.2 RIFFChunk interface, implementation and miscellaneous cleanups Index: AAFDataDef.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFDataDef.dod,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** AAFDataDef.dod 10 Feb 2005 17:47:21 -0000 1.29 --- AAFDataDef.dod 8 Nov 2006 16:08:41 -0000 1.30 *************** *** 45,49 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 45,49 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, Index: AAFContainerDef.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFContainerDef.dod,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** AAFContainerDef.dod 10 Feb 2005 17:47:21 -0000 1.13 --- AAFContainerDef.dod 8 Nov 2006 16:08:41 -0000 1.14 *************** *** 53,57 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 53,57 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, Index: AAFTaggedValueDefinition.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFTaggedValueDefinition.dod,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AAFTaggedValueDefinition.dod 8 Jun 2005 15:37:06 -0000 1.4 --- AAFTaggedValueDefinition.dod 8 Nov 2006 16:08:43 -0000 1.5 *************** *** 49,53 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 49,53 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, Index: AAFOperationDef.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFOperationDef.dod,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** AAFOperationDef.dod 10 Feb 2005 17:47:25 -0000 1.33 --- AAFOperationDef.dod 8 Nov 2006 16:08:42 -0000 1.34 *************** *** 61,65 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 61,65 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, Index: AAFDefObject.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFDefObject.dod,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** AAFDefObject.dod 10 Feb 2005 17:47:21 -0000 1.24 --- AAFDefObject.dod 8 Nov 2006 16:08:42 -0000 1.25 *************** *** 54,58 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 54,58 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, Index: AAFDataDef2.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFDataDef2.dod,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AAFDataDef2.dod 10 Feb 2005 17:47:21 -0000 1.4 --- AAFDataDef2.dod 8 Nov 2006 16:08:41 -0000 1.5 *************** *** 41,45 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 41,45 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, Index: AAFParameterDef.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFParameterDef.dod,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** AAFParameterDef.dod 10 Feb 2005 17:47:25 -0000 1.27 --- AAFParameterDef.dod 8 Nov 2006 16:08:42 -0000 1.28 *************** *** 57,61 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 57,61 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, Index: AAFPluginDef.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFPluginDef.dod,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AAFPluginDef.dod 10 Feb 2005 17:47:25 -0000 1.19 --- AAFPluginDef.dod 8 Nov 2006 16:08:42 -0000 1.20 *************** *** 56,60 **** aafUID_constref, id, ! AUID for new DeObject, [in], --- 56,60 ---- aafUID_constref, id, ! AUID for new DefObject, [in], Index: AAFDataDef3.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFDataDef3.dod,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AAFDataDef3.dod 10 Feb 2005 17:47:21 -0000 1.3 --- AAFDataDef3.dod 8 Nov 2006 16:08:41 -0000 1.4 *************** *** 41,45 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 41,45 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, Index: AAFRIFFChunk.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFRIFFChunk.dod,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AAFRIFFChunk.dod 15 Feb 2006 23:02:47 -0000 1.1 --- AAFRIFFChunk.dod 8 Nov 2006 16:08:43 -0000 1.2 *************** *** 39,44 **** /// /// AAFRESULT_NOMEMORY ! /// - insufficient system memory is available to perform the /// operation. ///) --- 39,47 ---- /// /// AAFRESULT_NOMEMORY ! /// - Insufficient system memory is available to perform the /// operation. + /// + /// AAFRESULT_NOT_INITIALIZED + /// - This object has not yet had Initialize\(\) called on it. ///) *************** *** 49,53 **** AD_XCLASS_BEGIN(Concrete, StoredObject) ! AD_XMETHOD4(Initialize, [in], objPass, --- 52,56 ---- AD_XCLASS_BEGIN(Concrete, StoredObject) ! AD_XMETHOD1(Initialize, [in], objPass, *************** *** 55,82 **** chunkID, ChunkID value, - - [in], - objPass, - aafUInt32, - chunkLength, - ChunkLength value, - - [in], - objPass, - aafUInt32, - bytes, - Write this many bytes, - - [out\, size_is\(bytes\)], - objPass, - aafDataBuffer_t, - buffer, - Data to write, - - Initializes a newly allocated\, empty ! /// IAAFRIFFChunk-supporting object. This method must be ! /// called after allocation\, and before any other method can be ! /// called. /// /// Succeeds if: --- 58,67 ---- chunkID, ChunkID value, Initializes a newly allocated\, empty ! /// IAAFRIFFChunk-supporting object. The data content is initially ! /// empty. ! /// ! /// This method must be called after allocation\, and before any other ! /// method can be called. /// /// Succeeds if: *************** *** 104,107 **** --- 89,93 ---- /// /// Succeeds if all of the following are true: + /// - This object has already been had Initialize\(\) called on it. /// /// If this method fails\, the ChunkID property will not be *************** *** 120,128 **** Retrieved ChunkID, Gets the ChunkID property. ! /// /// Succeeds if all of the following are true: /// - pChunkID is a valid pointer - /// - the property is present. /// /// If this method fails\, pChunkID will not be changed. --- 106,113 ---- Retrieved ChunkID, Gets the ChunkID property. ! /// /// /// Succeeds if all of the following are true: /// - pChunkID is a valid pointer /// /// If this method fails\, pChunkID will not be changed. *************** *** 134,397 **** /// /// AAFRESULT_NULL_PARAM ! /// - pChunkID is NULL. ! /// ! /// AAFRESULT_PROP_NOT_PRESENT ! /// - the property is not present.) ! ! ! AD_XMETHOD1(SetChunkLength, ! [in], ! objPass, ! aafUInt32, ! chunkLength, ! Length to set, ! Sets the ChunkLength property ! ! /// ! /// Succeeds if all of the following are true: ! /// ! /// If this method fails\, the ChunkLength property will not be ! /// changed. ! /// ! /// This method will return the following codes: ! /// ! /// AAFRESULT_SUCCESS ! /// - succeeded. \(This is the only code indicating success.\)) ! ! AD_XMETHOD1(GetChunkLength, ! [out], ! objPass, ! aafUInt32 *, ! pChunkLength, ! Retrieved ChuckLength, ! Gets the ChunkLength property ! ! /// ! /// Succeeds if all of the following are true: ! /// - pMChunkLength is a valid pointer ! /// - the property is present. ! /// ! /// If this method fails\, pChunkLength will not be changed. ! /// ! /// This method will return the following codes: ! /// ! /// AAFRESULT_SUCCESS ! /// - succeeded. \(This is the only code indicating success.\) ! /// ! /// AAFRESULT_NULL_PARAM ! /// - pChunkLength is NULL. ! /// ! /// AAFRESULT_PROP_NOT_PRESENT ! /// - the property is not present.) ! ! ! AD_XMETHOD3(WriteChunkData, ! [in], ! objPass, ! aafUInt32, ! bytes, ! Write this many bytes, ! ! [out\, size_is\(bytes\)], ! objPass, ! aafDataBuffer_t, ! buffer, ! Data to write, ! ! [out\,ref], ! objPass, ! aafUInt32 *, ! pBytesWritten, ! Number of bytes actually written, ! ! Write the specified bytes to the chunk data stream. ! /// ! /// Succeeds if all of the following are true: ! /// - the number of bytes to write is non-zero. ! /// - the buffer pointer is valid. ! /// - the pBytesWritten pointer is valid. ! /// - the object is initialized. ! /// - the object is persistent \(attached to a file\). ! /// ! /// If this method fails the ChunkData property will ! /// not be changed. ! /// ! /// This method will return the following codes: ! /// ! /// AAFRESULT_SUCCESS ! /// - succeeded. \(This is the only code indicating success.\) ! /// ! /// AAFRESULT_INVALID_PARAM ! /// - bytes arg is larger than zero. ! /// ! /// AAFRESULT_NULL_PARAM ! /// - buffer arg is NULL. ! /// ! /// AAFRESULT_NULL_PARAM ! /// - pBytesWritten arg is NULL. ! /// ! /// AAFRESULT_NOT_INITIALIZED ! /// - the object is not initialized. ! /// ! /// AAFRESULT_OBJECT_NOT_PERSISTENT ! /// - the object is not persistent. ! /// ! /// AAFRESULT_CONTAINERWRITE ! /// - writing failed.) ! ! ! AD_XMETHOD3(ReadChunkData, ! [in], ! objPass, ! aafUInt32, ! bytes, ! Read this many bytes, ! ! [out\, size_is\(bytes\)], ! objPass, ! aafDataBuffer_t, ! buffer, ! Buffer to read the data to, - [out\,ref], - objPass, - aafUInt32 *, - pBytesRead, - Number of bytes actually read, - - Read the specified number of bytes from the chunk data - /// stream into buffer. - /// - /// Succeeds if all of the following are true: - /// - the object is initialized. - /// - the number of bytes to read is non-zero. - /// - the buffer pointer is valid. - /// - the pBytesRead pointer is valid. - /// - the ChunkData property is present. - /// - the object is persistent \(attached to a file\). - /// - not yet reached the end of the data stream. - /// - /// This method will return the following codes: - /// - /// AAFRESULT_SUCCESS - /// - succeeded. \(This is the only code indicating success.\) - /// - /// AAFRESULT_END_OF_DATA - /// - trying to read beyond the end of the data stream. - /// - /// AAFRESULT_NOT_INITIALIZED - /// - the object is not initialized. - /// - /// AAFRESULT_INVALID_PARAM - /// - bytes arg is larger than zero. - /// - /// AAFRESULT_NULL_PARAM - /// - buffer arg is NULL. - /// - /// AAFRESULT_NULL_PARAM - /// - pBytesRead arg is NULL. - /// - /// AAFRESULT_PROP_NOT_PRESENT - /// - the ChunkData property is not present. - /// - /// AAFRESULT_OBJECT_NOT_PERSISTENT - /// - the object is not persistent.) - AD_XMETHOD1(SetChunkDataPosition, - [in], - objPass, - aafPosition_t, - position, - Offset from the beginning of chunk data., ! Sets the offset from the beginning of chunk data. ! /// ! /// Succeeds if all of the following are true: ! /// - the object is initialized. ! /// - the object is persistent \(attached to a file\). ! /// ! /// If this method fails the position will not be changed. ! /// ! /// This method will return the following codes: ! /// ! /// AAFRESULT_SUCCESS ! /// - succeeded. \(This is the only code indicating success.\) ! /// ! /// AAFRESULT_NOT_INITIALIZED ! /// - the object is not initialized. ! /// ! /// AAFRESULT_OBJECT_NOT_PERSISTENT ! /// - the object is not persistent.) ! AD_XMETHOD1(GetChunkDataPosition, ! [out], ! objPass, ! aafPosition_t *, ! pPosition, ! Offset from the beginning of chunk data., - Gets the offset from the beginning of chunk data. - /// - /// Succeeds if all of the following are true: - /// - the object is initialized. - /// - the pPosition pointer is valid. - /// - the object is persistent \(attached to a file\). - /// - /// If this method fails nothing will be written to *pPosition. - /// - /// This method will return the following codes: - /// - /// AAFRESULT_SUCCESS - /// - succeeded. \(This is the only code indicating success.\) - /// - /// AAFRESULT_NOT_INITIALIZED - /// - the object is not initialized. - /// - /// AAFRESULT_NULL_PARAM - /// - pPosition arg is NULL. - /// - /// AAFRESULT_PROP_NOT_PRESENT - /// - the ChunkData property is not present. - /// - /// AAFRESULT_OBJECT_NOT_PERSISTENT - /// - the object is not persistent.) - AD_XMETHOD1(GetChunkDataSize, - [out], - objPass, - aafLength_t *, - pSize, - The size of chunk data., ! Gets the size of chunk data. ! /// ChunkData is optional property. ! /// ! /// Succeeds if all of the following are true: ! /// - the object is initialized. ! /// - the pSize pointer is valid. ! /// - the ChunkData property is present. ! /// - the object is persistent \(attached to a file\). ! /// ! /// If this method fails nothing will be written to *pSize. ! /// ! /// This method will return the following codes: ! /// ! /// AAFRESULT_SUCCESS ! /// - succeeded. \(This is the only code indicating success.\) ! /// ! /// AAFRESULT_NOT_INITIALIZED ! /// - the object is not initialized. ! /// ! /// AAFRESULT_NULL_PARAM ! /// - pSize arg is NULL. ! /// ! /// AAFRESULT_PROP_NOT_PRESENT ! /// - the ChunkData property is not present. ! /// ! /// AAFRESULT_OBJECT_NOT_PERSISTENT ! /// - the object is not persistent.) --- 119,158 ---- /// /// AAFRESULT_NULL_PARAM ! /// - pChunkID is NULL.) + AD_METHOD3(Read, + [in],aafUInt32, bytes, read this many bytes, + [out\\\, size_is\\\(bytes\\\)\\\, length_is\\\(*bytesRead\\\)],aafDataBuffer_t,buffer, buffer to receive chunk data, + [out\\\,ref],aafUInt32 *,pBytesRead,, + Reads data from this RIFFChunk at the current position. Advances the position \ + by the number of bytes read.) ! AD_METHOD3(Write, ! [in],aafUInt32, bytes, write this many bytes, ! [out\\\, size_is\\\(bytes\\\)],aafDataBuffer_t,buffer, chunk data to write, ! [out\\\,ref],aafUInt32 *,pBytesWritten, actual number of bytes written, ! Write data to this RIFFChunk at the current position. Advances the position ! /// by the number of bytes written. Any data beyond the new position is lost; ! ///that is\\\, the buffer is truncated.) ! AD_METHOD1(SetPosition, ! [in], aafPosition_t, offset, offset from beginning of the RIFFChunk data, ! Seeks to absolute position within the RIFFChunk data. The next Read or Write ! /// call will operate from the given position.) + AD_METHOD1(GetPosition, + [out], aafPosition_t*, pOffset, + current offset from beginning of the RIFFChunk data, + Gets the current position within the RIFFChunk data. This is the position at + ///which the next Read or Write call will operate.) ! AD_METHOD1(GetLength, ! [out], aafLength_t *, pLength, length of the RIFFChunk data, ! Returns the total size of the RIFFChunk data\\\, in bytes.) Index: AAFInterpolationDef.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFInterpolationDef.dod,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AAFInterpolationDef.dod 10 Feb 2005 17:47:24 -0000 1.9 --- AAFInterpolationDef.dod 8 Nov 2006 16:08:42 -0000 1.10 *************** *** 54,58 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 54,58 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, Index: AAFKLVDataDefinition.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFKLVDataDefinition.dod,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AAFKLVDataDefinition.dod 8 Jun 2005 15:37:05 -0000 1.4 --- AAFKLVDataDefinition.dod 8 Nov 2006 16:08:42 -0000 1.5 *************** *** 49,53 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 49,53 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, Index: AAFMetaDefinition.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFMetaDefinition.dod,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AAFMetaDefinition.dod 10 Feb 2005 17:47:24 -0000 1.6 --- AAFMetaDefinition.dod 8 Nov 2006 16:08:42 -0000 1.7 *************** *** 48,52 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 48,52 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, Index: AAFCodecDef.dod =================================================================== RCS file: /cvsroot/aaf/AAF/dodo/AAFCodecDef.dod,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** AAFCodecDef.dod 10 Feb 2005 17:47:21 -0000 1.15 --- AAFCodecDef.dod 8 Nov 2006 16:08:41 -0000 1.16 *************** *** 56,60 **** aafUID_constref, id, ! AUID for new DeObject, [in\, string], objPass, --- 56,60 ---- aafUID_constref, id, ! AUID for new DefObject, [in\, string], objPass, |