[aaf-commits] AAF/ref-impl/src/OM OMRootStorable.h, 1.15, 1.16 OMRootStorable.cpp, 1.22, 1.23

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

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

Modified Files:
	OMRootStorable.h OMRootStorable.cpp 
Log Message:
Revert the previous change and move the defenition of SMPTE Root class ID to OMKLVStoredObject.cpp as it is currently used only in KLV encoded files.

Index: OMRootStorable.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/OM/OMRootStorable.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** OMRootStorable.h	14 Dec 2007 18:53:32 -0000	1.15
--- OMRootStorable.h	14 Dec 2007 19:55:33 -0000	1.16
***************
*** 83,87 ****
  
    static const OMClassId _rootClassId;
-   static const OMClassId _SMPTERootClassId;
  
    void setDictionary(OMDictionary* dictionary);
--- 83,86 ----

Index: OMRootStorable.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/OM/OMRootStorable.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** OMRootStorable.cpp	14 Dec 2007 18:53:32 -0000	1.22
--- OMRootStorable.cpp	14 Dec 2007 19:55:33 -0000	1.23
***************
*** 55,62 ****
  { 0xb3b398a5, 0x1c90, 0x11d4, { 0x80, 0x53, 0x8, 0x0, 0x36, 0x21, 0x8, 0x4 } };
  
- // {0D010101-0300-0000-060E-2B3402060101}
- const OMClassId OMRootStorable::_SMPTERootClassId =
- { 0x0d010101, 0x0300, 0x0000, { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x06, 0x01, 0x01 } };
- 
  const OMClassId& OMRootStorable::classId(void) const
  {
--- 55,58 ----