[aaf-commits] AAF/ref-impl/include/ref-api AAF.h, 1.42, 1.43 AAF_i.c, 1.20, 1.21

[Tim B. <tbi...@us...>]

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

Modified Files:
	AAF.h AAF_i.c 
Log Message:
Add AAFSetDiagnosticOutput() and IAAFDiagnosticOutput to support diagnostic output from the library to a client implemented destination.

Index: AAF_i.c
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/include/ref-api/AAF_i.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** AAF_i.c	14 Jul 2006 22:57:44 -0000	1.20
--- AAF_i.c	25 Jul 2006 23:06:38 -0000	1.21
***************
*** 510,513 ****
--- 510,516 ----
  
  
+ const IID IID_IAAFDiagnosticOutput = {0xC9346826,0x1CFE,0x4AEF,{0xBA,0x4D,0x54,0xD4,0x14,0x13,0x87,0x39}};
+ 
+ 
  const IID IID_IAAFDictionary2 = {0x952a5c85,0xdcec,0x4c99,{0x8e,0x40,0x97,0x8d,0x88,0xa0,0xcd,0xc1}};
  

Index: AAF.h
===================================================================
RCS file: /cvsroot/aaf/AAF/ref-impl/include/ref-api/AAF.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** AAF.h	17 Jul 2006 17:16:42 -0000	1.42
--- AAF.h	25 Jul 2006 23:06:36 -0000	1.43
***************
*** 192,195 ****
--- 192,196 ----
  interface IAAFDataDef2;
  interface IAAFDataDef3;
+ interface IAAFDiagnosticOutput;
  interface IAAFDictionary2;
  interface IAAFDigitalImageDescriptor2;
***************
*** 364,367 ****
--- 365,369 ----
  typedef interface IAAFDataDef2 IAAFDataDef2;
  typedef interface IAAFDataDef3 IAAFDataDef3;
+ typedef interface IAAFDiagnosticOutput IAAFDiagnosticOutput;
  typedef interface IAAFDictionary2 IAAFDictionary2;
  typedef interface IAAFDigitalImageDescriptor2 IAAFDigitalImageDescriptor2;
***************
*** 41075,41078 ****
--- 41077,41130 ----
  
  
+ // IAAFDiagnosticOutput
+ 
+ // ************************
+ //
+ // Interface IAAFDiagnosticOutput
+ //
+ // ************************
+ 
+ 
+ 
+ #ifndef __IAAFDiagnosticOutput_INTERFACE_DEFINED__
+ #define __IAAFDiagnosticOutput_INTERFACE_DEFINED__
+ 
+ EXTERN_C const IID IID_IAAFDiagnosticOutput;
+ 
+ 
+ #undef  INTERFACE
+ #define INTERFACE   IAAFDiagnosticOutput
+ 
+ DECLARE_INTERFACE_(IAAFDiagnosticOutput, IUnknown)
+ {
+   BEGIN_INTERFACE
+ 
+   /* *** IUnknown methods *** */
+   STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppvObj) PURE;
+   STDMETHOD_(ULONG,AddRef) (THIS)  PURE;
+   STDMETHOD_(ULONG,Release) (THIS) PURE;
+ 
+   /* *** IAAFDiagnosticOutput methods *** */
+ 
+ 
+   //***********************************************************
+   //
+   // PutString()
+   //
+   /// This method is called by the AAF toolkit to write a string
+   /// to this diagnostic output.
+   ///
+   /// @param pString [in, string] string to print out
+   ///
+   STDMETHOD(PutString) (THIS_
+     aafCharacter_constptr  pString) PURE;
+ 
+ 
+   END_INTERFACE
+ };
+ #endif // __IAAFDiagnosticOutput_INTERFACE_DEFINED__
+ 
+ 
+ 
  // IAAFDictionary2
  
***************
*** 50749,50752 ****
--- 50801,50831 ----
      IEnumAAFFileEncodings ** ppFileEncodings);
  
+   //***********************************************************
+   //
+   // AAFSetDiagnosticOutput()
+   //
+   /// Make the specified diagnostic output stream the AAF Toolkit's diagnostic output stream.
+   /// By default the diagnostic output goes to stderr. The passed in pointer is AddRefed.
+   /// The pointer will be Released the next time AAFSetDiagnosticOutput is called or when
+   /// the AAF DLL is unloaded.
+   /// 
+   ///
+   /// This method will succeed if the following are true:
+   /// - The pOutput pointer is valid.
+   ///
+   /// This method will return the following codes.  If more than one of
+   /// the listed errors is in effect, it will return the first one
+   /// encountered in the order given below:
+   /// 
+   /// AAFRESULT_SUCCESS
+   ///   - succeeded.  (This is the only code indicating success.)
+   ///
+   /// AAFRESULT_NULL_PARAM
+   ///   - pStream arg is NULL.
+   ///
+   /// @param pOutput [in] New diagnostic output.
+   /// 
+   STDAPI AAFSetDiagnosticOutput (
+     IAAFDiagnosticOutput*  pOutput);
  
    //***********************************************************