Removed the smnew macro and the call to _CrtSetDbgFlag() to get ready for
merging with the main branch.
This commit is contained in:
@@ -31,7 +31,7 @@
|
||||
|
||||
RageMovieTexture *RageMovieTextureDriver_DShow::Create( RageTextureID ID, RString &sError )
|
||||
{
|
||||
MovieTexture_DShow *pRet = smnew MovieTexture_DShow( ID );
|
||||
MovieTexture_DShow *pRet = new MovieTexture_DShow( ID );
|
||||
sError = pRet->Init();
|
||||
if( !sError.empty() )
|
||||
SAFE_DELETE( pRet );
|
||||
@@ -349,7 +349,7 @@ RString MovieTexture_DShow::Create()
|
||||
RageException::Throw( hr_ssprintf(hr, "Could not create CLSID_FilterGraph!") );
|
||||
|
||||
// Create the Texture Renderer object
|
||||
CTextureRenderer *pCTR = smnew CTextureRenderer;
|
||||
CTextureRenderer *pCTR = new CTextureRenderer;
|
||||
|
||||
/* Get a pointer to the IBaseFilter on the TextureRenderer, and add it to the
|
||||
* graph. When m_pGB is released, it will free pFTR. */
|
||||
|
||||
@@ -570,7 +570,7 @@ static RString averr_ssprintf( int err, const char *fmt, ... )
|
||||
va_end(va);
|
||||
|
||||
size_t errbuf_size = 512;
|
||||
char* errbuf = smnew char[errbuf_size];
|
||||
char* errbuf = new char[errbuf_size];
|
||||
avcodec::av_strerror(err, errbuf, errbuf_size);
|
||||
RString Error = ssprintf("%i: %s", err, errbuf);
|
||||
delete errbuf;
|
||||
@@ -620,7 +620,7 @@ RString MovieDecoder_FFMpeg::Open( RString sFile )
|
||||
if( !m_fctx )
|
||||
return "AVCodec: Couldn't allocate context";
|
||||
|
||||
RageFile *f = smnew RageFile;
|
||||
RageFile *f = new RageFile;
|
||||
|
||||
if( !f->Open(sFile, RageFile::READ) )
|
||||
{
|
||||
@@ -719,13 +719,13 @@ RageSurface *MovieDecoder_FFMpeg::CreateCompatibleSurface( int iTextureWidth, in
|
||||
}
|
||||
|
||||
MovieTexture_FFMpeg::MovieTexture_FFMpeg( RageTextureID ID ):
|
||||
MovieTexture_Generic( ID, smnew MovieDecoder_FFMpeg )
|
||||
MovieTexture_Generic( ID, new MovieDecoder_FFMpeg )
|
||||
{
|
||||
}
|
||||
|
||||
RageMovieTexture *RageMovieTextureDriver_FFMpeg::Create( RageTextureID ID, RString &sError )
|
||||
{
|
||||
MovieTexture_FFMpeg *pRet = smnew MovieTexture_FFMpeg( ID );
|
||||
MovieTexture_FFMpeg *pRet = new MovieTexture_FFMpeg( ID );
|
||||
sError = pRet->Init();
|
||||
if( !sError.empty() )
|
||||
SAFE_DELETE( pRet );
|
||||
|
||||
@@ -35,7 +35,7 @@ MovieTexture_Generic::MovieTexture_Generic( RageTextureID ID, MovieDecoder *pDec
|
||||
m_bWantRewind = false;
|
||||
m_fClock = 0;
|
||||
m_bFrameSkipMode = false;
|
||||
m_pSprite = smnew Sprite;
|
||||
m_pSprite = new Sprite;
|
||||
}
|
||||
|
||||
RString MovieTexture_Generic::Init()
|
||||
@@ -270,13 +270,13 @@ void MovieTexture_Generic::CreateTexture()
|
||||
|
||||
RageTextureID TargetID( GetID() );
|
||||
TargetID.filename += " target";
|
||||
m_pRenderTarget = smnew RageTextureRenderTarget( TargetID, param );
|
||||
m_pRenderTarget = new RageTextureRenderTarget( TargetID, param );
|
||||
|
||||
/* Create the intermediate texture. This receives the YUV image. */
|
||||
RageTextureID IntermedID( GetID() );
|
||||
IntermedID.filename += " intermediate";
|
||||
|
||||
m_pTextureIntermediate = smnew RageMovieTexture_Generic_Intermediate( IntermedID,
|
||||
m_pTextureIntermediate = new RageMovieTexture_Generic_Intermediate( IntermedID,
|
||||
m_pDecoder->GetWidth(), m_pDecoder->GetHeight(),
|
||||
m_pSurface->w, m_pSurface->h,
|
||||
power_of_two(m_pSurface->w), power_of_two(m_pSurface->h),
|
||||
|
||||
@@ -68,7 +68,7 @@ REGISTER_MOVIE_TEXTURE_CLASS( Null );
|
||||
|
||||
RageMovieTexture *RageMovieTextureDriver_Null::Create( RageTextureID ID, RString &sError )
|
||||
{
|
||||
return smnew MovieTexture_Null( ID );
|
||||
return new MovieTexture_Null( ID );
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user