[aaf-commits] AAF/ref-impl/src/com-api CAAFPlainStreamData.cpp, NONE, 1.1 CAAFPlainStreamData.h, NONE, 1.1 AAFCLSIDs.h, 1.15, 1.16 AAFObjectTable.h, 1.15, 1.16 AAFObjectTable_i.cpp, 1.15, 1.16 CAAFTypeDefMXFEssenceStream.cpp, 1.1, NONE CAAFTypeDefMXFEssenceStream.h, 1.1, NONE

[Alexey K. <akh...@us...>]

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

Modified Files:
	AAFCLSIDs.h AAFObjectTable.h AAFObjectTable_i.cpp 
Added Files:
	CAAFPlainStreamData.cpp CAAFPlainStreamData.h 
Removed Files:
	CAAFTypeDefMXFEssenceStream.cpp CAAFTypeDefMXFEssenceStream.h 
Log Message:
Rename AAFTypeDefMXFEssenceStream to AAFPlainStreamData.

--- NEW FILE: CAAFPlainStreamData.cpp ---
//=---------------------------------------------------------------------=
//
// This file was GENERATED for the AAF SDK
//
// $Id: CAAFPlainStreamData.cpp,v 1.1 2007/01/30 19:58:30 akharkev Exp $ $Name:  $
//
// The contents of this file are subject to the AAF SDK Public
// Source License Agreement (the "License"); You may not use this file
// except in compliance with the License.  The License is available in
// AAFSDKPSL.TXT, or you may obtain a copy of the License from the AAF
// Association or its successor.
//
// Software distributed under the License is distributed on an "AS IS"
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
// the License for the specific language governing rights and limitations
// under the License.
//
// The Original Code of this file is Copyright 1998-2007, Licensor of the
// AAF Association.
//
// The Initial Developer of the Original Code of this file and the
// Licensor of the AAF Association is Avid Technology.
// All rights reserved.
//
//=---------------------------------------------------------------------=



#include "CAAFPlainStreamData.h"
#include "ImplAAFPlainStreamData.h"
#include "AAFResult.h"
#include "CAAFEnumValidation.h"

#include "OMAssertions.h"
#include "OMExceptions.h"

#include <assert.h>
#include <string.h>


// CLSID for AAFPlainStreamData 
// {6760c4b4-129c-4356-8048-bd69c6aba4a4}
EXTERN_C const CLSID CLSID_AAFPlainStreamData = { 0x6760c4b4, 0x129c, 0x4356, { 0x80, 0x48, 0xbd, 0x69, 0xc6, 0xab, 0xa4, 0xa4 } };





CAAFPlainStreamData::CAAFPlainStreamData (IUnknown * pControllingUnknown, aafBool doInit)
  : CAAFTypeDefStream (pControllingUnknown, kAAFFalse)
{
  if (doInit)
    {
      ImplAAFPlainStreamData * newRep;
      newRep = new ImplAAFPlainStreamData;
      assert (newRep);
      InitRep (newRep);
    }
}


CAAFPlainStreamData::~CAAFPlainStreamData ()
{
}



//
// 
// 
inline int EQUAL_UID(const GUID & a, const GUID & b)
{
  return (0 == memcmp((&a), (&b), sizeof (aafUID_t)));
}
HRESULT CAAFPlainStreamData::InternalQueryInterface
(
    REFIID riid,
    void **ppvObj)
{
    if (NULL == ppvObj)
        return E_INVALIDARG;

    // We only support the IClassFactory interface 
    if (EQUAL_UID(riid,IID_IAAFPlainStreamData)) 
    { 
        *ppvObj = (IAAFPlainStreamData *)this; 
        ((IUnknown *)*ppvObj)->AddRef();
        return S_OK;
    }

    // Always delegate back to base implementation.
    return CAAFTypeDefStream::InternalQueryInterface(riid, ppvObj);
}

//
// Define the contrete object support implementation.
// 
AAF_DEFINE_FACTORY(AAFPlainStreamData)


--- CAAFTypeDefMXFEssenceStream.cpp DELETED ---

--- CAAFTypeDefMXFEssenceStream.h DELETED ---

Index: AAFCLSIDs.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/com-api/AAFCLSIDs.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AAFCLSIDs.h	26 Jan 2007 18:49:07 -0000	1.15
--- AAFCLSIDs.h	30 Jan 2007 19:58:30 -0000	1.16
***************
*** 112,115 ****
--- 112,116 ----
  EXTERN_C const CLSID CLSID_AAFParameterDef;
  EXTERN_C const CLSID CLSID_AAFPhysicalDescriptor;
+ EXTERN_C const CLSID CLSID_AAFPlainStreamData;
  EXTERN_C const CLSID CLSID_AAFPluginDef;
  EXTERN_C const CLSID CLSID_AAFPluginManager;
