[aaf-commits] AAF/ref-impl/src/com-api CAAFDescriptiveClip.h, 1.3, 1.4 CAAFEssenceData.h, 1.8, 1.9

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	CAAFDescriptiveClip.h CAAFEssenceData.h 
	CAAFDescriptiveClip.cpp 
Log Message:
Correct DescriptiveClip::SourceTrackIDs to DescriptiveClip::DescribedSlotIDs


Index: CAAFDescriptiveClip.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/com-api/CAAFDescriptiveClip.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CAAFDescriptiveClip.h	17 Jul 2006 17:16:44 -0000	1.3
--- CAAFDescriptiveClip.h	17 Apr 2007 17:32:51 -0000	1.4
***************
*** 72,76 ****
    /// Optional properties are added with separate functions.
    ///
!   /// Succeds if:
    /// - This object has not already been Initialize()d.
    ///
--- 72,76 ----
    /// Optional properties are added with separate functions.
    ///
!   /// Succeeds if:
    /// - This object has not already been Initialize()d.
    ///
***************
*** 101,112 ****
    //***********************************************************
    //
!   // CountSourceTrackIDs()
    //
!   // Gets the total number of source track IDs present in
!   /// the list of source track IDs referenced by this DescriptiveClip.
    ///
    /// Succeeds if all of the following are true:
    /// - the pCount pointer is valid;
!   /// - the SourceTrackIDs property is present.
    ///
    /// If this method fails nothing will be written to *pCount.
--- 101,112 ----
    //***********************************************************
    //
!   // CountDescribedSlotIDs()
    //
!   // Gets the total number of described slot IDs present in
!   /// the list of described slot IDs referenced by this DescriptiveClip.
    ///
    /// Succeeds if all of the following are true:
    /// - the pCount pointer is valid;
!   /// - the DescribedSlotIDs property is present.
    ///
    /// If this method fails nothing will be written to *pCount.
***************
*** 123,130 ****
    ///
    /// AAFRESULT_PROP_NOT_PRESENT
!   ///   - the SourceTrackIDs property is not present.
    //
!   STDMETHOD (CountSourceTrackIDs) (
!     // Number of source track IDs 
      /*[out, retval]*/ aafUInt32*  pCount);
  
--- 123,130 ----
    ///
    /// AAFRESULT_PROP_NOT_PRESENT
!   ///   - the DescribedSlotIDs property is not present.
    //
!   STDMETHOD (CountDescribedSlotIDs) (
!     // Number of described slot IDs 
      /*[out, retval]*/ aafUInt32*  pCount);
  
***************
*** 132,149 ****
    //***********************************************************
    //
!   // GetSourceTrackIDs()
    //
!   // Gets all the source track IDs in the list of
!   /// source track IDs referenced by this DescriptiveClip.
    ///
!   /// The values are written to the array specified by pSourceTrackIDs,
!   /// which is of size maxSourceTrackIDCount. The required size may be found
!   /// by calling CountSourceTrackIDs().
    /// 
    /// Succeeds if all of the following are true:
!   /// - pSourceTrackIDs is a valid pointer;
!   /// - maxSourceTrackIDCount indicates the array is large enough to hold the
    ///   data;
!   /// - the SourceTrackIDs property is present.
    /// 
    /// If this method fails, the property will not be changed.
--- 132,149 ----
    //***********************************************************
    //
!   // GetDescribedSlotIDs()
    //
!   // Gets all the described slot IDs in the list of
!   /// described slot IDs referenced by this DescriptiveClip.
    ///
!   /// The values are written to the array specified by pDescribedSlotIDs,
!   /// which is of size maxDescribedSlotIDCount. The required size may be found
!   /// by calling CountDescribedSlotIDs().
    /// 
    /// Succeeds if all of the following are true:
!   /// - pDescribedSlotIDs is a valid pointer;
!   /// - maxDescribedSlotIDCount indicates the array is large enough to hold the
    ///   data;
!   /// - the DescribedSlotIDs property is present.
    /// 
    /// If this method fails, the property will not be changed.
***************
*** 155,186 ****
    ///
    /// AAFRESULT_NULL_PARAM
