[Helix-client-dev] CR/CN: Fixed build busters in HEAD (dtdrplin, metaeditor, meta3gp)
Petar Basic <[email protected]> Fri, 2 Oct 2009 16:10:27 +0200
| Newsgroups | gmane.comp.multimedia.helix.devel |
|---|---|
| Message-ID | <[email protected]> |
Modified by: pbasic at real.com Date: 2009/10/02 Project: meta3gp Synopsis: Fixed build busters in HEAD (dtdrplin, metaeditor, meta3gp) Details: 1.) Merged "Server-mode fix" from Atlas310. 2.) Removed extraneous includes in metaeditor and meta3gp projects. 3.) Added missing dependencies to dtdrplin and client_encodesvc_common_util in helix.bif. Files Modified: datatype/tools/dtdriver/engine/pub/ffdriver.h datatype/tools/dtdriver/engine/ffdriver.cpp datatype/tools/metaeditor/dlliids.cpp datatype/tools/dtdriver/apps/meta3gp/dlliids.cpp helix.bif Platforms and Profiles Build Verified: system id: win32-i386-vc7 profile: helix-client-all-defines Platforms and Profiles Functionality Verified: x86 Windows XP SP2 Branch: HEAD Copyright assignment: I am a RealNetworks employee or contractor. _______________________________________________ Helix-client-dev mailing list [email protected] http://lists.helixcommunity.org/mailman/listinfo/helix-client-dev
datatype_tools_dtdriver_apps_meta3gp.diff
(text/x-patch, 821 B)
Index: dlliids.cpp =================================================================== RCS file: /cvsroot/datatype/tools/dtdriver/apps/meta3gp/dlliids.cpp,v retrieving revision 1.1 diff -U5 -r1.1 dlliids.cpp --- dlliids.cpp 5 Nov 2007 22:46:15 -0000 1.1 +++ dlliids.cpp 2 Oct 2009 12:41:39 -0000 @@ -37,19 +37,9 @@ /**************************************************************************** * Includes */ #include "hxtypes.h" #define INITGUID -#define NCIHACK #include "hxcom.h" -#include "hxccf.h" - -#include "ihxtencodingjob.h" // IHXTClassFactory -#include "ihxtlogsystem.h" // IHXTLogSystem -#include "ihxtfileobserver.h" // IHXTFileObserver -#include "ihxautoupgrademgr.h" -#include "ihxdownloadmgr.h" - #include "ihxmetaeditor.h" - #include "hxiids.h" #include "hxpiids.h"
datatype_tools_dtdriver_engine.diff
(text/x-patch, 5.2 KB)
Index: ffdriver.cpp
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/engine/ffdriver.cpp,v
retrieving revision 1.59
diff -U30 -r1.59 ffdriver.cpp
--- ffdriver.cpp 11 Feb 2009 17:22:21 -0000 1.59
+++ ffdriver.cpp 2 Oct 2009 12:42:59 -0000
@@ -2165,72 +2165,82 @@
}
if (SUCCEEDED(retVal))
{
retVal = pNewProps->SetPropertyCString("TempDirPath", pTempDirBuffer);
}
HX_RELEASE(pTempDirBuffer);
}
}
if (SUCCEEDED(retVal))
{
pNewProps->AddRef();
pWriterProps = pNewProps;
}
HX_RELEASE(pNewProps);
HX_RELEASE(pClassFactory);
return retVal;
}
/****************************************************************************
* Create and init the context
*/
HX_RESULT FFDriver::InitContext(HXBOOL bPersistentContext,
char* pCompanyName ,
char* pProductName ,
int nMajVer ,
- int nMinVer
+ int nMinVer ,
+ IHXValues* pOptions
)
{
HX_RESULT RetVal = HXR_OK;
//once we are in PersistentContext mode,
//we will stay in it during the object lifetime
m_bPersistentContext = m_bPersistentContext || bPersistentContext;
//re-use context if we already have one
if (m_pContext == NULL)
{
+ // FFDriver::Init is responsible for option processing.
+ // In case FFDriver::InitContext is called before FFDriver::Init,
+ // we need to pickup "Server" option here - it's value is used
+ // by MiniContext constructor.
+ if (pOptions)
+ {
+ pOptions->GetPropertyULONG32("Server", m_uServerMode);
+ }
+
RetVal = HXR_OUTOFMEMORY;
m_pContext = new MiniContext;
if (m_pContext)
{
// We must initialize before AddRef to allow
// context to aggregate itself into the client
// context.
RetVal = m_pContext->Construct(m_uServerMode,
pCompanyName,
pProductName,
nMajVer,
nMinVer,
m_pClientContext);
HX_ADDREF(m_pContext);
}
// Get handle on the error message sink
if (SUCCEEDED(RetVal))
{
HX_RELEASE(m_pErrorMessages);
m_pContext->QueryInterface(IID_IHXErrorMessages,
(void**) &m_pErrorMessages);
}
/* Get Handle on the Scheduler */
if (SUCCEEDED(RetVal))
{
HX_RELEASE(m_pScheduler);
RetVal = m_pContext->QueryInterface(IID_IHXScheduler, (void **) &m_pScheduler);
}
Index: pub/ffdriver.h
===================================================================
RCS file: /cvsroot/datatype/tools/dtdriver/engine/pub/ffdriver.h,v
retrieving revision 1.43
diff -U30 -r1.43 ffdriver.h
--- pub/ffdriver.h 17 Oct 2008 07:46:11 -0000 1.43
+++ pub/ffdriver.h 2 Oct 2009 12:43:00 -0000
@@ -193,61 +193,62 @@
* Drives the file format plugin.
*
*/
class FFDriver : public IHXFormatResponse,
public IHXFileResponse,
public IHXFileWriterMonitor,
public IHXSourceInput
#ifdef HELIX_FEATURE_DTDR_USE_RECOGNIZER
,public IHXFileRecognizerResponse
#endif
{
public:
FFDriver(void);
~FFDriver();
HX_RESULT Init(char* pOutputFileName,
char* pWriteFileName,
char* pTempDirName,
IHXValues *pOptions,
IHXSourceInput* pSourceSink = NULL,
IHXFileWriter* pFileWriter = NULL,
IHXSourceHandler** pSourceHandlerList = NULL,
IHXFileWriterMonitor* pFileWriterMonitor = NULL);
void Close(HXBOOL bCompleteShutdown = TRUE);
void Stop(void);
HX_RESULT InitContext(HXBOOL bPersistentContext = FALSE,
char* pCompanyName = 0,
char* pProductName = 0,
int nMajVer = 0,
- int nMinVer = 0);
+ int nMinVer = 0,
+ IHXValues* pOptions = NULL);
HX_RESULT SetClientContext(IUnknown* pClientContext);
HX_RESULT GetContext(IUnknown** pContext);
HX_RESULT Drive(char *pInputFileName, char* pWriteFileName = NULL);
virtual HX_RESULT CreateSourceHandlerStack(IUnknown* pContext,
IHXValues* pOptions,
IHXSourceHandler** pSourceHandlerList,
IHXSourceInput* pSourceStackSink,
IHXSourceInput** pSourceStackInput,
IHXSourceHandler*** pUtilizedSourceHandlerList);
static void ResetSourceHandlerList(IHXSourceHandler** pSourceHandler);
static void ReleaseSourceHandlerList(IHXSourceHandler** &pSourceHandler);
/*
* IUnknown methods
*/
STDMETHOD(QueryInterface) (THIS_
REFIID riid,
void** ppvObj);
STDMETHOD_(ULONG32,AddRef) (THIS);
STDMETHOD_(ULONG32,Release) (THIS);
/*
* IHXFormatResponse methods
*/
STDMETHOD(InitDone) (THIS_
datatype_tools_metaeditor.diff
(text/x-patch, 481 B)
Index: dlliids.cpp =================================================================== RCS file: /cvsroot/datatype/tools/metaeditor/dlliids.cpp,v retrieving revision 1.1 diff -U5 -r1.1 dlliids.cpp --- dlliids.cpp 5 Nov 2007 22:29:46 -0000 1.1 +++ dlliids.cpp 2 Oct 2009 12:40:53 -0000 @@ -48,7 +48,7 @@ * ***** END LICENSE BLOCK ***** */ #include "hxtypes.h" #define INITGUID #include "hxcom.h" -#include "hxiids.h" #include "hxdtdr.h" +#include "hxiids.h"
helix.bif.diff
(text/x-patch, 4 KB)
Index: helix.bif
===================================================================
RCS file: /cvsroot/common/build/BIF/helix.bif,v
retrieving revision 1.766
diff -U30 -r1.766 helix.bif
--- helix.bif 28 Sep 2009 11:48:47 -0000 1.766
+++ helix.bif 2 Oct 2009 12:43:43 -0000
@@ -2883,60 +2883,61 @@
</source_dependlist>
</module>
<!-- DATATYPE/TOOLS/DTDRIVER/DTDRPLIN -->
<module id="datatype_tools_dtdriver_dtdrplin" name="datatype/tools/dtdriver/dtdrplin" group="core">
<dependlist>
common_include
common_runtime
common_dbgtool
common_util
common_container
common_system
common_fileio
common_netio
common_lang_xml
audio_mixer
audio_resampler
audio_limiter
audio_gaintool
audio_crossfade
audio_fixptutil
protocol_http
protocol_common_util
client_medpltfm
client_common_container
client_common_system
client_common_netio
client_common_util
client_audiosvc
client_netwksvc
+ client_encodesvc_common_util
audio_gaintool
datatype_tools_dtdriver_common
datatype_tools_dtdriver_engine
datatype_tools_dtdriver_decoder_common
datatype_tools_dtdriver_decoder_audio
datatype_tools_dtdriver_decoder_video
datatype_tools_minicntx
datatype_tools_dtdriver_loader
common_log_logutil
datatype_common_filewriter
video_vidutil
</dependlist>
</module>
<!-- DATATYPE/TOOLS/DTDRIVER/SAMPLES/THUMBNAIL -->
<module id="datatype_tools_dtdriver_samples_thumbnail" name="datatype/tools/dtdriver/samples/thumbnail" group="core">
<source_dependlist>
common_include
client_include
video_include
</source_dependlist>
<dependlist>
common_runtime
common_system
common_container
common_dbgtool
common_util
</dependlist>
</module>
@@ -15336,60 +15337,61 @@
<source_dependlist>
common_dbgtool
common_include
common_log_logutil
common_runtime
common_system
client_encodesvc_common_util
client_encodesvc_include
</source_dependlist>
<dependlist>
</dependlist>
</module>
<!-- CLIENT_ENCODESVC/COMMON/UTIL -->
<module id="client_encodesvc_common_util" name="client/encodesvc/common/util" group="tools">
<cvs root="helix"/>
<includeplatforms>
unix mac win32
</includeplatforms>
<source_dependlist>
common_include
common_import_stlport
common_runtime
client_encodesvc_include
client_encodesvc_common_container
client_encodesvc_common_include
+ client_encodesvc_common_xmlparser
</source_dependlist>
<dependlist>
common_container
common_dbgtool
common_fileio
common_runtime
common_system
common_util
</dependlist>
</module>
<!-- CLIENT_ENCODESVC_COMMON_UTILHELPER -->
<module id="client_encodesvc_common_utilhelper" name="client/encodesvc/common/utilhelper" group="tools">
<cvs root="helix"/>
<includeplatforms>
win32
</includeplatforms>
<dependlist>
client_encodesvc_common_xmltransformer client_encodesvc_common_util
</dependlist>
</module>
<!-- CLIENT_ENCODESVC/COMMON/XMLPARSER -->
<module id="client_encodesvc_common_xmlparser" name="client/encodesvc/common/xmlparser" group="tools">
<cvs root="helix"/>