[aaf-commits] AAF/ref-impl/src/impl ImplAAFFile.cpp,1.157,1.158

[Stuart C. <stu...@us...>]

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

Modified Files:
	ImplAAFFile.cpp 
Log Message:
Restore the Schemasoft as default structured storage encoding behaviour found
in v1.1.0 and v1.1.1 releases (this change only affects MS Windows builds).


Index: ImplAAFFile.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/src/impl/ImplAAFFile.cpp,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** ImplAAFFile.cpp	25 Apr 2007 13:59:08 -0000	1.157
--- ImplAAFFile.cpp	25 Apr 2007 15:16:48 -0000	1.158
***************
*** 164,167 ****
--- 164,171 ----
  }
  
+ //
+ // Returns the hard-coded default Structured Storage encoding for the
+ // given file kind.
+ //
  const aafUID_t *mapStructuredStorageFileKind_DefaultToActual(const aafUID_t *fk_in)
  {
***************
*** 169,178 ****
  		return NULL;
  
  	if (*fk_in == kAAFFileKind_Aaf4KBinary)
  	{
! #if defined(OM_USE_WINDOWS_SS) || defined(OM_USE_MACINTOSH_SS) || defined(OM_USE_MACINTOSH_WRAPPED_SS) || defined(OM_USE_REFERENCE_SS)
! 		return &kAAFFileKind_AafM4KBinary;
! #elif defined(OM_USE_SCHEMASOFT_SS)
  		return &kAAFFileKind_AafS4KBinary;
  #elif defined(OM_USE_GSF_SS)
  		return &kAAFFileKind_AafG4KBinary;
--- 173,185 ----
  		return NULL;
  
+ 	// When more than one encoding is enabled by defining more than one OM_USE_xxx_SS directive
+ 	// the default encoding is effectively hard-coded by the order of statements below.
+ 
  	if (*fk_in == kAAFFileKind_Aaf4KBinary)
  	{
! #if defined(OM_USE_SCHEMASOFT_SS)
  		return &kAAFFileKind_AafS4KBinary;
+ #elif defined(OM_USE_WINDOWS_SS) || defined(OM_USE_MACINTOSH_SS) || defined(OM_USE_MACINTOSH_WRAPPED_SS) || defined(OM_USE_REFERENCE_SS)
+ 		return &kAAFFileKind_AafM4KBinary;
  #elif defined(OM_USE_GSF_SS)
  		return &kAAFFileKind_AafG4KBinary;
***************
*** 181,188 ****
  	else if (*fk_in == kAAFFileKind_Aaf512Binary)
      {
! #if defined(OM_USE_WINDOWS_SS) || defined(OM_USE_MACINTOSH_SS) || defined(OM_USE_MACINTOSH_WRAPPED_SS) || defined(OM_USE_REFERENCE_SS)
! 		return &kAAFFileKind_AafM512Binary;
! #elif defined(OM_USE_SCHEMASOFT_SS)
  		return &kAAFFileKind_AafS512Binary;
  #elif defined(OM_USE_GSF_SS)
  		return &kAAFFileKind_AafG512Binary;
--- 188,195 ----
  	else if (*fk_in == kAAFFileKind_Aaf512Binary)
      {
! #if defined(OM_USE_SCHEMASOFT_SS)
  		return &kAAFFileKind_AafS512Binary;
+ #elif defined(OM_USE_WINDOWS_SS) || defined(OM_USE_MACINTOSH_SS) || defined(OM_USE_MACINTOSH_WRAPPED_SS) || defined(OM_USE_REFERENCE_SS)
+ 		return &kAAFFileKind_AafM512Binary;
  #elif defined(OM_USE_GSF_SS)
  		return &kAAFFileKind_AafG512Binary;
***************
*** 1666,1669 ****
--- 1673,1680 ----
  
  
+ 	// Structured Storage encodings are registered by defining the OM_USE_xxx_SS preprocessor
+ 	// directives and more than one can be registered and available at runtime.
+ 	// The default encoding is set in mapStructuredStorageFileKind_DefaultToActual().
+ 
  #if defined(OM_USE_WINDOWS_SS) || defined(OM_USE_MACINTOSH_SS) || defined(OM_USE_MACINTOSH_WRAPPED_SS) || defined(OM_USE_REFERENCE_SS)