!   ///   - pSourceTrackIDs is NULL.
    ///
    /// AAFRESULT_SMALLBUF
!   ///   - maxSourceTrackIDCount indicates that the array is too small to hold
!   ///     all the referenced source track IDs.
    ///
    /// AAFRESULT_PROP_NOT_PRESENT
!   ///   - the SourceTrackIDs property is not present.
    //
!   STDMETHOD (GetSourceTrackIDs) (
!     // The size of the given pSourceTrackIDs buffer
!     /*[in]*/ aafUInt32  maxSourceTrackIDCount,
  
!     // Array to hold the source track IDs
!     /*[out, size_is(maxSourceTrackIDCount)]*/ aafUInt32 *  pSourceTrackIDs);
  
  
    //***********************************************************
    //
!   // IsSourceTrackIDPresent()
    //
!   // Determines if the given source track ID is present in
!   /// the list of source track IDs referenced by this DescriptiveClip.
    ///
    ///
    /// Succeeds if all of the following are true:
    /// - the pIsPresent pointer is valid;
!   /// - the SourceTrackIDs property is present.
    ///
    /// If this method fails nothing will be written to *pIsPresent.
--- 155,186 ----
    ///
    /// AAFRESULT_NULL_PARAM
!   ///   - pDescribedSlotIDs is NULL.
    ///
    /// AAFRESULT_SMALLBUF
!   ///   - maxDescribedSlotIDCount indicates that the array is too small to hold
!   ///     all the referenced described slot IDs.
    ///
    /// AAFRESULT_PROP_NOT_PRESENT
!   ///   - the DescribedSlotIDs property is not present.
    //
!   STDMETHOD (GetDescribedSlotIDs) (
!     // The size of the given pDescribedSlotIDs buffer
!     /*[in]*/ aafUInt32  maxDescribedSlotIDCount,
  
!     // Array to hold the described slot IDs
!     /*[out, size_is(maxDescribedSlotIDCount)]*/ aafUInt32 *  pDescribedSlotIDs);
  
  
    //***********************************************************
    //
!   // IsDescribedSlotIDPresent()
    //
!   // Determines if the given described slot ID is present in
!   /// the list of described slot IDs referenced by this DescriptiveClip.
    ///
    ///
    /// Succeeds if all of the following are true:
    /// - the pIsPresent pointer is valid;
!   /// - the DescribedSlotIDs property is present.
    ///
    /// If this method fails nothing will be written to *pIsPresent.
***************
*** 197,207 ****
    ///
    /// AAFRESULT_PROP_NOT_PRESENT
!   ///   - the SourceTrackIDs property is not present.
    //
!   STDMETHOD (IsSourceTrackIDPresent) (
!     // Source track ID whose presence is to be queried
!     /*[in]*/ aafUInt32  sourceTrackID,
  
!     // True if sourceTrackID is present
      /*[out,retval]*/ aafBoolean_t*  pIsPresent);
  
--- 197,207 ----
    ///
    /// AAFRESULT_PROP_NOT_PRESENT
!   ///   - the DescribedSlotIDs property is not present.
    //
!   STDMETHOD (IsDescribedSlotIDPresent) (
!     // Described slot ID whose presence is to be queried
!     /*[in]*/ aafUInt32  describedSlotID,
  
!     // True if describedSlotID is present
      /*[out,retval]*/ aafBoolean_t*  pIsPresent);
  
***************
*** 209,220 ****
    //***********************************************************
    //
!   // AddSourceTrackID()
    //
!   // Appends the given source track ID to the list of
!   /// source track IDs referenced by this DescriptiveClip.
    ///
    /// Succeeds if all of the following are true:
!   /// - the given source track ID is not already contained in the list
!   ///   of source track IDs referenced by this DescriptiveClip.
    ///
    /// If this method fails, the property will not be changed.
--- 209,220 ----
    //***********************************************************
    //
!   // AddDescribedSlotID()
    //
!   // Appends the given described slot ID to the list of
!   /// described slot IDs referenced by this DescriptiveClip.
    ///
    /// Succeeds if all of the following are true:
!   /// - the given described slot ID is not already contained in the list
!   ///   of described slot IDs referenced by this DescriptiveClip.
    ///
    /// If this method fails, the property will not be changed.
