[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-datatype-cvs
Subject:    [Datatype-cvs]
From:       pbasic () helixcommunity ! org
Date:       2008-04-25 8:25:47
Message-ID: 200804250826.m3P8Q71S016366 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/datatype/tools/dtdriver/decoder/audio
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv10340/decoder/audio

Modified Files:
      Tag: hxclient_3_1_0_atlas
	adecoder.cpp 
Log Message:
Localized known metadata transfer.

Index: adecoder.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/decoder/audio/adecoder.cpp,v
retrieving revision 1.18.10.1
retrieving revision 1.18.10.2
diff -u -d -r1.18.10.1 -r1.18.10.2
--- adecoder.cpp	24 Apr 2008 11:45:43 -0000	1.18.10.1
+++ adecoder.cpp	25 Apr 2008 08:25:44 -0000	1.18.10.2
@@ -59,6 +59,7 @@
 #include "adecoder.h"
 #include "amixer.h"
 #include "reporterror.h"
+#include "headertools.h"
 
 #define _TRUNCATE_AUDIO_TO_ENDTIME
 
@@ -1203,46 +1204,6 @@
     return retVal;
 }
 
-HX_RESULT CAudioSourceHandler::CopyHdrCString(const char* pKey, 
-                                           IHXValues* pSrc,
-                                           IHXValues* pDst)
-{
-    HX_RESULT retVal = HXR_FAILED;
-    
-    if (pKey && pSrc && pDst)
-    {
-        IHXBuffer* pTmp = NULL;
-
-        if (HXR_OK == pSrc->GetPropertyCString(pKey, pTmp))
-        {
-            retVal  = pDst->SetPropertyCString(pKey, pTmp);
-            HX_RELEASE(pTmp);
-        }
-    }
-
-    return retVal;
-}
-
-HX_RESULT CAudioSourceHandler::CopyHdrBuffer(const char* pKey, 
-                                             IHXValues* pSrc,
-                                             IHXValues* pDst)
-{
-    HX_RESULT retVal = HXR_FAILED;
-    
-    if (pKey && pSrc && pDst)
-    {
-        IHXBuffer* pTmp = NULL;
-
-        if (HXR_OK == pSrc->GetPropertyBuffer(pKey, pTmp))
-        {
-            retVal  = pDst->SetPropertyBuffer(pKey, pTmp);
-            HX_RELEASE(pTmp);
-        }
-    }
-
-    return retVal;
-}
-
 ULONG32 CAudioSourceHandler::GetDurationPassedEndTime(ULONG32 ulTimeStamp)
 {
 #ifdef _TRUNCATE_AUDIO_TO_ENDTIME
@@ -1955,13 +1916,15 @@
                 // Set the flag saying this is not a real datatype
                 m_pFileHeaderOut->SetPropertyULONG32("IsRealDataType", 0);
 
-                // Transfer TAC if present
-                CopyHdrBuffer("Title", m_pFileHeaderIn, m_pFileHeaderOut);
-                CopyHdrBuffer("Author", m_pFileHeaderIn, m_pFileHeaderOut);
-                CopyHdrBuffer("Copyright", m_pFileHeaderIn, m_pFileHeaderOut);
-                CopyHdrCString("AudioFormat", m_pFileHeaderIn, 
-                               m_pFileHeaderOut);
-                CopyHdrCString("Abstract", m_pFileHeaderIn, m_pFileHeaderOut);
+                // Transfer metadata if present
+                CopyKnownHeaderMetaData(m_pFileHeaderOut, m_pFileHeaderIn);
+
+                m_pFileHeaderIn->GetPropertyCString("AudioFormat", pBuffer);
+                if (pBuffer)
+                {
+                    m_pFileHeaderOut->SetPropertyCString("AudioFormat", pBuffer);
+                    HX_RELEASE(pBuffer);
+                }
             }
         }
     }


_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]