***************
*** 152,156 ****
  EXTERN_C const CLSID CLSID_AAFTypeDefIndirect;
  EXTERN_C const CLSID CLSID_AAFTypeDefInt;
- EXTERN_C const CLSID CLSID_AAFTypeDefMXFEssenceStream;
  EXTERN_C const CLSID CLSID_AAFTypeDefObjectRef;
  EXTERN_C const CLSID CLSID_AAFTypeDefOpaque;
--- 153,156 ----

--- NEW FILE: CAAFPlainStreamData.h ---
//@doc
//@class    AAFPlainStreamData | Implementation class for AAFPlainStreamData
#ifndef __CAAFPlainStreamData_h__
#define __CAAFPlainStreamData_h__

//=---------------------------------------------------------------------=
//
// This file was GENERATED for the AAF SDK
//
// $Id: CAAFPlainStreamData.h,v 1.1 2007/01/30 19:58:31 akharkev Exp $ $Name:  $
//
// The contents of this file are subject to the AAF SDK Public
// Source License Agreement (the "License"); You may not use this file
// except in compliance with the License.  The License is available in
// AAFSDKPSL.TXT, or you may obtain a copy of the License from the AAF
// Association or its successor.
//
// Software distributed under the License is distributed on an "AS IS"
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See
// the License for the specific language governing rights and limitations
// under the License.
//
// The Original Code of this file is Copyright 1998-2005, Licensor of the
// AAF Association.
//
// The Initial Developer of the Original Code of this file and the
// Licensor of the AAF Association is Avid Technology.
// All rights reserved.
//
//=---------------------------------------------------------------------=



#ifndef __AAF_h__
#include "AAF.h"
#endif





#ifndef __CAAFTypeDefStream_h__
#include "CAAFTypeDefStream.h"
#endif


class CAAFPlainStreamData
  : public IAAFPlainStreamData,
    public CAAFTypeDefStream
{
protected:

  //********
  //
  // Constructor/destructor
  //
  CAAFPlainStreamData (IUnknown * pControllingUnknown, aafBool doInit = kAAFTrue);
  virtual ~CAAFPlainStreamData ();

public:




protected:
  // 
  // Declare the QI that implements for the interfaces
  // for this module. This will be called by CAAFUnknown::QueryInterface().
  // 
  STDMETHOD(InternalQueryInterface)(REFIID riid, void **ppvObjOut);


public:
  //
  // This class as concrete. All AAF objects can be constructed from
  // a CLSID. This will allow subclassing all "base-classes" by
  // aggreggation.
  // 
  AAF_DECLARE_CONCRETE();
  //
  //********
};

#endif // ! __CAAFPlainStreamData_h__



Index: AAFObjectTable_i.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/com-api/AAFObjectTable_i.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AAFObjectTable_i.cpp	26 Jan 2007 18:49:07 -0000	1.15
--- AAFObjectTable_i.cpp	30 Jan 2007 19:58:30 -0000	1.16
***************
*** 109,112 ****
--- 109,113 ----
  #include "CAAFParameterDef.h"
  #include "CAAFPhysicalDescriptor.h"
+ #include "CAAFPlainStreamData.h"
  #include "CAAFPluginDef.h"
  #include "CAAFPluginManager.h"
***************
*** 149,153 ****
  #include "CAAFTypeDefIndirect.h"
  #include "CAAFTypeDefInt.h"
- #include "CAAFTypeDefMXFEssenceStream.h"
  #include "CAAFTypeDefObjectRef.h"
  #include "CAAFTypeDefOpaque.h"
--- 150,153 ----

Index: AAFObjectTable.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/com-api/AAFObjectTable.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AAFObjectTable.h	26 Jan 2007 18:49:07 -0000	1.15
--- AAFObjectTable.h	30 Jan 2007 19:58:30 -0000	1.16
***************
*** 131,134 ****
--- 131,135 ----
  	AAF_OBJECT_ENTRY(AAFParameterDef)
  	AAF_OBJECT_ENTRY(AAFPhysicalDescriptor)
+ 	AAF_OBJECT_ENTRY(AAFPlainStreamData)
  	AAF_OBJECT_ENTRY(AAFPluginDef)
  	AAF_OBJECT_ENTRY(AAFPluginManager)
***************
*** 171,175 ****
  	AAF_OBJECT_ENTRY(AAFTypeDefIndirect)
  	AAF_OBJECT_ENTRY(AAFTypeDefInt)
- 	AAF_OBJECT_ENTRY(AAFTypeDefMXFEssenceStream)
  	AAF_OBJECT_ENTRY(AAFTypeDefObjectRef)
  	AAF_OBJECT_ENTRY(AAFTypeDefOpaque)
--- 172,175 ----