***************
*** 226,243 ****
    ///
    /// AAFRESULT_INVALID_PARAM
!   ///   - The given source track ID is already contained in the list
!   ///     of source track IDs referenced by this DescriptiveClip.
    //
!   STDMETHOD (AddSourceTrackID) (
!     // Source track ID to add. 
!     /*[in]*/ aafUInt32  sourceTrackID);
  
  
    //***********************************************************
    //
!   // RemoveSourceTrackID()
    //
!   // Removes the given source track ID from
!   /// the list of source track IDs referenced by this DescriptiveClip.
    ///
    /// If the removed ID was the last ID in the list, the list is removed
--- 226,243 ----
    ///
    /// AAFRESULT_INVALID_PARAM
!   ///   - The given described slot ID is already contained in the list
!   ///     of described slot IDs referenced by this DescriptiveClip.
    //
!   STDMETHOD (AddDescribedSlotID) (
!     // Described slot ID to add. 
!     /*[in]*/ aafUInt32  describedSlotID);
  
  
    //***********************************************************
    //
!   // RemoveDescribedSlotID()
    //
!   // Removes the given described slot ID from
!   /// the list of described slot IDs referenced by this DescriptiveClip.
    ///
    /// If the removed ID was the last ID in the list, the list is removed
***************
*** 245,251 ****
    ///
    /// Succeeds if all of the following are true:
!   /// - the SourceTrackIDs property is present;
!   /// - the given source track ID is present in the list
!   ///   of source track IDs referenced by this DescriptiveClip.
    ///
    /// If this method fails, the property will not be changed.
--- 245,251 ----
    ///
    /// Succeeds if all of the following are true:
!   /// - the DescribedSlotIDs property is present;
!   /// - the given described slot ID is present in the list
!   ///   of described slot IDs referenced by this DescriptiveClip.
    ///
    /// If this method fails, the property will not be changed.
***************
*** 260,269 ****
    ///
    /// AAFRESULT_INVALID_PARAM
!   ///   - The given source track ID is not present in the list
!   ///     of source track IDs referenced by this DescriptiveClip.
    //
!   STDMETHOD (RemoveSourceTrackID) (
!     // Source track ID to remove. 
!     /*[in]*/ aafUInt32  sourceTrackID);
  
  
--- 260,269 ----
    ///
    /// AAFRESULT_INVALID_PARAM
!   ///   - The given described slot ID is not present in the list
!   ///     of described slot IDs referenced by this DescriptiveClip.
    //
!   STDMETHOD (RemoveDescribedSlotID) (
!     // Described slot ID to remove. 
!     /*[in]*/ aafUInt32  describedSlotID);
  
  
Index: CAAFDescriptiveClip.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/com-api/CAAFDescriptiveClip.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CAAFDescriptiveClip.cpp	8 Nov 2006 16:21:27 -0000	1.4
--- CAAFDescriptiveClip.cpp	17 Apr 2007 17:32:51 -0000	1.5
***************
*** 146,150 ****
  
  HRESULT STDMETHODCALLTYPE
!     CAAFDescriptiveClip::CountSourceTrackIDs (aafUInt32*  pCount)
  {
    HRESULT hr;
--- 146,150 ----
  
  HRESULT STDMETHODCALLTYPE
!     CAAFDescriptiveClip::CountDescribedSlotIDs (aafUInt32*  pCount)
  {
    HRESULT hr;
***************
*** 160,164 ****
    try
      {
!       hr = ptr->CountSourceTrackIDs
         (pCount);
      }
--- 160,164 ----
    try
      {
!       hr = ptr->CountDescribedSlotIDs
         (pCount);
      }
***************
*** 198,203 ****
  
  HRESULT STDMETHODCALLTYPE
!     CAAFDescriptiveClip::GetSourceTrackIDs (aafUInt32  maxSourceTrackIDCount,
!         aafUInt32 *  pSourceTrackIDs)
  {
    HRESULT hr;
--- 198,203 ----
  
  HRESULT STDMETHODCALLTYPE
!     CAAFDescriptiveClip::GetDescribedSlotIDs (aafUInt32  maxDescribedSlotIDCount,
!         aafUInt32 *  pDescribedSlotIDs)
  {
    HRESULT hr;
***************
*** 213,219 ****
    try
      {
!       hr = ptr->GetSourceTrackIDs
!        (maxSourceTrackIDCount,
!         pSourceTrackIDs);
      }
    catch (OMException& e)
--- 213,219 ----
    try
      {
!       hr = ptr->GetDescribedSlotIDs
!        (maxDescribedSlotIDCount,
!         pDescribedSlotIDs);
      }
    catch (OMException& e)
***************
*** 252,256 ****
  
  HRESULT STDMETHODCALLTYPE
!     CAAFDescriptiveClip::IsSourceTrackIDPresent (aafUInt32  sourceTrackID,
          aafBoolean_t*  pIsPresent)
  {
--- 252,256 ----
  
  HRESULT STDMETHODCALLTYPE
!     CAAFDescriptiveClip::IsDescribedSlotIDPresent (aafUInt32  describedSlotID,
          aafBoolean_t*  pIsPresent)
  {
***************
*** 267,272 ****
    try
      {
!       hr = ptr->IsSourceTrackIDPresent
!        (sourceTrackID,
          pIsPresent);
      }
--- 267,272 ----
    try
      {
!       hr = ptr->IsDescribedSlotIDPresent
!        (describedSlotID,
          pIsPresent);
      }
***************
*** 306,310 ****
  
  HRESULT STDMETHODCALLTYPE
!     CAAFDescriptiveClip::AddSourceTrackID (aafUInt32  sourceTrackID)
  {
    HRESULT hr;
--- 306,310 ----
  
  HRESULT STDMETHODCALLTYPE
!     CAAFDescriptiveClip::AddDescribedSlotID (aafUInt32  describedSlotID)
  {
    HRESULT hr;
***************
*** 320,325 ****
    try
      {
!       hr = ptr->AddSourceTrackID
!        (sourceTrackID);
      }
    catch (OMException& e)
--- 320,325 ----
    try
      {
!       hr = ptr->AddDescribedSlotID
!        (describedSlotID);
      }
    catch (OMException& e)
***************
*** 358,362 ****
  
  HRESULT STDMETHODCALLTYPE
!     CAAFDescriptiveClip::RemoveSourceTrackID (aafUInt32  sourceTrackID)
  {
    HRESULT hr;
--- 358,362 ----
  
  HRESULT STDMETHODCALLTYPE
!     CAAFDescriptiveClip::RemoveDescribedSlotID (aafUInt32  describedSlotID)
  {
    HRESULT hr;
***************
*** 372,377 ****
    try
      {
!       hr = ptr->RemoveSourceTrackID
!        (sourceTrackID);
      }
    catch (OMException& e)
--- 372,377 ----
    try
      {
!       hr = ptr->RemoveDescribedSlotID
!        (describedSlotID);
      }
    catch (OMException& e)

Index: CAAFEssenceData.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/com-api/CAAFEssenceData.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CAAFEssenceData.h	16 Mar 2007 18:07:39 -0000	1.8
--- CAAFEssenceData.h	17 Apr 2007 17:32:51 -0000	1.9
***************
*** 328,331 ****
--- 328,332 ----
    // - Initialize() has already been called on this object.
    // - pPlainEssenceData is a valid pointer.
+   // - reserved is 0.
    //
    // This method will return the following codes.  If more than one of
***************
*** 341,344 ****
--- 342,348 ----
    // AAFRESULT_NULL_PARAM
    //   - pPlainEssenceData arg is NULL.
+   ///
+   /// AAFRESULT_INVALID_PARAM
+   ///   - reserved is not 0.
    // @end
    //

[aaf-commits] AAF/ref-impl/src/com-api CAAFDescriptiveClip.h, 1.3, 1.4 CAAFEssenceData.h, 1.8, 1.9

[aaf-commits] AAF/ref-impl/src/com-api CAAFDescriptiveClip.h, 1.3, 1.4 CAAFEssenceData.h, 1.8, 1.9 CAAFDescriptiveClip.cpp, 1.4, 1.5